From 2d637acca9d8f746c9237ca0a477a89754f18f69 Mon Sep 17 00:00:00 2001
From: Scott James Remnant <keybuk@debian.org>
Date: Thu, 11 Mar 2004 11:20:06 +0000
Subject: [PATCH] Gee, thanks Javier...

---
 ChangeLog                    | 8 ++++++++
 THANKS                       | 1 -
 debian/changelog             | 2 ++
 scripts/dpkg-buildpackage.sh | 3 +--
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a48ea9a7..a8e15340 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Mar 11 11:18:29 GMT 2004 Scott James Remnant <scott@netsplit.com>
+
+  * scripts/dpkg-buildpackage.sh: Revert change suggested by Javier
+  Fernandez-Sanguino Pena, and don't echo a blank line when dealing
+  with PGP.  PGP itself will fail if we do this, it's needed to
+  satisfy pgpgp, which quite frankly is a bug in pgpgp's emulation
+  of pgp.
+  
 Thu Mar  8 01:10:00 CEST 2004  Tollef Fog Heen  <tfheen@debian.org>
 
   * po/pt_BR.po: Fix typo.
diff --git a/THANKS b/THANKS
index d2565b84..4b638a4c 100644
--- a/THANKS
+++ b/THANKS
@@ -28,7 +28,6 @@ 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 65154dcf..1e075fc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ dpkg (1.10.20) unstable; urgency=low
   * Update French translation.  Closes: #218713
   * Fix spelling error in German md5sum man page.  Closes: #230750
   * Fix typo in pt_BR po file.  Closes: #192102
+  * Revert fix for #232916, this turns out to be a bug in the pgpgp
+    wrapper, dpkg worked fine with pgp itself.
 
  -- Scott James Remnant <scott@netsplit.com>  UNRELEASED
 
diff --git a/scripts/dpkg-buildpackage.sh b/scripts/dpkg-buildpackage.sh
index 64569b66..37c8f9f9 100755
--- a/scripts/dpkg-buildpackage.sh
+++ b/scripts/dpkg-buildpackage.sh
@@ -163,8 +163,7 @@ signfile () {
 		$signcommand --local-user "${signkey:-$maintainer}" --clearsign --armor \
 			--textmode  > "../$1.asc" 
 	else
-		(cat "../$1" ; echo "") | \
-		$signcommand -u "${signkey:-$maintainer}" +clearsig=on -fast  \
+		$signcommand -u "${signkey:-$maintainer}" +clearsig=on -fast <"../$1" \
 			>"../$1.asc"
 	fi
 	echo
-- 
2.39.5