From a6c40bc2bebbeb965017c9ed21a5b8b983af1e46 Mon Sep 17 00:00:00 2001
From: Scott James Remnant <keybuk@debian.org>
Date: Mon, 8 Mar 2004 18:24:56 +0000
Subject: [PATCH] Apply patch from jfs to fix #232916; add blank line to .dsc
 before signing with PGP.

---
 ChangeLog                    | 5 +++++
 THANKS                       | 1 +
 debian/changelog             | 1 +
 scripts/dpkg-buildpackage.sh | 3 ++-
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d2684f87..0cafa18a 100644
--- 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 ad371e7d..01e03929 100644
--- 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 12cfd156..32a0fba9 100644
--- 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 37c8f9f9..64569b66 100755
--- 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
-- 
2.39.5