Deprecate support of PGP

diff --git a/ChangeLog b/ChangeLog
index 06274c19bdafb96331658a2f59bc31ddd5b79123..fe45de820de2cf0520a0112d57d4a315c54de88f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
        in dpkg-source and dpkg-genchanges.
        * README.feature-removal-schedule, README.api: Deprecate support
        of custom changelog parsers that understand only the -v option.
+       * README.feature-removal-schedule: Deprecate support of PGP.
 
 2008-01-27  Raphael Hertzog  <hertzog@debian.org>
 

diff --git a/README.feature-removal-schedule b/README.feature-removal-schedule
index 4d3517eef158459c41514521b46395eda73e31b8..da4e0f79140417b5314e2698d11a34f5662a1ff8 100644 (file)
--- a/README.feature-removal-schedule
+++ b/README.feature-removal-schedule
@@ -84,3 +84,11 @@ Why:
  Custom changelog parsers must be updated to support the new API (see
  dpkg-parsechangelog(1) and README.api).
 
+What: support of PGP
+Status: deprecated
+When: lenny+1
+Warning: program
+Why:
+ PGP is not part of Debian and GnuPG has been the standard tool for digital
+ signatures for several years already. Supporting only GnuPG enables us to
+ rely on some of its features.

diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 8865299916b17339f008bf175d97a41363fddeb6..ebb9247fd3197acf3a8e1d511270ae2a24c68f55 100755 (executable)
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -228,8 +228,14 @@ if ($forcesigninterface) {
     $signinterface = $signcommand;
 }
 
-if ($signcommand && ($signinterface !~ /^(gpg|pgp)$/)) {
-    warning(_g("unknown sign command, assuming pgp style interface"));
+if ($signcommand) {
+    if ($signinterface !~ /^(gpg|pgp)$/) {
+       warning(_g("unknown sign command, assuming pgp style interface"));
+    } elsif ($signinterface eq 'pgp') {
+       if ($signsource or $signchanges) {
+           warning(_g("PGP support is deprecated (see README.feature-removal-schedule)"));
+       }
+    }
 }
 
 if ($parallel) {