The following commit has been merged in the master branch:
commit 187bddf8f0d7f37ecc84ed92364f0b5ae3da1592
Author: James Vega <[email protected]>
Date: Thu Dec 23 02:35:51 2010 -0500
debuild: Don't treat “-nc” as implying binary only build.
Closes: #607303
Signed-off-by: James Vega <[email protected]>
diff --git a/debian/changelog b/debian/changelog
index b7973ef..c558508 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
devscripts (2.10.70) UNRELEASED; urgency=low
- * debuild: Properly quote shell variable when parsing options. (Closes:
- #556248)
+ * debuild:
+ + Properly quote shell variable when parsing options. (Closes: #556248)
+ + Don't treat “-nc” as implying binary only build. (Closes: #607303)
* pts-subscribe: Handle “--until 0” the same as “--forever”. (Closes:
#604740)
* uscan: Update documentation to use “.+” instead of “.*” in groupings.
diff --git a/scripts/debuild.pl b/scripts/debuild.pl
index cedd7d2..d2cfbcd 100755
--- a/scripts/debuild.pl
+++ b/scripts/debuild.pl
@@ -814,7 +814,7 @@ if ($command_version eq 'dpkg') {
/^-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, $_),
+ $_ eq '-nc' and $noclean=1, push(@dpkg_opts, $_),
next;
$_ eq '-b' and $binaryonly=$_, $binarytarget='binary',
push(@dpkg_opts, $_), next;
@@ -864,7 +864,7 @@ if ($command_version eq 'dpkg') {
/^-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, $_),
+ $_ eq '-nc' and $noclean=1, push(@dpkg_opts, $_),
next;
$_ eq '-b' and $binaryonly=$_, $binarytarget='binary',
push(@dpkg_opts, $_), next;
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
