[Pkg-gnupg-commit] [gnupg2] 203/205: use standard dh to ship Xsession.d script

[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 2cea1d5c9226ba9a10b8fd08c27b70e8ad63943c
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Tue May 10 22:30:10 2016 -0400

    use standard dh to ship Xsession.d script
---
 debian/{gnupg-agent.xsession => Xsession.d/90gpg-agent} | 0
 debian/clean                                            | 1 -
 debian/gnupg-agent.install                              | 1 +
 debian/rules                                            | 8 +-------
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/debian/gnupg-agent.xsession b/debian/Xsession.d/90gpg-agent
similarity index 100%
rename from debian/gnupg-agent.xsession
rename to debian/Xsession.d/90gpg-agent
diff --git a/debian/clean b/debian/clean
index ddec324..1f44e57 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,5 +1,4 @@
 po/*.gmo
 po/stamp-po
 build-gpgv-udeb/
-build/
 build-gpgv-win32/
diff --git a/debian/gnupg-agent.install b/debian/gnupg-agent.install
index 7af5492..4529827 100644
--- a/debian/gnupg-agent.install
+++ b/debian/gnupg-agent.install
@@ -1,3 +1,4 @@
+debian/Xsession.d/90gpg-agent etc/X11/Xsession.d
 debian/tmp/usr/bin/gpg-agent
 debian/tmp/usr/bin/gpg-connect-agent
 debian/tmp/usr/bin/symcryptrun
diff --git a/debian/rules b/debian/rules
index 15e44f2..952b0ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ include /usr/share/dpkg/architecture.mk
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh $@ --with autoreconf
+	dh $@ --with=autoreconf --builddirectory=build
 
 GPGV_UDEB_UNNEEDED = gpgtar bzip2 gpgsm scdaemon dirmngr doc tofu exec ldap gnutls dns-srv sqlite
 
@@ -54,9 +54,3 @@ override_dh_shlibdeps:
 # Make ldap a recommends rather than a hard dependency.
 	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:
-	dh_auto_install --builddirectory=build
-	install -d debian/gnupg-agent/etc/X11/Xsession.d
-	install -m 644 debian/gnupg-agent.xsession \
-		debian/gnupg-agent/etc/X11/Xsession.d/90gpg-agent

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