Resync with v1_9

ChangeLog

@@ -1,3 +1,8 @@
+Sat Apr 28 12:18:55 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
+
+  * scripts/dpkg-buildpackage.sh: only check for valid sign interface
+    when the user specifies one
+   
 Sat Apr 28 03:33:28 CDT 2001 Adam Heath <doogie@debian.org>
 
   * debian/dpkg.cfg: Changed to include no-debsig by default, as no debs
@@ -5,10 +10,6 @@ Sat Apr 28 03:33:28 CDT 2001 Adam Heath <doogie@debian.org>
     installed.  This will be removed in the future, when the archive tools
     support package signatures.
 
-Sat Apr 28 01:48:59 CDT 2001 Adam Heath <doogie@debian.org>
-
-  * main/dpkg.8, doc/sv/dpkg.8: s,etc/dpkg.cfg,etc/dpkg/dpkg.cfg,
-
 Fri Apr 27 20:43:25 CDT 2001 Adam Heath <doogie@debian.org>
 
   * lib/nfmalloc.c: nfstrnsave() was not allocated n+1 chars, and was not

debian/changelog

@@ -1,7 +1,7 @@
 dpkg (1.9.1) unstable; urgency=low
 
   * Fix segfault with empty status and available, and when missing a
-    trailing new line.  Closes: #95496
+    trailing new line.  Closes: Bug#95496
   * Make dpkg-shlibdeps not care if dpkg --search return with an error.
     Closes: Bug#95568
   * Fix corruption of user-defined fields in status and available.
@@ -10,6 +10,8 @@ dpkg (1.9.1) unstable; urgency=low
     currently signed, and we get false errors when debsig-verify is
     installed.  This will be removed in the future, when the archive tools
     support package signatures.  Closes: Bug#95573
+  * dpkg-buildpackage should only check for valid signinterface if the
+    user specifies one. Closes: Bug#95598
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 

doc/sv/dpkg.8

@@ -489,7 +489,7 @@ Statusuppdateringar ges p
 
 .SH FILER
 .TP
-.I /etc/dpkg/dpkg.cfg
+.I /etc/dpkg.cfg
 Konfigurationsfil med förvalda inställningar.
 .P
 Övriga filer som listas här finns i sina förvalda kataloger, se flaggan

main/dpkg.8

@@ -465,7 +465,7 @@ Send package status info to file descriptor \fI<n>\fP.  This can be given
 multiple times.  Status updates are of the form `status: <pkg>: <pkg qstate>'.
 .SH FILES
 .TP
-.I /etc/dpkg/dpkg.cfg
+.I /etc/dpkg.cfg
 Configuration file with default options.
 .P
 The other files listed below are in their default directories, see option

scripts/dpkg-buildpackage.sh

@@ -113,14 +113,14 @@ fi
 
 if test -n "$forcesigninterface" ; then
   signinterface=$forcesigninterface
-else
-  signinterface=$signcommand
-fi
-
 if [ "$signinterface" != "gpg" -a "$signinterface" != "pgp" ] ; then
 	echo >&2 "$progname: invalid sign interface specified"
 	exit 1
 fi
+else
+  signinterface=$signcommand
+fi
+
 
 mustsetvar () {
 	if [ "x$2" = x ]; then