Author: guillem Date: 2007-01-09 23:07:16 +0100 (Tue, 09 Jan 2007) New Revision: 622
Modified: trunk/ChangeLog trunk/debian/changelog trunk/scripts/dpkg-buildpackage.sh Log: Allow dpkg-buildpackage to properly override '-b' when passed after '-B'. Thanks to Julian Gilbey. Closes: #397479 Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-01-09 21:51:04 UTC (rev 621) +++ trunk/ChangeLog 2007-01-09 22:07:16 UTC (rev 622) @@ -1,3 +1,8 @@ +2007-01-10 Julian Gilbey <[EMAIL PROTECTED]> + + * scripts/dpkg-buildpackage.sh: Allow '-b' to properly override a + previously passed '-B'. + 2007-01-09 Guillem Jover <[EMAIL PROTECTED]> * configure.ac: Bump version to 1.14.0~. Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2007-01-09 21:51:04 UTC (rev 621) +++ trunk/debian/changelog 2007-01-09 22:07:16 UTC (rev 622) @@ -3,6 +3,8 @@ [ Guillem Jover ] * Make the copyright information in dpkg-deb.1 and dpkg-split.1 match the one in the source. Thanks to Nicolas François. Closes: #379320 + * Allow dpkg-buildpackage to properly override '-b' when passed after '-B'. + Thanks to Julian Gilbey. Closes: #397479 -- Guillem Jover <[EMAIL PROTECTED]> Tue, 9 Jan 2007 22:48:47 +0200 Modified: trunk/scripts/dpkg-buildpackage.sh =================================================================== --- trunk/scripts/dpkg-buildpackage.sh 2007-01-09 21:51:04 UTC (rev 621) +++ trunk/scripts/dpkg-buildpackage.sh 2007-01-09 22:07:16 UTC (rev 622) @@ -109,7 +109,10 @@ -tc) cleansource=true ;; -t*) targetgnusystem="$value" ;; # Order DOES matter! -nc) noclean=true; if [ -z "$binaryonly" ]; then binaryonly=-b; fi ;; - -b) binaryonly=-b; [ "$sourceonly" ] && \ + -b) binaryonly=-b; + checkbuilddep_args=''; + binarytarget=binary; + [ "$sourceonly" ] && \ { echo >&2 "$progname: cannot combine $1 and -S" ; exit 2 ; } ;; -B) binaryonly=-B; checkbuilddep_args=-B; binarytarget=binary-arch; [ "$sourceonly" ] && \ { echo >&2 "$progname: cannot combine $1 and -S" ; exit 2 ; } ;; -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]