[Pkg-gnupg-commit] [gnupg2] 07/14: tell gnupg that it will be gpg, not gpg2

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch experimental-move-to-gnupg
in repository gnupg2.

commit f9d7d4b8a16ec4e375b0ace4f88784a5da336333
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Sat Aug 22 19:58:35 2015 +0200

    tell gnupg that it will be gpg, not gpg2
---
 debian/gnupg.install | 2 +-
 debian/gpgv.install  | 2 +-
 debian/rules         | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/gnupg.install b/debian/gnupg.install
index ddb3d8e..ee7efcd 100644
--- a/debian/gnupg.install
+++ b/debian/gnupg.install
@@ -1,4 +1,4 @@
-debian/tmp/usr/bin/gpg2
+debian/tmp/usr/bin/gpg
 debian/tmp/usr/bin/gpgconf
 debian/tmp/usr/bin/gpgparsemail
 debian/tmp/usr/bin/kbxutil
diff --git a/debian/gpgv.install b/debian/gpgv.install
index b9c4521..0a9f9a2 100644
--- a/debian/gpgv.install
+++ b/debian/gpgv.install
@@ -1 +1 @@
-debian/tmp/usr/bin/gpgv2
+debian/tmp/usr/bin/gpgv
diff --git a/debian/rules b/debian/rules
index 497219d..8f28d96 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,6 +32,7 @@ override_dh_auto_configure:
 	   	$(foreach x, $(GPGV_UDEB_UNNEEDED), --disable-$(x))
 	dh_auto_configure --builddirectory=build -- --libexecdir=\$${prefix}/lib/gnupg \
 		--disable-gpgtar \
+		--enable-gpg2-is-gpg \
 		--enable-symcryptrun --enable-large-secmem
 
 override_dh_auto_build-arch:

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