[Pkg-gnupg-commit] [gnupg] 09/17: move gpgv to gpgv1

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg.

commit 5fe3650711a16b77d194039426c51a37b66d3362
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Thu Mar 31 17:31:51 2016 -0400

    move gpgv to gpgv1
---
 debian/changelog   | 1 +
 debian/control     | 9 +++++++--
 debian/gpgv.files  | 2 --
 debian/gpgv1.files | 2 ++
 debian/rules       | 4 +++-
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6fcd060..262a1f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 gnupg (1.4.20-5+exp1) experimental; urgency=medium
 
   * drop gpgv-win32, now handled by gnupg2 source package
+  * move gpgv to gpgv1
 
  -- Daniel Kahn Gillmor <dkg at fifthhorseman.net>  Fri, 01 Apr 2016 13:32:02 -0300
 
diff --git a/debian/control b/debian/control
index e3c80c8..506a112 100644
--- a/debian/control
+++ b/debian/control
@@ -57,18 +57,23 @@ Description: GNU privacy guard - a free PGP replacement (cURL)
  which replace the ones in the gnupg package built with the "curl shim"
  variant of gnupg. This package provides support for HKPS keyservers.
 
-Package: gpgv
+Package: gpgv1
 Architecture: any
 Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: gnupg
-Description: GNU privacy guard - signature verification tool
+Description: GNU privacy guard - signature verification tool ("classic" version)
  GnuPG is GNU's tool for secure communication and data storage.
  .
  gpgv is a stripped-down version of gnupg which is only able to check
  signatures.  It is smaller than the full-blown gnupg and uses a
  different (and simpler) way to check that the public keys used to
  make the signature are trustworthy.
+ .
+ gpgv1 is the "classic" version of gpgv. It does not support as many
+ cryptographic primitives as the modern version, so there are
+ signatures it cannot verify.  Please use the "gpgv" package instead
+ where possible.
 
 Package: gpgv1.4-udeb
 Package-Type: udeb
diff --git a/debian/gpgv.files b/debian/gpgv.files
deleted file mode 100644
index 25c5efb..0000000
--- a/debian/gpgv.files
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/gpgv
-usr/share/man/man1/gpgv.1
diff --git a/debian/gpgv1.files b/debian/gpgv1.files
new file mode 100644
index 0000000..cc4816a
--- /dev/null
+++ b/debian/gpgv1.files
@@ -0,0 +1,2 @@
+usr/bin/gpgv1
+usr/share/man/man1/gpgv1.1
diff --git a/debian/rules b/debian/rules
index 352df72..1d9dc18 100755
--- a/debian/rules
+++ b/debian/rules
@@ -112,6 +112,8 @@ install: build
 	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
 	: # 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*
@@ -131,7 +133,7 @@ binary-arch: build install
 	dh_installchangelogs -a NEWS ChangeLog
 	dh_installdocs -a
 	dh_installexamples -a
-	dh_movefiles -a -pgpgv --sourcedir=debian/gnupg
+	dh_movefiles -a -pgpgv1 --sourcedir=debian/gnupg
 	dh_install -a
 	dh_installinfo -a doc/gnupg1.info
 	dh_installman -a

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg.git