[Pkg-gnupg-commit] r157 - in /gnupg/trunk/debian: changelog control gnupg-curl.postrm gnupg-curl.preinst gnupg.doc-base.faq rules
dleidert-guest at users.alioth.debian.org
dleidert-guest at users.alioth.debian.org
Thu Sep 17 10:55:58 UTC 2009
Author: dleidert-guest
Date: Thu Sep 17 10:55:58 2009
New Revision: 157
URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=157
Log:
* debian/control: Added gnupg-curl package which ships the keyserver helper
tools built with libcurl. gnupg recommends this package.
(Build-Depends): Changed to generic libreadline-dev (see pkg-gnupg-maint
list 09/2009).
(Description): Adjusted for gnupg vs. gnupg-curl.
* debian/gnupg.doc-base.faq: Added to register the GnuPG FAQ with doc-base.
* debian/gnupg-curl.preinst,
debian/gnupg-curl.postrm: Added to add/remove the diversions for
gpgkeys_curl and gpgkeys_hkp.
* debian/rules: Added targets to build the gnupg binary and helper tools
explicitly with libcurl. Move the gpgkeys_curl and gpgkeys_hkp keyserver
tools built with libcurl into the gnupg-curl package.
(build-deb/config.status): Build the gnupg binary with the "curl shim"
variant and without libcurl, so we don't depend on packages with priority
lower important (closes: #545275).
(binary-arch): Add missing relevant ChangeLog files.
Added:
gnupg/trunk/debian/gnupg-curl.postrm
gnupg/trunk/debian/gnupg-curl.preinst
gnupg/trunk/debian/gnupg.doc-base.faq
Modified:
gnupg/trunk/debian/changelog
gnupg/trunk/debian/control
gnupg/trunk/debian/rules
Modified: gnupg/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/changelog?rev=157&op=diff
==============================================================================
--- gnupg/trunk/debian/changelog (original)
+++ gnupg/trunk/debian/changelog Thu Sep 17 10:55:58 2009
@@ -5,7 +5,23 @@
(closes: #545268).
[ Daniel Leidert ]
- * debian/rules (install): Delete /usr/share/info/dir.gz (closes: #546552).
+ * debian/control: Added gnupg-curl package which ships the keyserver helper
+ tools built with libcurl. gnupg recommends this package.
+ (Build-Depends): Changed to generic libreadline-dev (see pkg-gnupg-maint
+ list 09/2009).
+ (Description): Adjusted for gnupg vs. gnupg-curl.
+ * debian/gnupg.doc-base.faq: Added to register the GnuPG FAQ with doc-base.
+ * debian/gnupg-curl.preinst,
+ debian/gnupg-curl.postrm: Added to add/remove the diversions for
+ gpgkeys_curl and gpgkeys_hkp.
+ * debian/rules: Added targets to build the gnupg binary and helper tools
+ explicitly with libcurl. Move the gpgkeys_curl and gpgkeys_hkp keyserver
+ tools built with libcurl into the gnupg-curl package.
+ (build-deb/config.status): Build the gnupg binary with the "curl shim"
+ variant and without libcurl, so we don't depend on packages with priority
+ lower important (closes: #545275).
+ (install): Delete /usr/share/info/dir.gz (closes: #546552).
+ (binary-arch): Add missing relevant ChangeLog files.
-- Thijs Kinkhorst <thijs at debian.org> Mon, 07 Sep 2009 10:01:52 +0200
Modified: gnupg/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/control?rev=157&op=diff
==============================================================================
--- gnupg/trunk/debian/control (original)
+++ gnupg/trunk/debian/control Thu Sep 17 10:55:58 2009
@@ -8,7 +8,7 @@
Standards-Version: 3.8.3
Build-Depends: debhelper (>> 7), libz-dev, libldap2-dev, libbz2-dev,
libusb-dev [!hurd-i386],
- libreadline5-dev, file, gettext, dpatch,
+ libreadline-dev, file, gettext, dpatch,
libcurl4-gnutls-dev
Homepage: http://www.gnupg.org
Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/
@@ -17,13 +17,34 @@
Package: gnupg
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, gpgv
-Recommends: ${shlibs:Recommends}
+Recommends: ${shlibs:Recommends}, gnupg-curl
Suggests: gnupg-doc, xloadimage | imagemagick | eog, libpcsclite1
Description: GNU privacy guard - a free PGP replacement
GnuPG is GNU's tool for secure communication and data storage.
It can be used to encrypt data and to create digital signatures.
It includes an advanced key management facility and is compliant
with the proposed OpenPGP Internet standard as described in RFC2440.
+ .
+ The gnupg package is built without libcurl. So it does not support
+ HKPS keyservers. Install the gnupg-curl package if you want to use
+ the keyserver helper tools built with libcurl and supporting HKPS.
+ .
+ GnuPG does not use any patented algorithms. This means it cannot be
+ compatible with PGP2, because that uses IDEA (which is patented in
+ a number of countries).
+
+Package: gnupg-curl
+Architecture: any
+Depends: ${shlibs:Depends}, ${shlibs:Recommends}, ${misc:Depends}, gnupg
+Description: GNU privacy guard - a free PGP replacement (cURL)
+ GnuPG is GNU's tool for secure communication and data storage.
+ It can be used to encrypt data and to create digital signatures.
+ It includes an advanced key management facility and is compliant
+ with the proposed OpenPGP Internet standard as described in RFC2440.
+ .
+ This package contains the keyserver helper tools built with libcurl,
+ which replace the ones in the gnupg package built with the "curl shim"
+ variant of gnupg. This package provides support for HKPS keyservers.
.
GnuPG does not use any patented algorithms. This means it cannot be
compatible with PGP2, because that uses IDEA (which is patented in
Added: gnupg/trunk/debian/gnupg-curl.postrm
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/gnupg-curl.postrm?rev=157&op=file
==============================================================================
--- gnupg/trunk/debian/gnupg-curl.postrm (added)
+++ gnupg/trunk/debian/gnupg-curl.postrm Thu Sep 17 10:55:58 2009
@@ -1,0 +1,17 @@
+#!/bin/sh
+# postrm script for gnupg-curl
+#
+# see: dh_installdeb(1)
+
+set -e
+
+if [ "$1" = remove ] ; then
+ dpkg-divert --package gnupg-curl --rename \
+ --remove /usr/lib/gnupg/gpgkeys_curl
+ dpkg-divert --package gnupg-curl --rename \
+ --remove /usr/lib/gnupg/gpgkeys_hkp
+fi
+
+#DEBHELPER#
+
+exit 0
Added: gnupg/trunk/debian/gnupg-curl.preinst
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/gnupg-curl.preinst?rev=157&op=file
==============================================================================
--- gnupg/trunk/debian/gnupg-curl.preinst (added)
+++ gnupg/trunk/debian/gnupg-curl.preinst Thu Sep 17 10:55:58 2009
@@ -1,0 +1,19 @@
+#!/bin/sh
+# preinst script for gnupg-curl
+#
+# see: dh_installdeb(1)
+
+set -e
+
+if [ "$1" = install ] || [ "$1" = upgrade ] ; then
+ dpkg-divert --package gnupg-curl \
+ --divert /usr/lib/gnupg/gpgkeys_curl.non_curl \
+ --rename /usr/lib/gnupg/gpgkeys_curl
+ dpkg-divert --package gnupg-curl \
+ --divert /usr/lib/gnupg/gpgkeys_hkp.non_curl \
+ --rename /usr/lib/gnupg/gpgkeys_hkp
+fi
+
+#DEBHELPER#
+
+exit 0
Added: gnupg/trunk/debian/gnupg.doc-base.faq
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/gnupg.doc-base.faq?rev=157&op=file
==============================================================================
--- gnupg/trunk/debian/gnupg.doc-base.faq (added)
+++ gnupg/trunk/debian/gnupg.doc-base.faq Thu Sep 17 10:55:58 2009
@@ -1,0 +1,11 @@
+Document: gnupg-faq
+Title: GnuPG Frequently Asked Questions
+Author: David D. Scribner <faq at gnupg.org>
+Abstract: The GnuPG FAQ contains a list of frequently occuring questions
+ and their answers regarding installation, usage, compatibility,
+ issues, warning and error messages of GnuPG.
+Section: System/Security
+
+Format: HTML
+Index: /usr/share/doc/gnupg/faq.html
+Files: /usr/share/doc/gnupg/faq.html
Modified: gnupg/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/rules?rev=157&op=diff
==============================================================================
--- gnupg/trunk/debian/rules (original)
+++ gnupg/trunk/debian/rules Thu Sep 17 10:55:58 2009
@@ -31,9 +31,16 @@
CONFARGS += --disable-asm
endif
+LDFLAGS += -Wl,--as-needed
+
################################### configure ################################
build-deb/config.status:
+ dh_testdir
+ (mkdir -p $(@D); cd $(@D); \
+ ../configure $(CONFARGS) $(HOSTARG) --without-libcurl)
+
+build-deb-curl/config.status:
dh_testdir
(mkdir -p $(@D); cd $(@D); \
../configure $(CONFARGS) $(HOSTARG))
@@ -41,7 +48,8 @@
build-udeb/config.status:
dh_testdir
(mkdir -p $(@D); cd $(@D); CFLAGS="-g -Os" \
- ../configure $(CONFARGS) $(HOSTARG) --without-bzip2 --without-readline)
+ ../configure $(CONFARGS) $(HOSTARG) \
+ --without-bzip2 --without-readline --without-libcurl)
##################################### build ##################################
@@ -53,21 +61,29 @@
endif
touch $@
+build-deb-curl-stamp: patch-stamp build-deb-curl/config.status
+ dh_testdir
+ $(MAKE) -C build-deb-curl/
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+ make -C build-deb-curl/checks check || exit 1
+endif
+ touch $@
+
build-udeb-stamp: patch-stamp build-udeb/config.status
dh_testdir
$(MAKE) -C build-udeb/
touch $@
-build: build-deb-stamp build-udeb-stamp
+build: build-deb-stamp build-deb-curl-stamp build-udeb-stamp
##################################### clean ##################################
clean: unpatch
dh_testdir
dh_testroot
- rm -rf build-udeb/ build-deb/
+ rm -rf build-udeb/ build-deb-curl/ build-deb/
# find . -name \*~ | xargs rm -vf
- dh_clean build-deb-stamp build-udeb-stamp patch-stamp
+ dh_clean build-deb-stamp build-deb-curl-stamp build-udeb-stamp patch-stamp
#################################### install #################################
@@ -82,8 +98,12 @@
: # 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/info/dir.gz
+ $(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
+ $(RM) debian/gnupg-curl/usr/lib/gnupg/gpgkeys_finger \
+ debian/gnupg-curl/usr/lib/gnupg/gpgkeys_ldap \
+ debian/gnupg-curl/usr/lib/gnupg/gpgkeys_mailto
#################################### binary ##################################
@@ -93,10 +113,11 @@
dh_testroot
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 \
+ for i in checks cipher doc g10 include keyserver mpi po tools util; do \
install -m 644 $$i/ChangeLog debian/gnupg/usr/share/doc/gnupg/changelog.$$i; \
done
install -m 644 ChangeLog debian/gnupg/usr/share/doc/gnupg/changelog.toplevel
+ install -m 644 keyserver/ChangeLog debian/gnupg-curl/usr/share/doc/gnupg-curl/changelog.keyserver
dh_installdocs
dh_installexamples
dh_movefiles -pgpgv --sourcedir=debian/gnupg
More information about the Pkg-gnupg-commit
mailing list