Updated to dpkg 1.4.1.10

7 files changed, 82 insertions, 52 deletions

diff --git a/ChangeLog b/ChangeLog
index 6ac5578e8..727a76512 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+dpkg (1.4.1.10) unstable; urgency=low
+
+  * Non-maintainer release.
+  * Build dpkg-scansources manpages using pod2man
+  * dpkg-buildpackage changes:
+    + fix signinterface-detection
+    + use gpg by default if $HOME/.gnupg/secring.gpg exists
+
+ -- Wichert Akkerman <wakkerma@debian.org>  Thu, 16 Sep 1999 15:36:43 +0200
+
+dpkg (1.4.1.9) unstable; urgency=low
+
+  * Non-maintainer release.
+  * Updated dpkg-scansources to current version from Roderick Schertler
+  * Update location of GPL in internals-manual
+  * Update location of GPL and dpkg copyright in all manpages
+  * Include patch from Roman Hodek for dpkg-source to handle diffs of files
+    with lines that begin with two dashes.
+  * Move dpkg-scansources to dpkg-dev package
+  * Move dpkg-scansources manpage to section 8
+  * Fix error that moved a lot of manpages to the dpkg package.
+  * It looks like not reading the available-file for listfiles was not greeted
+    with much enthiousiasm, so reverse the change.
+
+ -- Wichert Akkerman <wakkerma@debian.org>  Wed, 15 Sep 1999 03:45:07 +0200
+
 dpkg (1.4.1.8) unstable; urgency=low
 
   * Non-maintainer release.
diff --git a/debian/changelog b/debian/changelog
index b751be907..727a76512 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+dpkg (1.4.1.10) unstable; urgency=low
+
+  * Non-maintainer release.
+  * Build dpkg-scansources manpages using pod2man
+  * dpkg-buildpackage changes:
+    + fix signinterface-detection
+    + use gpg by default if $HOME/.gnupg/secring.gpg exists
+
+ -- Wichert Akkerman <wakkerma@debian.org>  Thu, 16 Sep 1999 15:36:43 +0200
+
 dpkg (1.4.1.9) unstable; urgency=low
 
   * Non-maintainer release.
diff --git a/doc/manuals-version b/doc/manuals-version
index 9e38dfe1d..703ead002 100644
--- a/doc/manuals-version
+++ b/doc/manuals-version
@@ -1,2 +1,2 @@
-<!entity manuals-version "1.4.1.9">
-<!entity dpkg-version "1.4.1.9">
+<!entity manuals-version "1.4.1.10">
+<!entity dpkg-version "1.4.1.10">
diff --git a/po/en.po b/po/en.po
index ce0c3d104..43563972d 100644
--- a/po/en.po
+++ b/po/en.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-09-10 04:26+0200\n"
+"POT-Creation-Date: 1999-09-15 03:36+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1437,40 +1437,40 @@ msgstr "dpkg: %s not found.\n"
 msgid "--%s needs at least one package name argument"
 msgstr "--%s needs at least one package name argument"
 
-#: main/enquiry.c:409
+#: main/enquiry.c:406
 #, c-format
 msgid "Package `%s' is not installed and no info is available.\n"
 msgstr "Package `%s' is not installed and no info is available.\n"
 
-#: main/enquiry.c:418
+#: main/enquiry.c:415
 #, c-format
 msgid "Package `%s' is not available.\n"
 msgstr "Package `%s' is not available.\n"
 
-#: main/enquiry.c:428
+#: main/enquiry.c:425
 #, c-format
 msgid "Package `%s' is not installed.\n"
 msgstr "Package `%s' is not installed.\n"
 
-#: main/enquiry.c:437
+#: main/enquiry.c:434
 #, c-format
 msgid "Package `%s' does not contain any files (!)\n"
 msgstr "Package `%s' does not contain any files (!)\n"
 
-#: main/enquiry.c:443
+#: main/enquiry.c:440
 msgid "locally diverted"
 msgstr "locally diverted"
 
-#: main/enquiry.c:444
+#: main/enquiry.c:441
 msgid "package diverts others"
 msgstr "package diverts others"
 
