[Pkg-gnupg-commit] r128 - in /gnupg/trunk/debian: ./ patches/

dleidert-guest at users.alioth.debian.org dleidert-guest at users.alioth.debian.org
Wed Sep 2 22:52:29 UTC 2009 

Author: dleidert-guest
Date: Wed Sep  2 22:52:28 2009
New Revision: 128

URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=128
Log:
Merge gnupg 1.4.10~rc1-1 from experimental back into trunk.

gnupg (1.4.10~rc1-1) experimental; urgency=low

  * First release candidate of GnuPG 1.4.10.
    - Improved lockfile handling (closes: #58260).
    - Fixes error using the --local-user switch together with the same options
      string (closes: #130363).
    - Fixes memory leak importing (large) keyrings (closes: #172115, #345911).
    - Send HTTP requests with "Pragma: no-cache" (closes: #177716).
    - Reference to unimplemented --fix-trustdb switch has been replaced by
      short howto for recovery (closes: #196860).
    - Resets terminal after SIGINT (LP: #294115; closes: #321871).
    - Fixes error using the --fingerprint switch together with the
      with-fingerprint options string (closes: #382794).
    - Removing some strange old special case code in gpg fixes an error thrown
      for a special signature (closes: #402600). This needs well testing ...
      see https://bugs.g10code.com/gnupg/issue931.
    - Fixes misleading error messages (closes: #205596, #494040).
    - Fixes building with libcurl (closes: #502558).
    - Fixes a parsing loop specific to amd64 systems (closes: #503853).
    - Fixes the non-zero exit status after smartcard insert prompt (closes:
      #513464).
    - Fixes/improves documentation (LP: #389694; closes: #496921, #527351).
    - Fixes several issues in the German (closes: #536827), the Dutch
      (LP: #397395) and the French (closes: #525404) translation.
    - Added IDN (Internationalized Domain Names) support (closes: #537122).
    
    For more information please read /usr/share/doc/gnupg/changelog.gz.

  [ Thijs Kinkhorst ]
  * Re-enable build-time tests, accidentally disabled due to false
    logic in debian/rules. Thanks Neil Williams, closes: #521884.
  * Checked for policy 3.8.2 and updated to debhelper 7.
  * Install NEWS as upstream changelog.

  [ Daniel Leidert ]
  * debian/control (Build-Depends): Added libcurl4-gnutls-dev (LP: #62864).
  * debian/rules (CONFARGS): Add --enable-noexecstack to build gnupg without
    executable stack on i386 (LP: #49323; closes: #527630).
    (binary-arch): Register .info documentation (closes: #527570).
  * debian/patches/24_gpgv_manpage_cleanup.dpatch: Party dropped (applied
    upstream).
  * debian/patches/25_de.po_fixes.dpatch: Dropped (applied upstream).
  * debian/patches/99_yat2m_fix_samp_handling.dpatch: Ditto.
  * debian/patches/00list: Adjusted.


Removed:
    gnupg/trunk/debian/gnupg.links
    gnupg/trunk/debian/patches/25_de.po_fixes.dpatch
    gnupg/trunk/debian/patches/55_curl_typefix.dpatch
    gnupg/trunk/debian/patches/99_yat2m_fix_samp_handling.dpatch
Modified:
    gnupg/trunk/debian/TODO
    gnupg/trunk/debian/changelog
    gnupg/trunk/debian/compat
    gnupg/trunk/debian/control
    gnupg/trunk/debian/copyright
    gnupg/trunk/debian/gnupg.docs
    gnupg/trunk/debian/patches/00list
    gnupg/trunk/debian/patches/24_gpgv_manpage_cleanup.dpatch
    gnupg/trunk/debian/rules

Modified: gnupg/trunk/debian/TODO
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/TODO?rev=128&op=diff
==============================================================================
--- gnupg/trunk/debian/TODO (original)
+++ gnupg/trunk/debian/TODO Wed Sep  2 22:52:28 2009
@@ -16,15 +16,9 @@
 
 * discuss
 
-  - libcurl4-gnutls-dev build-dependency - seems to fix several issues
-    with the self-written Curl code (LP: #62864, applied-ubuntu since 1.4.6-2ubuntu3)
-
   - if gpg should be put into /bin (#477671)
 
   - if keyserver-options verbose should be default (#474569)
-
-  - if the libldap dependency can be downgraded to a recommended package (I'm
-    currently not in favour of this - #399167)
 
   - why does gnupg depend on gpgv and can this perhaps be made less strong?
 
@@ -49,8 +43,3 @@
 
 #300743: gnupg: Should not depend on libusb
 
-* Forward candidates (to at least get a feedback):
-
- #58260,
-#317654: remove existing lockfiles ()
-

Modified: gnupg/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/changelog?rev=128&op=diff
==============================================================================
--- gnupg/trunk/debian/changelog (original)
+++ gnupg/trunk/debian/changelog Wed Sep  2 22:52:28 2009
@@ -1,21 +1,49 @@
-gnupg (1.4.9-5) UNRELEASED; urgency=low
+gnupg (1.4.10~rc1-1) experimental; urgency=low
+
+  * First release candidate of GnuPG 1.4.10.
+    - Improved lockfile handling (closes: #58260).
+    - Fixes error using the --local-user switch together with the same options
+      string (closes: #130363).
+    - Fixes memory leak importing (large) keyrings (closes: #172115, #345911).
+    - Send HTTP requests with "Pragma: no-cache" (closes: #177716).
+    - Reference to unimplemented --fix-trustdb switch has been replaced by
+      short howto for recovery (closes: #196860).
+    - Resets terminal after SIGINT (LP: #294115; closes: #321871).
+    - Fixes error using the --fingerprint switch together with the
+      with-fingerprint options string (closes: #382794).
+    - Removing some strange old special case code in gpg fixes an error thrown
+      for a special signature (closes: #402600). This needs well testing ...
+      see https://bugs.g10code.com/gnupg/issue931.
+    - Fixes misleading error messages (closes: #205596, #494040).
+    - Fixes building with libcurl (closes: #502558).
+    - Fixes a parsing loop specific to amd64 systems (closes: #503853).
+    - Fixes the non-zero exit status after smartcard insert prompt (closes:
+      #513464).
+    - Fixes/improves documentation (LP: #389694; closes: #496921, #527351).
+    - Fixes several issues in the German (closes: #536827), the Dutch
+      (LP: #397395) and the French (closes: #525404) translation.
+    - Added IDN (Internationalized Domain Names) support (closes: #537122).
+    
+    For more information please read /usr/share/doc/gnupg/changelog.gz.
 
   [ Thijs Kinkhorst ]
   * Re-enable build-time tests, accidentally disabled due to false
     logic in debian/rules. Thanks Neil Williams, closes: #521884.
-  * Checked for policy 3.8.1.
+  * Checked for policy 3.8.2 and updated to debhelper 7.
+  * Install NEWS as upstream changelog.
 
   [ Daniel Leidert ]
   * debian/control (Build-Depends): Added libcurl4-gnutls-dev (LP: #62864).
   * debian/rules (CONFARGS): Add --enable-noexecstack to build gnupg without
     executable stack on i386 (LP: #49323; closes: #527630).
     (binary-arch): Register .info documentation (closes: #527570).
-  * debian/patches/55_curl_typefix.dpatch: Added to fix FTBFS (taken from
-    upstream/Ubuntu).
-    - gpgkeys_curl.c (main), gpgkeys_hkp.c (main): Make sure all
-      libcurl number options are passed as long (closes: #502558).
-
- -- Thijs Kinkhorst <thijs at debian.org>  Fri, 22 May 2009 12:14:11 +0200
+  * debian/patches/24_gpgv_manpage_cleanup.dpatch: Party dropped (applied
+    upstream).
+  * debian/patches/25_de.po_fixes.dpatch: Dropped (applied upstream).
+  * debian/patches/99_yat2m_fix_samp_handling.dpatch: Ditto.
+  * debian/patches/00list: Adjusted.
+
+ -- Thijs Kinkhorst <thijs at debian.org>  Sat, 15 Aug 2009 18:43:03 +0200
 
 gnupg (1.4.9-4) unstable; urgency=low
 

Modified: gnupg/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/compat?rev=128&op=diff
==============================================================================
--- gnupg/trunk/debian/compat (original)
+++ gnupg/trunk/debian/compat Wed Sep  2 22:52:28 2009
@@ -1,1 +1,1 @@
-5
+7

Modified: gnupg/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/control?rev=128&op=diff
==============================================================================
--- gnupg/trunk/debian/control (original)
+++ gnupg/trunk/debian/control Wed Sep  2 22:52:28 2009
@@ -5,8 +5,8 @@
 Uploaders: Sune Vuorela <debian at pusling.com>,
  Daniel Leidert (dale) <daniel.leidert at wgdd.de>,
  Thijs Kinkhorst <thijs at debian.org>
-Standards-Version: 3.8.1
-Build-Depends: debhelper (>> 5), libz-dev, libldap2-dev, libbz2-dev,
+Standards-Version: 3.8.2
+Build-Depends: debhelper (>> 7), libz-dev, libldap2-dev, libbz2-dev,
  libusb-dev [!hurd-i386],
  libreadline5-dev, file, gettext, dpatch,
  libcurl4-gnutls-dev

Modified: gnupg/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/copyright?rev=128&op=diff
==============================================================================
--- gnupg/trunk/debian/copyright (original)
+++ gnupg/trunk/debian/copyright Wed Sep  2 22:52:28 2009
@@ -9,8 +9,9 @@
 - adding support for the Debian package maintenance scheme, by adding
   various debian/* files.
 
-Program Copyright (C) 1998-2008 Free Software Foundation, Inc.
-Modifications for Debian Copyright (C) 1998-2006 James Troup.
+Program Copyright (C) 1998-2009 Free Software Foundation, Inc.
+Modifications for Debian Copyright (C) 1998-2006 James Troup,
+2008-2009 Daniel Leidert, Sune Vuorela, Thijs Kinkhorst.
 
 GnuPG is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

Modified: gnupg/trunk/debian/gnupg.docs
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/gnupg.docs?rev=128&op=diff
==============================================================================
--- gnupg/trunk/debian/gnupg.docs (original)
+++ gnupg/trunk/debian/gnupg.docs Wed Sep  2 22:52:28 2009
@@ -1,4 +1,3 @@
-NEWS
 README
 THANKS
 TODO

Modified: gnupg/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/patches/00list?rev=128&op=diff
==============================================================================
--- gnupg/trunk/debian/patches/00list (original)
+++ gnupg/trunk/debian/patches/00list Wed Sep  2 22:52:28 2009
@@ -1,6 +1,3 @@
 24_gpgv_manpage_cleanup
-25_de.po_fixes
 25_it.po_fixes
 25_fr.po_fixes
-55_curl_typefix
-99_yat2m_fix_samp_handling

Modified: gnupg/trunk/debian/patches/24_gpgv_manpage_cleanup.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/patches/24_gpgv_manpage_cleanup.dpatch?rev=128&op=diff
==============================================================================
--- gnupg/trunk/debian/patches/24_gpgv_manpage_cleanup.dpatch (original)
+++ gnupg/trunk/debian/patches/24_gpgv_manpage_cleanup.dpatch Wed Sep  2 22:52:28 2009
@@ -8,51 +8,10 @@
 ## DP: Date: 2003-01-22
 
 @DPATCH@
-diff -urNad gnupg-1.4.6~/doc/gpgv.texi gnupg-1.4.6/doc/gpgv.texi
---- gnupg-1.4.6~/doc/gpgv.texi	2006-12-04 14:01:31.000000000 +0000
-+++ gnupg-1.4.6/doc/gpgv.texi	2006-12-07 02:33:20.000000000 +0000
-@@ -55,8 +55,8 @@
- @mansect description
- @code{@gpgvname} is an OpenPGP signature verification tool.
- 
--This program is actually a stripped down version of @code{gpg} which is
--only able to check signatures. It is somewhat smaller than the fully blown
-+This program is actually a stripped-down version of @code{gpg} which is
-+only able to check signatures. It is somewhat smaller than the fully-blown
- @code{gpg} and uses a different (and simpler) way to check that
- the public keys used to make the signature are valid. There are
- no configuration files and only a few options are implemented.
-@@ -114,7 +114,7 @@
- 
- @mansect return value
- 
--The program returns 0 if everything was fine, 1 if at least
-+The program returns 0 if everything is fine, 1 if at least
- one signature was bad, and other error codes for fatal errors.
- 
- @mansect examples
-@@ -126,7 +126,7 @@
- @itemx @gpgvname @code{sigfile} 
- Verify the signature of the file. The second form
- is used for detached signatures, where @code{sigfile} is the detached
--signature (either ASCII armored or binary) and are the signed
-+signature (either ASCII-armored or binary) and are the signed
- data; if this is not given the name of the file holding the signed data is
- constructed by cutting off the extension (".asc", ".sig" or ".sign") from
- @code{sigfile}.
-@@ -152,7 +152,7 @@
- @table @asis
- 
- @item ~/.gnupg/trustedkeys.gpg
--The default keyring with the allowed keys
-+The default keyring with the allowed keys.
- 
- @end table
- 
-diff -urNad gnupg-1.4.6~/doc/opt-homedir.texi gnupg-1.4.6/doc/opt-homedir.texi
---- gnupg-1.4.6~/doc/opt-homedir.texi	2006-12-04 13:31:56.000000000 +0000
-+++ gnupg-1.4.6/doc/opt-homedir.texi	2006-12-07 02:32:48.000000000 +0000
-@@ -1,11 +1,11 @@
+diff -urNad experimental~/doc/opt-homedir.texi experimental/doc/opt-homedir.texi
+--- experimental~/doc/opt-homedir.texi	2008-12-11 17:39:51.000000000 +0100
++++ experimental/doc/opt-homedir.texi	2009-08-14 15:31:20.000000000 +0200
+@@ -1,10 +1,10 @@
  @c This option is included at several places.
  @item --homedir @var{dir}
  @opindex homedir
@@ -63,6 +22,5 @@
  directory stated through the environment variable @env{GNUPGHOME} or
 -(on W32 systems) by means on the Registry entry
 +(on W32 systems) by means of the Registry entry
- @ifset isman
- @var{HKCU\\Software\\GNU\\GnuPG:HomeDir}.
- @end ifset
+ @var{HKCU\Software\GNU\GnuPG:HomeDir}.
+ 

Modified: gnupg/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/rules?rev=128&op=diff
==============================================================================
--- gnupg/trunk/debian/rules (original)
+++ gnupg/trunk/debian/rules Wed Sep  2 22:52:28 2009
@@ -74,7 +74,7 @@
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 	$(MAKE) -C build-deb install DESTDIR=$(CURDIR)/debian/gnupg
 	: # Move localized manpages to FHS compliant locations
@@ -90,8 +90,8 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs
-	# Maybe drop them and install NEWS as upstream changelog?
+	dh_installchangelogs NEWS
+	# Do we want to ship these 100 of kB's changelogs?
 	for i in po util mpi cipher tools g10 checks include; do \
 	    install -m 644 $$i/ChangeLog debian/gnupg/usr/share/doc/gnupg/changelog.$$i; \
 	done

More information about the Pkg-gnupg-commit mailing list