Bug#26895: 28 -> 29 diff
diff -r -u dpkg-1.4.0.28/debian/changelog dpkg-1.4.0.29/debian/changelog
--- dpkg-1.4.0.28/debian/changelog Mon Sep 21 13:17:18 1998
+++ dpkg-1.4.0.29/debian/changelog Tue Sep 22 09:38:17 1998
@@ -1,3 +1,9 @@
+dpkg (1.4.0.29) unstable; urgency=low
+
+ * For now, prefer PGP over GPG.
+
+ -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl> Tue, 22 Sep 1998 09:38:09 +0200
+
dpkg (1.4.0.28) unstable; urgency=low
* Added gpg (GNU Privacy Guard) support:
diff -r -u dpkg-1.4.0.28/scripts/dpkg-buildpackage.sh dpkg-1.4.0.29/scripts/dpkg-buildpackage.sh
--- dpkg-1.4.0.28/scripts/dpkg-buildpackage.sh Mon Sep 14 21:57:23 1998
+++ dpkg-1.4.0.29/scripts/dpkg-buildpackage.sh Tue Sep 22 09:37:31 1998
@@ -34,11 +34,16 @@
}
rootcommand=''
-signcommand=gpg
-warnpgp='' # Display a warning to encourage switching to gpg?
+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
+ signcommand=gpg
+fi
if [ -e $HOME/.pgp/secring.pgp -a ! -e $HOME/.gnupg/secring.gpg ] ; then
signcommand=pgp
- warnpgp=yes
fi
signinterface=$signcommand
signsource='withecho signfile'
@@ -82,9 +87,9 @@
if test "X$warnpgp" = "Xyes" ; then
echo >&2 <<EOWARN
-The use of PGP for signing Debian packages is deprecated. Please switch to
-gpg (the GNU Privacy Guard), which is GPL-ed and does not require use
-of patented algorithms.
+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
fi
diff -r -u dpkg-1.4.0.28/scripts/dpkg-source.1 dpkg-1.4.0.29/scripts/dpkg-source.1
--- dpkg-1.4.0.28/scripts/dpkg-source.1 Mon Sep 14 22:20:17 1998
+++ dpkg-1.4.0.29/scripts/dpkg-source.1 Tue Sep 22 09:36:54 1998
@@ -531,15 +531,15 @@
(searching the
.B PATH
if necessary) instead of
-.BR gpg .
+.BR pgp .
.I sign-command
will get all the arguments that
-.B gpg
+.B pgp
would have gotten. If
.I sign-command
-takes its arguments in PGP rather than GPG style, you should give
+takes its arguments in GPG rather than PGP style, you should give
the
-.B -spgp
+.B -sgpg
option.
.I sign-command
should not contain spaces or any other shell metacharacters.
--
Ray Dassen <jdassen@wi.LeidenUniv.nl>
Reply to: