diff -Nru dpkg-1.14.20ubuntu6.1/debian/changelog dpkg-1.14.20ubuntu6.2/debian/changelog --- dpkg-1.14.20ubuntu6.1/debian/changelog 2009-02-04 09:37:13.000000000 +0000 +++ dpkg-1.14.20ubuntu6.2/debian/changelog 2009-03-05 09:38:30.000000000 +0000 @@ -1,3 +1,11 @@ +dpkg (1.14.20ubuntu6.2) intrepid-proposed; urgency=low + + * Backport from 1.14.21 (Raphael Hertzog): + - Fix dpkg-source to not use -i and -I by default with "1.0" source + packages. Closes: #495138, LP: #317761 + + -- Colin Watson Thu, 05 Mar 2009 09:37:38 +0000 + dpkg (1.14.20ubuntu6.1) intrepid-proposed; urgency=low * deal with dpkg database in inconsitent state diff -Nru dpkg-1.14.20ubuntu6.1/scripts/Dpkg/Source/Package.pm dpkg-1.14.20ubuntu6.2/scripts/Dpkg/Source/Package.pm --- dpkg-1.14.20ubuntu6.1/scripts/Dpkg/Source/Package.pm 2008-08-19 17:25:38.000000000 +0100 +++ dpkg-1.14.20ubuntu6.2/scripts/Dpkg/Source/Package.pm 2009-03-05 09:36:34.000000000 +0000 @@ -100,22 +100,27 @@ 'options' => {}, }; bless $self, $class; + if (exists $args{'options'}) { + $self->{'options'} = $args{'options'}; + } if (exists $args{"filename"}) { $self->initialize($args{"filename"}); + $self->init_options(); } - if (exists $args{"options"}) { - $self->{'options'} = $args{'options'}; - } - $self->init_options(); return $self; } sub init_options { my ($self) = @_; # Use full ignore list by default + # note: this function is not called by V1 packages $self->{'options'}{'diff_ignore_regexp'} ||= $diff_ignore_default_regexp; - $self->{'options'}{'tar_ignore'} = [ @tar_ignore_default_pattern ] + if (defined $self->{'options'}{'tar_ignore'}) { + $self->{'options'}{'tar_ignore'} = [ @tar_ignore_default_pattern ] unless @{$self->{'options'}{'tar_ignore'}}; + } else { + $self->{'options'}{'tar_ignore'} = [ @tar_ignore_default_pattern ]; + } } sub initialize {