Author: jamessan
Date: 2009-10-30 22:13:28 +0000 (Fri, 30 Oct 2009)
New Revision: 2018
Modified:
trunk/scripts/debuild.pl
Log:
Ensure -z/-Z are used whether we're emulating dpkg-buildpackage or not. My
previous fix only used them when we were emulating dpkg-bp.
Modified: trunk/scripts/debuild.pl
===================================================================
--- trunk/scripts/debuild.pl 2009-10-30 13:39:21 UTC (rev 2017)
+++ trunk/scripts/debuild.pl 2009-10-30 22:13:28 UTC (rev 2018)
@@ -813,8 +813,8 @@
/^-s[iad]$/ and $sourcestyle=$_, push(@dpkg_opts, $_), next;
/^-i/ and $diffignore=$_, push(@dpkg_opts, $_), next;
/^-I/ and push(@tarignore, $_), push(@dpkg_opts, $_), next;
- /^-Z/ and $compression=$_, push(@passopts, $_), next;
- /^-z/ and $comp_level=$_, push(@passopts, $_), next;
+ /^-Z/ and $compression=$_, push(@dpkg_opts, $_), next;
+ /^-z/ and $comp_level=$_, 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, $_),
@@ -863,8 +863,8 @@
/^-s[iad]$/ and $sourcestyle=$_, push(@dpkg_opts, $_), next;
/^-i/ and $diffignore=$_, push(@dpkg_opts, $_), next;
/^-I/ and push(@tarignore, $_), push(@dpkg_opts, $_), next;
- /^-Z/ and $compression=$_, push(@passopts, $_), next;
- /^-z/ and $comp_level=$_, push(@passopts, $_), next;
+ /^-Z/ and $compression=$_, push(@dpkg_opts, $_), next;
+ /^-z/ and $comp_level=$_, 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, $_),
@@ -1114,6 +1114,8 @@
my @cmd = (qw(dpkg-source));
push @cmd, @passopts;
push @cmd, $diffignore if $diffignore;
+ push @cmd, $compress if $compress;
+ push @cmd, $comp_level if $comp_level;
push @cmd, @tarignore;
push @cmd, "-b", $dirn;
chdir '..' or fatal "can't chdir ..: $!";
--
To unsubscribe, send mail to [email protected].
