X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=debian%2Frules;h=2345609ed3fe5e0d88ba328839da34e407ca5823;hb=6f50980b38de13d6d4e9c16399b0db34a6443ca2;hp=ac2a8f59128a8e8728fe41027c132f34d2f2cf60;hpb=c201de5e807680720bea0f506b2c48ca30707280;p=pgp-tools.git

diff --git a/debian/rules b/debian/rules
index ac2a8f5..2345609 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,31 @@
 #!/usr/bin/make -f
 
+include /usr/share/quilt/quilt.make
+
 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
 	touch $@
 
 build: build-stamp
-build-stamp: configure-stamp
+build-stamp: $(QUILT_STAMPFN) configure-stamp
 	dh_testdir
 	$(MAKE)
 	touch $@
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	$(MAKE) clean
@@ -25,19 +37,19 @@ install: build
 	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
+	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 \
 		caff/caffrc.sample \
 			$(CURDIR)/debian/signing-party/usr/share/doc/signing-party/caff
-	install -d $(CURDIR)/debian/signing-party/usr/share/lintian/overrides
-	install -m 644 debian/overrides/signing-party $(CURDIR)/debian/signing-party/usr/share/lintian/overrides
-
+	# ignore errors with older debhelper versions
+	-dh_lintian
 
 binary-indep: build install
 	dh_testdir
@@ -47,6 +59,7 @@ binary-indep: build install
 	dh_installcron
 	dh_installinfo
 	dh_installchangelogs
+	dh_strip
 	dh_compress
 	dh_fixperms
 	dh_installdeb