Selaa lähdekoodia

Let dpkg-buildpackage pass through all remotely sensible
-sX options to dpkg-source (-s[nsAkurKUR] currently).
Closes: #36586

Frank Lichtenheld 20 vuotta sitten
vanhempi
commit
59965e332c
3 muutettua tiedostoa jossa 11 lisäystä ja 1 poistoa
  1. 4 0
      ChangeLog
  2. 3 0
      debian/changelog
  3. 4 1
      scripts/dpkg-buildpackage.sh

+ 4 - 0
ChangeLog

@@ -1,5 +1,9 @@
 2006-05-10  Frank Lichtenheld  <djpig@debian.org>
 
+	* scripts/dpkg-buildpackage.sh: Pass all
+	remotely sensible -sX option through to
+	dpkg-source (-s[nsAkurKUR]).
+
 	* scripts/changelog/debian.pl: Use same regex for
 	distribution names as for packages. Since the policy
 	doesn't define these names very strict, we should give

+ 3 - 0
debian/changelog

@@ -9,6 +9,9 @@ dpkg (1.13.20~) UNRELEASED; urgency=low
     Closes: #361171
   * Use the Debian keyring in dpkg-source when checking signatures
     of .dsc files, if available. Closes: #364726
+  * Let dpkg-buildpackage pass through all remotely sensible
+    -sX options to dpkg-source (-s[nsAkurKUR] currently).
+    Closes: #36586
 
   [ Updated dpkg Translations ]
   * Portuguese (Miguel Figueiredo).

+ 4 - 1
scripts/dpkg-buildpackage.sh

@@ -35,6 +35,8 @@ Options: -r<gain-root-command>
          -si (default) src includes orig for rev. 0 or 1    } genchanges
          -sa           uploaded src always includes orig    }
          -sd           uploaded src is diff and .dsc only   }
+         -sn           force Debian native source format } only passed
+         -s[sAkurKUR]  see dpkg-source for explanation   } to dpkg-source
          -nc           do not clean source tree (implies -b)
          -tc           clean source tree when finished
          -ap           add pause before starting signature process
@@ -90,6 +92,7 @@ do
 	-si)	sourcestyle=-si ;;
 	-sa)	sourcestyle=-sa ;;
 	-sd)	sourcestyle=-sd ;;
+	-s[nsAkurKUR])    passopts="$passopts $1";; # passed to dpkg-source
         -i*)    diffignore=$1;;
 	-I*)	tarignore="$tarignore $1";;
 	-tc)	cleansource=true ;;
@@ -106,7 +109,7 @@ do
 	-e*)	changedby="$value" ;;
 	-C*)	desc="$value" ;;
 	-W)	warnable_error=1; passopts="$passopts -W";;
-	-E)	warnable_error=0; passopts="$passopts -E";;	
+	-E)	warnable_error=0; passopts="$passopts -E";;
 	*)	echo >&2 "$progname: unknown option or argument $1"
 		usageversion; exit 2 ;;
 	esac