-#: main/enquiry.c:445
+#: main/enquiry.c:442
 #, c-format
 msgid "diverted by %s"
 msgstr "diverted by %s"
 
-#: main/enquiry.c:464
+#: main/enquiry.c:461
 msgid ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents."
@@ -1478,11 +1478,11 @@ msgstr ""
 "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
 "and dpkg --contents (= dpkg-deb --contents) to list their contents."
 
-#: main/enquiry.c:527
+#: main/enquiry.c:524
 msgid "--predep-package does not take any argument"
 msgstr "--predep-package does not take any argument"
 
-#: main/enquiry.c:579
+#: main/enquiry.c:576
 #, c-format
 msgid ""
 "dpkg: cannot see how to satisfy pre-dependency:\n"
@@ -1491,12 +1491,12 @@ msgstr ""
 "dpkg: cannot see how to satisfy pre-dependency:\n"
 " %s\n"
 
-#: main/enquiry.c:580
+#: main/enquiry.c:577
 #, c-format
 msgid "cannot satisfy pre-dependencies for %.250s (wanted due to %.250s)"
 msgstr "cannot satisfy pre-dependencies for %.250s (wanted due to %.250s)"
 
-#: main/enquiry.c:600
+#: main/enquiry.c:597
 #, c-format
 msgid ""
 "dpkg: unexpected output from `%s --print-libgcc-file-name':\n"
@@ -1505,67 +1505,67 @@ msgstr ""
 "dpkg: unexpected output from `%s --print-libgcc-file-name':\n"
 " `%s'\n"
 
-#: main/enquiry.c:603
+#: main/enquiry.c:600
 #, c-format
 msgid "compiler libgcc filename not understood: %.250s"
 msgstr "compiler libgcc filename not understood: %.250s"
 
-#: main/enquiry.c:607
+#: main/enquiry.c:604
 msgid "--print-installation-architecture does not take any argument"
 msgstr "--print-installation-architecture does not take any argument"
 
-#: main/enquiry.c:627
+#: main/enquiry.c:624
 msgid "--print-architecture does not take any argument"
 msgstr "--print-architecture does not take any argument"
 
-#: main/enquiry.c:633
+#: main/enquiry.c:630
 msgid "failed to fdopen CC pipe"
 msgstr "failed to fdopen CC pipe"
 
-#: main/enquiry.c:637
+#: main/enquiry.c:634
 #, c-format
 msgid "failed to exec C compiler `%.250s'"
 msgstr "failed to exec C compiler `%.250s'"
 
-#: main/enquiry.c:641
+#: main/enquiry.c:638
 msgid "error reading from CC pipe"
 msgstr "error reading from CC pipe"
 
-#: main/enquiry.c:643
+#: main/enquiry.c:640
 msgid "empty output"
 msgstr "empty output"
 
-#: main/enquiry.c:645
+#: main/enquiry.c:642
 msgid "no newline"
 msgstr "no newline"
 
-#: main/enquiry.c:648
+#: main/enquiry.c:645
 msgid "no gcc-lib component"
 msgstr "no gcc-lib component"
 
-#: main/enquiry.c:650
+#: main/enquiry.c:647
 msgid "no hyphen after gcc-lib"
 msgstr "no hyphen after gcc-lib"
 
-#: main/enquiry.c:662
+#: main/enquiry.c:659
 #, c-format
 msgid "dpkg: warning, architecture `%s' not in remapping table\n"
 msgstr "dpkg: warning, architecture `%s' not in remapping table\n"
 
-#: main/enquiry.c:704
+#: main/enquiry.c:701
 msgid "--cmpversions takes three arguments: <version> <relation> <version>"
 msgstr "--cmpversions takes three arguments: <version> <relation> <version>"
 
-#: main/enquiry.c:709
+#: main/enquiry.c:706
 msgid "--cmpversions bad relation"
 msgstr "--cmpversions bad relation"
 
-#: main/enquiry.c:714
+#: main/enquiry.c:711
 #, c-format
 msgid "version a has bad syntax: %s\n"
 msgstr "version a has bad syntax: %s\n"
 
