Ver código fonte

Apply patch from jfs to fix #232916; add blank line to .dsc
before signing with PGP.

Scott James Remnant 22 anos atrás
pai
commit
a6c40bc2be
4 arquivos alterados com 9 adições e 1 exclusões
  1. 5 0
      ChangeLog
  2. 1 0
      THANKS
  3. 1 0
      debian/changelog
  4. 2 1
      scripts/dpkg-buildpackage.sh

+ 5 - 0
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

+ 1 - 0
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>

+ 1 - 0
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
 

+ 2 - 1
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