[Pkg-gnupg-commit] [gnupg2] 03/14: Ship dedicated binaries in /usr/lib/gnupg instead of /usr/lib/gnupg2

[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 a9dc2b9159a2429ca92cb47cb2359ab9d71583aa
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed Feb 17 19:03:14 2016 -0500

    Ship dedicated binaries in /usr/lib/gnupg instead of /usr/lib/gnupg2
---
 debian/dirmngr.install     | 6 +++---
 debian/gnupg-agent.install | 6 +++---
 debian/gnupg2.install      | 6 +++---
 debian/gpgsm.install       | 4 ++--
 debian/rules               | 4 ++--
 debian/scdaemon.install    | 2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/debian/dirmngr.install b/debian/dirmngr.install
index 68175cd..a543f7c 100644
--- a/debian/dirmngr.install
+++ b/debian/dirmngr.install
@@ -1,5 +1,5 @@
 debian/tmp/usr/bin/dirmngr
 debian/tmp/usr/bin/dirmngr-client
-debian/tmp/usr/lib/gnupg2/dirmngr_ldap
-debian/tmp/usr/share/gnupg2/dirmngr-conf.skel
-debian/tmp/usr/share/gnupg2/sks-keyservers.netCA.pem
+debian/tmp/usr/lib/gnupg/dirmngr_ldap
+debian/tmp/usr/share/gnupg/dirmngr-conf.skel
+debian/tmp/usr/share/gnupg/sks-keyservers.netCA.pem
diff --git a/debian/gnupg-agent.install b/debian/gnupg-agent.install
index 13732e9..7af5492 100644
--- a/debian/gnupg-agent.install
+++ b/debian/gnupg-agent.install
@@ -1,6 +1,6 @@
 debian/tmp/usr/bin/gpg-agent
 debian/tmp/usr/bin/gpg-connect-agent
 debian/tmp/usr/bin/symcryptrun
-debian/tmp/usr/lib/gnupg2/gpg-check-pattern
-debian/tmp/usr/lib/gnupg2/gpg-preset-passphrase
-debian/tmp/usr/lib/gnupg2/gpg-protect-tool
+debian/tmp/usr/lib/gnupg/gpg-check-pattern
+debian/tmp/usr/lib/gnupg/gpg-preset-passphrase
+debian/tmp/usr/lib/gnupg/gpg-protect-tool
diff --git a/debian/gnupg2.install b/debian/gnupg2.install
index e0c05c3..ddb3d8e 100644
--- a/debian/gnupg2.install
+++ b/debian/gnupg2.install
@@ -5,7 +5,7 @@ debian/tmp/usr/bin/kbxutil
 debian/tmp/usr/bin/watchgnupg
 debian/tmp/usr/sbin/addgnupghome
 debian/tmp/usr/sbin/applygnupgdefaults
-debian/tmp/usr/share/gnupg2/distsigkey.gpg
-debian/tmp/usr/share/gnupg2/gpg-conf.skel
-debian/tmp/usr/share/gnupg2/help.*.txt
+debian/tmp/usr/share/gnupg/distsigkey.gpg
+debian/tmp/usr/share/gnupg/gpg-conf.skel
+debian/tmp/usr/share/gnupg/help.*.txt
 debian/tmp/usr/share/locale
diff --git a/debian/gpgsm.install b/debian/gpgsm.install
index 2708347..64e01f5 100644
--- a/debian/gpgsm.install
+++ b/debian/gpgsm.install
@@ -1,3 +1,3 @@
 debian/tmp/usr/bin/gpgsm
-debian/tmp/usr/share/gnupg2/com-certs.pem
-debian/tmp/usr/share/gnupg2/qualified.txt
+debian/tmp/usr/share/gnupg/com-certs.pem
+debian/tmp/usr/share/gnupg/qualified.txt
diff --git a/debian/rules b/debian/rules
index f78b7ef..497219d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,7 +30,7 @@ WIN32_FLAGS=LDFLAGS="-Xlinker --no-insert-timestamp -static" CFLAGS="-g -Os" CPP
 override_dh_auto_configure:
 	dh_auto_configure --builddirectory=build-gpgv-udeb -- \
 	   	$(foreach x, $(GPGV_UDEB_UNNEEDED), --disable-$(x))
-	dh_auto_configure --builddirectory=build -- --libexecdir=\$${prefix}/lib/gnupg2 \
+	dh_auto_configure --builddirectory=build -- --libexecdir=\$${prefix}/lib/gnupg \
 		--disable-gpgtar \
 		--enable-symcryptrun --enable-large-secmem
 
@@ -56,7 +56,7 @@ override_dh_auto_build-indep:
 
 override_dh_shlibdeps:
 # Make ldap a recommends rather than a hard dependency.
-	dpkg-shlibdeps -Tdebian/dirmngr.substvars -dRecommends debian/dirmngr/usr/lib/gnupg2/dirmngr_ldap -dDepends debian/dirmngr/usr/bin/dirmngr*
+	dpkg-shlibdeps -Tdebian/dirmngr.substvars -dRecommends debian/dirmngr/usr/lib/gnupg/dirmngr_ldap -dDepends debian/dirmngr/usr/bin/dirmngr*
 	dh_shlibdeps -Ndirmngr
 
 override_dh_auto_install-arch:
diff --git a/debian/scdaemon.install b/debian/scdaemon.install
index 321ad60..a2a79aa 100644
--- a/debian/scdaemon.install
+++ b/debian/scdaemon.install
@@ -1 +1 @@
-debian/tmp/usr/lib/gnupg2/scdaemon
+debian/tmp/usr/lib/gnupg/scdaemon

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