Apply patch from jfs to fix #232916; add blank line to .dsc

before signing with PGP.

diff --git a/ChangeLog b/ChangeLog
index d2684f872e3b544905dd59c63b6b20a6a0eb24f2..0cafa18a623a4dec60a0d3137911ca63baf391ea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Mar  8 18:20:38 GMT 2004 Javier Fernandez-Sanguino Pena <jfs@computer.org>
+
+  * scripts/dpkg-buildpackage.sh: Add blank line to .dsc before
+  signing with PGP.
+
 Mon Mar  8 18:10:06 GMT 2004 Scott James Remnant <scott@netsplit.com>
 
   * debian/control: Remove duplicated uploaders field and add myself

diff --git a/THANKS b/THANKS
index ad371e7def72c3dcb1609f44976dab54a90275e0..01e0392946ebdf2f681d8e9bc3e9b4027a5da089 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -25,6 +25,7 @@ Ian Jackson <ian@chiark.greenend.org.uk>
 Ian Murdock <imurdock@debian.org>
 Ivo Timmermans <itimmermans@bigfoot.com>
 J.H.M. Dassen <jdassen@cistron.nl>
+Javier Fernandez-Sanguino Pena <jfs@computer.org>
 Jim Pick <jim@jimpick.com>
 Jim Van Zandt <jrv@vanzandt.mv.com>
 Joel Klecker <jk@espy.org>

diff --git a/debian/changelog b/debian/changelog
index 12cfd1564bca26552b8aa0766f4224715cb490ad..32a0fba95382c363270fe7eaac4fe0f42aa4bfc3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ dpkg (1.10.19) unstable; urgency=low
   * Pass correct number of arguments for format string when out of disk
     space.  Closes: #213038, #217286, #213543, #213846.
   * Remove duplicated entries from ChangeLog.  Closes: #157437.
+  * Fix dpkg-buildpackage when used with PGP.  Closes: #232916.
 
  -- Scott James Remnant <scott@netsplit.com>  UNRELEASED
 

diff --git a/scripts/dpkg-buildpackage.sh b/scripts/dpkg-buildpackage.sh
index 37c8f9f910a123099515c49e568524fa05d53175..64569b66a1e1019ed9fad61bf1116be9fae161b6 100755 (executable)
--- a/scripts/dpkg-buildpackage.sh
+++ b/scripts/dpkg-buildpackage.sh
@@ -163,7 +163,8 @@ signfile () {
                $signcommand --local-user "${signkey:-$maintainer}" --clearsign --armor \
                        --textmode  > "../$1.asc" 
        else
-               $signcommand -u "${signkey:-$maintainer}" +clearsig=on -fast <"../$1" \
+               (cat "../$1" ; echo "") | \
+               $signcommand -u "${signkey:-$maintainer}" +clearsig=on -fast  \
                        >"../$1.asc"
        fi
        echo