drop gnupg1-curl (Closes: #870453)

ba179f24 · Daniel Kahn Gillmor · 90233daa · ba179f24 · ba179f24 · 90233daa
Commit ba179f24 authored 7 years ago by Daniel Kahn Gillmor
--- a/debian/clean
+++ b/debian/clean
 po/*.gmo
 po/stamp-po
 po/gnupg1.pot
-build-deb-curl/
--- a/debian/control
+++ b/debian/control
@@ -31,13 +31,16 @@ Depends:
 ${misc:Depends},
 ${shlibs:Depends},
 Recommends:
- gnupg1-curl,
 gnupg1-l10n (= ${source:Version}),
 ${shlibs:Recommends},
 Breaks:
 gnupg (<< 1.4.20-6+exp1),
+ gnupg1-curl (<< 1.4.22-2),
 Replaces:
 gnupg (<< 1.4.20-6+exp1),
+ gnupg1-curl (<< 1.4.22-2),
+Provides:
+ gnupg1-curl,
 Suggests:
 libpcsclite1,
 parcimonie,
@@ -54,35 +57,6 @@ Description: GNU privacy guard - a PGP implementation (deprecated "classic" vers
 archived messages.  It does not support more recent cryptographic
 primitives like ECDSA or EdDSA.  Please use the gnupg package instead
 unless you know for sure that you need gnupg1.
- .
- The gnupg1 package is built without libcurl to minimize dependencies,
- so it does not support HKPS keyservers. Install the gnupg1-curl
- package if you want to use the keyserver helper tools built with
- libcurl and supporting HKPS.
-
-Package: gnupg1-curl
-Architecture: any
-Multi-Arch: foreign
-Depends:
- gnupg1,
- ${misc:Depends},
- ${shlibs:Depends},
- ${shlibs:Recommends},
-Description: GNU privacy guard (cURL helpers for deprecated "classic" version)
- 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 RFC 4880.
- .
- This package contains the keyserver helper tools built with libcurl,
- which replace the ones in the gnupg1 package built with the "curl
- shim" variant of gnupg1. This package provides support for HKPS
- keyservers.
- .
- Since gnupg1 is deprecated in Debian, it is recommended that you use
- the gnupg package instead, and rely on the "dirmngr" package for
- network access.  dirmngr can do everything that gnupg1-curl can do,
- and more.

 Package: gpgv1
 Architecture: any

--- a/debian/gnupg1-curl.install
+++ b/debian/gnupg1-curl.install
-build-deb-curl/keyserver/gpgkeys_hkp build-deb-curl/keyserver/gpgkeys_curl usr/lib/gnupg1
--- a/debian/gnupg1-curl.postrm
+++ b/debian/gnupg1-curl.postrm
-#!/bin/sh
-# postrm script for gnupg1-curl
-#
-# see: dh_installdeb(1)
-
-set -e
-
-if [ "$1" = remove ] ; then
-	dpkg-divert --package gnupg1-curl --rename \
-	   --remove /usr/lib/gnupg1/gpgkeys_curl
-	dpkg-divert --package gnupg1-curl --rename \
-	   --remove /usr/lib/gnupg1/gpgkeys_hkp
-fi
-
-#DEBHELPER#
-
-exit 0
--- a/debian/gnupg1-curl.preinst
+++ b/debian/gnupg1-curl.preinst
-#!/bin/sh
-# preinst script for gnupg1-curl
-#
-# see: dh_installdeb(1)
-
-set -e
-
-if [ "$1" = install ] || [ "$1" = upgrade ] ; then
-	dpkg-divert --package gnupg1-curl \
-	   --divert /usr/lib/gnupg1/gpgkeys_curl.non_curl \
-	   --rename /usr/lib/gnupg1/gpgkeys_curl
-	dpkg-divert --package gnupg1-curl \
-	   --divert /usr/lib/gnupg1/gpgkeys_hkp.non_curl \
-	   --rename /usr/lib/gnupg1/gpgkeys_hkp
-fi
-
-#DEBHELPER#
-
-exit 0
--- a/debian/rules
+++ b/debian/rules
@@ -7,18 +7,12 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 %:
 	dh $@ --builddirectory=build-deb

-CONFARGS  = --prefix=/usr --libexecdir=/usr/lib/ --enable-noexecstack --disable-card-support
-
-CONFARGS_FULL    = --enable-mailto --with-mailprog=/usr/sbin/sendmail --enable-large-secmem
-
 override_dh_auto_configure:
 	dh_auto_configure --builddirectory=build-deb -- --libexecdir=\$${prefix}/lib/gnupg1 \
-		$(CONFARGS) $(CONFARGS_FULL) --without-libcurl
-	dh_auto_configure --builddirectory=build-deb-curl -- --libexecdir=\$${prefix}/lib/gnupg1 \
-		$(CONFARGS) $(CONFARGS_FULL)
+		--prefix=/usr --libexecdir=/usr/lib/ --enable-noexecstack --disable-card-support \
+		--enable-mailto --with-mailprog=/usr/sbin/sendmail --enable-large-secmem

 override_dh_auto_build-arch:
-	dh_auto_build --builddirectory=build-deb-curl
 	dh_auto_build --builddirectory=build-deb
 	cp build-deb/doc/gpgv.1 build-deb/doc/gpgv1.1
 	cp build-deb/doc/gpg.1 build-deb/doc/gpg1.1