On Thu, Apr 20, 2006 at 03:57:09PM +0200, Rafael Laboissiere wrote: > package devscripts > tag 363368 patch > thanks > > Bug #363368 is still present in version 2.9.18 of devscripts. The patch > below seems to fix the problem.
Thanks for this patch. I've applied a slightly simpler version of the same (changing /^-i(.*)/ to /^-i/, etc., as the value is irrelevant). Note, though, that dpkg-buildpackage does not accept multiple diffignore options (later ones override earlier ones), so diffignore should not be a list. Julian > --- debuild-orig 2006-04-20 15:37:35.221641320 +0200 > +++ debuild 2006-04-20 15:51:42.605819344 +0200 > @@ -740,7 +740,7 @@ > my @passopts=(); > > # extra dpkg-buildpackage variables not initialised there > - my $diffignore=''; > + my @diffignore=(); > my @tarignore=(); > my $sourceonly=''; > my $binaryonly=''; > @@ -770,8 +770,8 @@ > /^-a(.*)/ and $targetarch=$1, push(@dpkg_opts, $_), next; > # Explained below; no implied -d here, as already done > /^-s[iad]$/ and $sourcestyle=$_, push(@dpkg_opts, $_), next; > - /^-i(.*)/ and $diffignore=$1, push(@dpkg_opts, $_), next; > - /^-I(.*)/ and push(@tarignore, $1), push(@dpkg_opts, $_), next; > + /^-i(.*)/ and push(@diffignore, $_), push(@dpkg_opts, $_), next; > + /^-I(.*)/ and push(@tarignore, $_), push(@dpkg_opts, $_), next; > $_ eq '-tc' and $cleansource=1, push(@dpkg_opts, $_), next; > /^-t(.*)/ and $targetgnusystem=$1, push(@dpkg_opts, $_), next; # Ditto > $_ eq '-nc' and $noclean=1, $binaryonly ||= '-b', push(@dpkg_opts, $_), > @@ -810,8 +810,8 @@ > /^-a(.*)/ and $targetarch=$1, $checkbuilddep=0, push(@dpkg_opts, $_), > next; > /^-s[iad]$/ and $sourcestyle=$_, push(@dpkg_opts, $_), next; > - /^-i(.*)/ and $diffignore=$1, push(@dpkg_opts, $_), next; > - /^-I(.*)/ and push(@tarignore, $1), push(@dpkg_opts, $_), next; > + /^-i(.*)/ and push(@diffignore, $_), push(@dpkg_opts, $_), next; > + /^-I(.*)/ and push(@tarignore, $_), push(@dpkg_opts, $_), next; > $_ eq '-tc' and $cleansource=1, push(@dpkg_opts, $_), next; > /^-t(.*)/ and $targetgnusystem=$1, $checkbuilddep=0, next; > $_ eq '-nc' and $noclean=1, $binaryonly ||= '-b', push(@dpkg_opts, $_), > @@ -1006,7 +1006,7 @@ > my $dirn = basename(cwd()); > my @cmd = (qw(dpkg-source)); > push @cmd, @passopts; > - push @cmd, $diffignore if $diffignore; > + push @cmd, @diffignore; > push @cmd, @tarignore; > push @cmd, "-b", $dirn; > chdir '..' or fatal "can't chdir ..: $!"; -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
