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

dleidert-guest at users.alioth.debian.org dleidert-guest at users.alioth.debian.org
Tue Feb 8 17:06:39 UTC 2011 

Author: dleidert-guest
Date: Tue Feb  8 17:06:27 2011
New Revision: 199

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


Added:
    gnupg/trunk/debian/README.Debian
      - copied unchanged from r198, gnupg/branches/experimental/debian/README.Debian
    gnupg/trunk/debian/patches/mips_gcc4.4.dpatch
      - copied unchanged from r198, gnupg/branches/experimental/debian/patches/mips_gcc4.4.dpatch
Removed:
    gnupg/trunk/debian/gnupg.doc-base.faq
    gnupg/trunk/debian/patches/489225_catch_expired_primary_key_with_valid_subkey.dpatch
    gnupg/trunk/debian/patches/551709_fix_info_link_entry.dpatch
    gnupg/trunk/debian/patches/553175_document_primary_uid_sign.dpatch
    gnupg/trunk/debian/patches/560692_fix_fatal_after_homedir_creation.dpatch
    gnupg/trunk/debian/patches/560995_fix_ftbfs_on_sparc64.dpatch
    gnupg/trunk/debian/patches/567580_menu_prompt_reflects_program.dpatch
    gnupg/trunk/debian/patches/567593_improve_info_and_faq.dpatch
    gnupg/trunk/debian/patches/fix_infinite_loop_r5264.dpatch
Modified:
    gnupg/trunk/debian/changelog
    gnupg/trunk/debian/control
    gnupg/trunk/debian/gnupg.docs
    gnupg/trunk/debian/patches/00list
    gnupg/trunk/debian/rules

