Author: djpig
Date: 2006-05-12 03:22:36 +0000 (Fri, 12 May 2006)
New Revision: 305

Modified:
   trunk/ChangeLog
   trunk/debian/changelog
   trunk/scripts/dpkg-buildpackage.sh
Log:
Let dpkg-buildpackage pass through all remotely sensible
-sX options to dpkg-source (-s[nsAkurKUR] currently).
Closes: #36586


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2006-05-12 03:13:08 UTC (rev 304)
+++ trunk/ChangeLog     2006-05-12 03:22:36 UTC (rev 305)
@@ -1,5 +1,9 @@
 2006-05-10  Frank Lichtenheld  <[EMAIL PROTECTED]>
 
+       * 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

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog      2006-05-12 03:13:08 UTC (rev 304)
+++ trunk/debian/changelog      2006-05-12 03:22:36 UTC (rev 305)
@@ -9,6 +9,9 @@
     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).

Modified: trunk/scripts/dpkg-buildpackage.sh
===================================================================
--- trunk/scripts/dpkg-buildpackage.sh  2006-05-12 03:13:08 UTC (rev 304)
+++ trunk/scripts/dpkg-buildpackage.sh  2006-05-12 03:22:36 UTC (rev 305)
@@ -35,6 +35,8 @@
          -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 @@
        -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 @@
        -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


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to