[Pgp-tools-commit] r400 - trunk/debian

[thialme-guest at alioth.debian.org]

Author: thialme-guest
Date: 2009-01-24 14:30:27 +0000 (Sat, 24 Jan 2009)
New Revision: 400

Modified:
   trunk/debian/changelog
   trunk/debian/rules
Log:
Install gpgdir in /usr/bin/ through d.rules.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-01-24 13:27:54 UTC (rev 399)
+++ trunk/debian/changelog	2009-01-24 14:30:27 UTC (rev 400)
@@ -4,6 +4,8 @@
   * Imported gpgdir. (Closes: #498167)
   * Imported gpgwrap. (Closes: #454074)
     Added Quilt framework/README.source to handle gpgwrap.
+  * Refreshed debian/control and README files with the new descriptions.
+  
 
   [ Thijs Kinkhorst ]
   * Checked for policy 3.8.0, no changes.

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2009-01-24 13:27:54 UTC (rev 399)
+++ trunk/debian/rules	2009-01-24 14:30:27 UTC (rev 400)
@@ -4,6 +4,16 @@
 
 VERSION := $(shell dpkg-parsechangelog | grep ^Version | cut -d' ' -f2)
 
+INSTALL             = install
+INSTALL_PROGRAM     = $(INSTALL)
+INSTALL_DATA        = $(INSTALL) -m 644
+
+GPGDIR_DIR          = gpgdir
+GPGDIR_PROG         = gpgdir
+
+DESTDIR             = $(CURDIR)/debian/signing-party
+DESTDIR_BIN         = $(CURDIR)/debian/signing-party/usr/bin
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
@@ -27,11 +37,12 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/signing-party
+	$(MAKE) install DESTDIR=$(DESTDIR)
+	$(INSTALL_PROGRAM) $(GPGDIR_DIR)/$(GPGDIR_PROG) $(DESTDIR_BIN)
 	dh_install
 	dh_installman */*.1 */*/*.1
 	install -d $(CURDIR)/debian/signing-party/usr/share/doc/signing-party/caff
-	install -m 644 caff/README \
+	$(INSTALL_DATA) caff/README \
 		caff/README.gpg-agent \
 		caff/README.many-keys \
 		caff/README.v3-keys \