Modified: gnupg/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/changelog?rev=199&op=diff
==============================================================================
--- gnupg/trunk/debian/changelog (original)
+++ gnupg/trunk/debian/changelog Tue Feb  8 17:06:27 2011
@@ -1,9 +1,42 @@
-gnupg (1.4.10-5) UNRELEASED; urgency=low
+gnupg (1.4.11-3) UNRELEASED; urgency=low
+
+  * Install gpg setuid root again on kFreeBSD. We dropped this
+    bit earlier because it's not necessary anymore on Linux, but
+    the kFreeBSD kernel still requires it for secure memory.
+    Thanks Robert Millan for the patch. (Closes: 598471)
+
+ -- Thijs Kinkhorst <thijs at debian.org>  Sat, 13 Nov 2010 17:16:46 +0100
+
+gnupg (1.4.11-2) experimental; urgency=low
+
+  * Update standards-version to 3.9.1, no changes needed.
+  * Apply patch based on Werner Koch's work that (again)
+    resolves a build failure on mips(el); issue addressed
+    in 1.4.10-4 was only partly solved upstream.
+  * Add README.Debian with smart card reader info, thanks
+    Jonathan Nieder (Closes: #575763). 
+
+ -- Thijs Kinkhorst <thijs at debian.org>  Sat, 13 Nov 2010 12:37:32 +0100
+
+gnupg (1.4.11-1) experimental; urgency=low
+
+  * New upstream release (Closes: #600587).
+    + Obsoletes all previously existing Debian patches:
+      567580_menu_prompt_reflects_program.dpatch
+      560692_fix_fatal_after_homedir_creation.dpatch
+      489225_catch_expired_primary_key_with_valid_subkey.dpatch
+      fix_infinite_loop_r5264.dpatch
+      567593_improve_info_and_faq.dpatch
+      551709_fix_info_link_entry.dpatch
+      560995_fix_ftbfs_on_sparc64.dpatch
+      mips_gcc4.4.dpatch
+      553175_document_primary_uid_sign.dpatch
+    + No longer ships outdated faq.html.
 
   * Update references to RFC 2440 into RFC 4880. Thanks
     Christoph Anton Mitterer (Closes: #592294).
 
- -- Thijs Kinkhorst <thijs at debian.org>  Wed, 11 Aug 2010 10:39:02 +0200
+ -- Thijs Kinkhorst <thijs at debian.org>  Tue, 26 Oct 2010 20:14:12 +0200
 
 gnupg (1.4.10-4) unstable; urgency=high
 

Modified: gnupg/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/control?rev=199&op=diff
==============================================================================
--- gnupg/trunk/debian/control (original)
+++ gnupg/trunk/debian/control Tue Feb  8 17:06:27 2011
@@ -5,7 +5,7 @@
 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.4
+Standards-Version: 3.9.1
 Build-Depends: debhelper (>> 7), libz-dev, libldap2-dev, libbz2-dev,
  libusb-dev [!hurd-i386],
  libreadline-dev, file, gettext, dpatch,

Modified: gnupg/trunk/debian/gnupg.docs
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/gnupg.docs?rev=199&op=diff
==============================================================================
--- gnupg/trunk/debian/gnupg.docs (original)
+++ gnupg/trunk/debian/gnupg.docs Tue Feb  8 17:06:27 2011
@@ -3,7 +3,6 @@
 TODO
 doc/DETAILS
 doc/FAQ
-doc/faq.html
 doc/highlights-1.4.txt
 doc/OpenPGP
 debian/Upgrading_From_PGP.txt

Modified: gnupg/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/patches/00list?rev=199&op=diff
==============================================================================
--- gnupg/trunk/debian/patches/00list (original)
+++ gnupg/trunk/debian/patches/00list Tue Feb  8 17:06:27 2011
@@ -1,9 +1,1 @@
-489225_catch_expired_primary_key_with_valid_subkey
-551709_fix_info_link_entry
-553175_document_primary_uid_sign
-560692_fix_fatal_after_homedir_creation
-560995_fix_ftbfs_on_sparc64
-567580_menu_prompt_reflects_program
-567593_improve_info_and_faq
-fix_infinite_loop_r5264
 mips_gcc4.4

Modified: gnupg/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/rules?rev=199&op=diff
==============================================================================
--- gnupg/trunk/debian/rules (original)
+++ gnupg/trunk/debian/rules Tue Feb  8 17:06:27 2011
@@ -18,6 +18,7 @@
 DEB_BUILD_GNU_TYPE = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE  = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_ARCH    := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_HOST_ARCH_OS  := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
 CONFARGS  = --prefix=/usr --libexecdir=/usr/lib/ \
             --enable-mailto --with-mailprog=/usr/sbin/sendmail \
@@ -96,8 +97,7 @@
 	: # Move localized manpages to FHS compliant locations
 	mv debian/gnupg/usr/share/man/man1/gpg.ru.1 debian/gnupg/usr/share/man/ru/man1/gpg.1
 	: # Remove from /usr/share/gnupg what we install into /usr/share/doc/gnupg/
-	$(RM) debian/gnupg/usr/share/gnupg/FAQ \
-	      debian/gnupg/usr/share/gnupg/faq.html
+	$(RM) debian/gnupg/usr/share/gnupg/FAQ 
 	$(RM) debian/gnupg/usr/share/info/dir*
 	find debian/gnupg/ -type d -empty | xargs rmdir
 	$(MAKE) -C build-deb-curl/keyserver install DESTDIR=$(CURDIR)/debian/gnupg-curl
@@ -130,6 +130,11 @@
 	dh_strip
 	dh_compress
 	dh_fixperms
+ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
+	# see http://www.gnupg.org/faq.html#q6.1
+	chown root:root	debian/gnupg/usr/bin/gpg
+	chmod 4755	debian/gnupg/usr/bin/gpg
+endif
 	dh_installdeb
 	dh_shlibdeps -X debian/gnupg/usr/lib/gnupg/gpgkeys_ldap -- -dRecommends $(CURDIR)/debian/gnupg/usr/lib/gnupg/gpgkeys_ldap -dDepends
 	dh_gencontrol

More information about the Pkg-gnupg-commit mailing list