[Pkg-gnupg-commit] [gnupg] 14/17: move gnupg to gnupg1
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Fri Apr 1 16:34:35 UTC 2016
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch experimental
in repository gnupg.
commit f8650c790de99c3f9c85e0c4481800ff306bba17
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Fri Apr 1 01:09:13 2016 -0400
move gnupg to gnupg1
---
debian/README.Debian | 48 +++++++++++++++++++++++++++-----------
debian/changelog | 1 +
debian/clean | 1 +
debian/control | 33 +++++++++++++-------------
debian/gnupg-curl.postrm | 17 --------------
debian/gnupg-curl.preinst | 19 ---------------
debian/gnupg.bug-presubj | 2 --
debian/gnupg1-curl.postrm | 17 ++++++++++++++
debian/gnupg1-curl.preinst | 19 +++++++++++++++
debian/gnupg1.bug-presubj | 2 ++
debian/{gnupg.docs => gnupg1.docs} | 0
debian/rules | 28 +++++++++++-----------
debian/source/lintian-overrides | 4 ++--
13 files changed, 107 insertions(+), 84 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
index db269ac..f36c263 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,18 +1,38 @@
-GnuPG for Debian
-================
+GnuPG "classic" for Debian
+==========================
-A comprehensive manual (the GNU Privacy Handbook) is included in the
-gnupg-doc package. It can also be found online at
-<http://www.gnupg.org/documentation/guides.html>.
+gnupg1 is the "classic" version of GnuPG (branch 1.4), maintained for
+people who really need the backward compatibility it provides.
-Smart card readers
-------------------
-If udev, consolekit, and gnupg are installed, then locally logged-in
-users will be automatically granted permission to access any detected
-USB SmartCard reader devices.
+Since mid-2016, Debian ships the "modern" version of GnuPG as gnupg.
+Please use the gnupg package unless you know for sure that you need
+gnupg1.
-/lib/udev/rules.d/60-gnupg.rules lists the supported devices. If yours
-is not listed there, you can try creating a copy of that file in
-/etc/udev/rules.d/ with your device’s information. Wishlist bugs
-against the gnupg package about unsupported devices would be welcome.
+The main differences between "classic" and "modern":
+ * "classic" has fewer dependencies than "modern"; improvements to
+ underlying libraries must be explicitly ported to "classic"
+
+ " "classic" accepts the known-broken PGPv3 key format, which "modern"
+ rejects
+
+ * "classic" has no support for S/MIME
+
+ * "classic" has no support for elliptic curves
+
+ * "classic" uses gpg-agent only as a passphrase cache, while "modern"
+ offloads all secret key access to the agent
+
+ * "classic" cannot auto-launch the agent
+
+ * "classic" does not support the TOFU trust model
+
+ * "classic" lacks some other tools useful for desktop environments
+
+ * "modern" prefers the keybox format (~/.gnupg/pubring.kbx) for
+ public keyrings; "classic" only knows how to use the traditional
+ linear keyring (~/gnupg/pubring.gpg)
+
+It is recommended to use gnupg instead of gnupg1.
+
+ -- Daniel Kahn Gillmor <dkg at fifthhorseman.net>, Fri, 1 Apr 2016 07:23:34 -0300
diff --git a/debian/changelog b/debian/changelog
index 262a1f2..e5f91ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ gnupg (1.4.20-5+exp1) experimental; urgency=medium
* drop gpgv-win32, now handled by gnupg2 source package
* move gpgv to gpgv1
+ * move gnupg to gnupg1
-- Daniel Kahn Gillmor <dkg at fifthhorseman.net> Fri, 01 Apr 2016 13:32:02 -0300
diff --git a/debian/clean b/debian/clean
index 07b13f1..2f52919 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,2 +1,3 @@
po/*.gmo
po/stamp-po
+po/gnupg1.pot
diff --git a/debian/control b/debian/control
index 506a112..540772c 100644
--- a/debian/control
+++ b/debian/control
@@ -21,41 +21,42 @@ Homepage: https://www.gnupg.org
Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-gnupg/gnupg.git
Vcs-Git: git://anonscm.debian.org/pkg-gnupg/gnupg.git
-Package: gnupg
+Package: gnupg1
Architecture: any
Multi-Arch: foreign
-Depends: gpgv, ${misc:Depends}, ${shlibs:Depends}
-Recommends: gnupg-curl, ${shlibs:Recommends}
+Depends: gpgv | gpgv1, ${misc:Depends}, ${shlibs:Depends}
+Recommends: gnupg1-curl, ${shlibs:Recommends}
Suggests: gnupg-doc, libpcsclite1, parcimonie, xloadimage | imagemagick | eog
-Description: GNU privacy guard - a free PGP replacement
+Description: GNU privacy guard - a free PGP replacement ("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.
.
- GnuPG 1.4 is the standalone, non-modularized series. In contrast to
- the version 2 series, shipped with the gnupg2 package, it comes
- with no support for S/MIME and some other tools useful for desktop
- environments, but also with less dependencies.
+ GnuPG 1.4 is the "classic" standalone, non-modularized
+ version. Please use the gnupg package instead unless you know for
+ sure that you need gnupg1.
.
- 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.
+ 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: gnupg-curl
+Package: gnupg1-curl
Priority: optional
Architecture: any
Multi-Arch: foreign
-Depends: gnupg, ${misc:Depends}, ${shlibs:Depends}, ${shlibs:Recommends}
-Description: GNU privacy guard - a free PGP replacement (cURL)
+Depends: gnupg1, ${misc:Depends}, ${shlibs:Depends}, ${shlibs:Recommends}
+Description: GNU privacy guard - a free PGP replacement (cURL helpers for "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 gnupg package built with the "curl shim"
- variant of gnupg. This package provides support for HKPS keyservers.
+ which replace the ones in the gnupg1 package built with the "curl
+ shim" variant of gnupg1. This package provides support for HKPS
+ keyservers.
Package: gpgv1
Architecture: any
diff --git a/debian/gnupg-curl.postrm b/debian/gnupg-curl.postrm
deleted file mode 100644
index cf25f73..0000000
--- a/debian/gnupg-curl.postrm
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/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
diff --git a/debian/gnupg-curl.preinst b/debian/gnupg-curl.preinst
deleted file mode 100644
index ff4aa44..0000000
--- a/debian/gnupg-curl.preinst
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/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
diff --git a/debian/gnupg.bug-presubj b/debian/gnupg.bug-presubj
deleted file mode 100644
index 8cfe745..0000000
--- a/debian/gnupg.bug-presubj
+++ /dev/null
@@ -1,2 +0,0 @@
-Please consider reading /usr/share/doc/gnupg/README.BUGS.Debian.gz before
-sending a bug report. Maybe you'll find your problem there.
diff --git a/debian/gnupg1-curl.postrm b/debian/gnupg1-curl.postrm
new file mode 100644
index 0000000..a30a969
--- /dev/null
+++ b/debian/gnupg1-curl.postrm
@@ -0,0 +1,17 @@
+#!/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
new file mode 100644
index 0000000..a05c1a3
--- /dev/null
+++ b/debian/gnupg1-curl.preinst
@@ -0,0 +1,19 @@
+#!/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/gnupg1.bug-presubj b/debian/gnupg1.bug-presubj
new file mode 100644
index 0000000..c6cdfd1
--- /dev/null
+++ b/debian/gnupg1.bug-presubj
@@ -0,0 +1,2 @@
+Please consider reading /usr/share/doc/gnupg1/README.BUGS.Debian.gz before
+sending a bug report. Maybe you'll find your problem there.
diff --git a/debian/gnupg.docs b/debian/gnupg1.docs
similarity index 100%
rename from debian/gnupg.docs
rename to debian/gnupg1.docs
diff --git a/debian/rules b/debian/rules
index 1d9dc18..af603a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -111,17 +111,17 @@ install: build
dh_testroot
dh_prep
dh_installdirs
- $(MAKE) -C build-deb install DESTDIR=$(CURDIR)/debian/gnupg
- mv $(CURDIR)/debian/gnupg/usr/bin/gpgv $(CURDIR)/debian/gnupg/usr/bin/gpgv1
- mv $(CURDIR)/debian/gnupg/usr/share/man/man1/gpgv.1 $(CURDIR)/debian/gnupg/usr/share/man/man1/gpgv1.1
+ $(MAKE) -C build-deb install DESTDIR=$(CURDIR)/debian/gnupg1
+ mv $(CURDIR)/debian/gnupg1/usr/bin/gpgv $(CURDIR)/debian/gnupg1/usr/bin/gpgv1
+ mv $(CURDIR)/debian/gnupg1/usr/share/man/man1/gpgv.1 $(CURDIR)/debian/gnupg1/usr/share/man/man1/gpgv1.1
: # Remove from /usr/share/gnupg what we install into /usr/share/doc/gnupg/
- $(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
- $(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
+ $(RM) debian/gnupg1/usr/share/gnupg1/FAQ
+ $(RM) debian/gnupg1/usr/share/info/dir*
+ find debian/gnupg1/ -type d -empty -delete
+ $(MAKE) -C build-deb-curl/keyserver install DESTDIR=$(CURDIR)/debian/gnupg1-curl
+ $(RM) debian/gnupg1-curl/usr/lib/gnupg1/gpgkeys_finger \
+ debian/gnupg1-curl/usr/lib/gnupg1/gpgkeys_ldap \
+ debian/gnupg1-curl/usr/lib/gnupg1/gpgkeys_mailto
#################################### binary ##################################
@@ -133,7 +133,7 @@ binary-arch: build install
dh_installchangelogs -a NEWS ChangeLog
dh_installdocs -a
dh_installexamples -a
- dh_movefiles -a -pgpgv1 --sourcedir=debian/gnupg
+ dh_movefiles -a -pgpgv1 --sourcedir=debian/gnupg1
dh_install -a
dh_installinfo -a doc/gnupg1.info
dh_installman -a
@@ -145,11 +145,11 @@ binary-arch: build install
dh_fixperms -a
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
+ chown root:root debian/gnupg1/usr/bin/gpg
+ chmod 4755 debian/gnupg1/usr/bin/gpg
endif
dh_installdeb -a
- dh_shlibdeps -a -X debian/gnupg/usr/lib/gnupg/gpgkeys_ldap -- -dRecommends $(CURDIR)/debian/gnupg/usr/lib/gnupg/gpgkeys_ldap -dDepends
+ dh_shlibdeps -a -X debian/gnupg1/usr/lib/gnupg1/gpgkeys_ldap -- -dRecommends $(CURDIR)/debian/gnupg1/usr/lib/gnupg1/gpgkeys_ldap -dDepends
dh_gencontrol -a
dh_md5sums -a
dh_builddeb -a
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 318bac6..f783493 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,5 +1,5 @@
-gnupg source: binaries-have-file-conflict gnupg gnupg-curl usr/lib/gnupg/gpgkeys_curl
-gnupg source: binaries-have-file-conflict gnupg gnupg-curl usr/lib/gnupg/gpgkeys_hkp
+gnupg source: binaries-have-file-conflict gnupg gnupg-curl usr/lib/gnupg1/gpgkeys_curl
+gnupg source: binaries-have-file-conflict gnupg gnupg-curl usr/lib/gnupg1/gpgkeys_hkp
# doc merely references / cites IETF RFC:
gnupg source: license-problem-non-free-RFC doc/OpenPGP
gnupg source: license-problem-non-free-RFC debian/copyright
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg.git
More information about the Pkg-gnupg-commit
mailing list