-#: main/enquiry.c:724
+#: main/enquiry.c:721
 #, c-format
 msgid "version b has bad syntax: %s\n"
 msgstr "version b has bad syntax: %s\n"
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 479c7b7d6..2cf1b61b0 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -62,6 +62,9 @@ MAINTAINERCLEANFILES	= $(srcdir)/Makefile.in $(srcdir)/elisp-comp
 
 SUFFIXES		= .pl .sh
 
+dpkg-scansources.8: dpkg-scansources.pl
+	pod2man --section=8 $^ > $@
+
 %: %.pl
 	sed -e "s:^#![:space:]*/usr/bin/perl:#! $(perlpath):; \
 		s:\$$dpkglibdir[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$dpkglibdir=\"$(pkglibdir)\":; \
diff --git a/scripts/dpkg-architecture.1 b/scripts/dpkg-architecture.1
index 03a3eab3f..fe0f5a1ee 100644
--- a/scripts/dpkg-architecture.1
+++ b/scripts/dpkg-architecture.1
@@ -2,8 +2,8 @@
 ''' $RCSfile$$Revision$$Date$
 '''
 ''' $Log$
-''' Revision 1.2  1999-09-27 01:17:04  wakkerma
-''' Updated to dpkg 1.4.1.9, and added spanish translation
+''' Revision 1.3  1999-09-27 01:31:19  wakkerma
+''' Updated to dpkg 1.4.1.10
 '''
 '''
 .de Sh
diff --git a/scripts/dpkg-buildpackage.sh b/scripts/dpkg-buildpackage.sh
index 18d1a43db..1f6326257 100755
--- a/scripts/dpkg-buildpackage.sh
+++ b/scripts/dpkg-buildpackage.sh
@@ -35,18 +35,11 @@ END
 }
 
 rootcommand=''
-signcommand=pgp # Default command for signing
-warnpgp='no'	# Display a warning to encourage switching to gpg?
-if [ ! -e $HOME/.gnupg/secring.gpg ] ; then
-	warnpgp=yes
-fi
-if [ -e $HOME/.gnupg/secring.gpg -a ! -e $HOME/.pgp/secring.pgp ] ; then
+if [ -e $HOME/.gnupg/secring.gpg ] ; then
 	signcommand=gpg
-fi
-if [ -e $HOME/.pgp/secring.pgp -a ! -e $HOME/.gnupg/secring.gpg ] ; then
+else
 	signcommand=pgp
 fi
-signinterface=$signcommand
 signsource='withecho signfile'
 signchanges='withecho signfile'
 cleansource=false
@@ -64,12 +57,12 @@ do
 	case "$1" in
 	-h)	usageversion; exit 0 ;;
 	-r*)	rootcommand="$value" ;;
-	-p*)	signcommand="$value"; warnpgp='' ;;
+	-p*)	signcommand="$value" ;;
 	-k*)	signkey="$value" ;;
-	-sgpg)  signinterface=gpg ;;
-	-spgp)  signinterface=pgp ;;
-	-us)	signsource=: ; warnpgp='' ;;
-	-uc)	signchanges=: ; warnpgp='' ;;
+	-sgpg)  forcesigninterface=gpg ;;
+	-spgp)  forcesigninterface=pgp ;;
+	-us)	signsource=: ;;
+	-uc)	signchanges=: ;;
 	-a*)    opt_a=1; arch="$value" ;;
 	-si)	sourcestyle=-si ;;
 	-sa)	sourcestyle=-sa ;;
@@ -88,12 +81,10 @@ do
 	shift
 done
 
-if test "X$warnpgp" = "Xyes" ; then
-  echo >&2 <<EOWARN
-The Debian project will switch to using GPG (the GNU Privacy Guard) instead
-of PGP for signing packages. You might want to make preparations. Check out
-the gnupg and debian-keyring packages.
-EOWARN
+if test -n "$forcesigninterface" ; then
+  signinterface=$forcesigninterace
+else
+  signinterface=$signcommand
 fi
 
 mustsetvar () {