[Pkg-gnupg-commit] [gnupg2] 201/205: simplify the shipping of gpgv.exe

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch experimental
in repository gnupg2.

commit 56fc787efb267e8c2f7698470b8e5cdb98b1979d
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Tue May 10 22:21:54 2016 -0400

    simplify the shipping of gpgv.exe
---
 debian/gpgv-win32.install | 1 +
 debian/rules              | 6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/debian/gpgv-win32.install b/debian/gpgv-win32.install
new file mode 100644
index 0000000..cf3cd8c
--- /dev/null
+++ b/debian/gpgv-win32.install
@@ -0,0 +1 @@
+build-gpgv-win32/g10/gpgv.exe usr/share/win32
diff --git a/debian/rules b/debian/rules
index 921bf41..2eea106 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,6 +48,7 @@ override_dh_auto_build-indep:
 	cd build-gpgv-win32/common && $(WIN32_FLAGS) $(MAKE) libsimple-pwquery.a
 	cd build-gpgv-win32/kbx && $(WIN32_FLAGS) $(MAKE) libkeybox.a
 	cd build-gpgv-win32/g10 && $(WIN32_FLAGS) $(MAKE) gpgv.exe
+	strip build-gpgv-win32/g10/gpgv.exe
 
 override_dh_shlibdeps:
 # Make ldap a recommends rather than a hard dependency.
@@ -60,10 +61,5 @@ override_dh_auto_install-arch:
 	install -m 644 debian/gnupg-agent.xsession \
 		debian/gnupg-agent/etc/X11/Xsession.d/90gpg-agent
 
-override_dh_auto_install-indep:
-	mkdir -p debian/gpgv-win32/usr/share/win32
-	install build-gpgv-win32/g10/gpgv2.exe debian/gpgv-win32/usr/share/win32/gpgv.exe
-	strip debian/gpgv-win32/usr/share/win32/gpgv.exe
-
 override_dh_auto_test:
 	if ! dh_auto_test; then echo xxx; cat tests/openpgp/gpgtar.test.log; echo xxx; false; fi

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