[Pkg-gnupg-commit] [gnupg1] 02/03: drop gnupg1-curl (Closes: #870453)
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Wed Aug 2 07:01:55 UTC 2017
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch master
in repository gnupg1.
commit ba179f24845addf7e386ee1fe0055aba7dfcb643
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Wed Aug 2 02:45:53 2017 -0400
drop gnupg1-curl (Closes: #870453)
---
debian/clean | 1 -
debian/control | 34 ++++------------------------------
debian/gnupg1-curl.install | 1 -
debian/gnupg1-curl.postrm | 17 -----------------
debian/gnupg1-curl.preinst | 19 -------------------
debian/rules | 10 ++--------
6 files changed, 6 insertions(+), 76 deletions(-)
diff --git a/debian/clean b/debian/clean
index 39db88b..2f52919 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,4 +1,3 @@
po/*.gmo
po/stamp-po
po/gnupg1.pot
-build-deb-curl/
diff --git a/debian/control b/debian/control
index 0b15012..d603e61 100644
--- 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
diff --git a/debian/gnupg1-curl.install b/debian/gnupg1-curl.install
deleted file mode 100644
index f48283f..0000000
--- a/debian/gnupg1-curl.install
+++ /dev/null
@@ -1 +0,0 @@
-build-deb-curl/keyserver/gpgkeys_hkp build-deb-curl/keyserver/gpgkeys_curl usr/lib/gnupg1
diff --git a/debian/gnupg1-curl.postrm b/debian/gnupg1-curl.postrm
deleted file mode 100644
index a30a969..0000000
--- a/debian/gnupg1-curl.postrm
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/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
diff --git a/debian/gnupg1-curl.preinst b/debian/gnupg1-curl.preinst
deleted file mode 100644
index a05c1a3..0000000
--- a/debian/gnupg1-curl.preinst
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/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
diff --git a/debian/rules b/debian/rules
index 6b3ebba..d3563fb 100755
--- 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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg1.git
More information about the Pkg-gnupg-commit
mailing list