X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=debian%2Frules;h=1bcf1019f37fd74bf4eadc2e06c95ccbd238c232;hb=f0fb33b472ef7bae50bfc467322540f0fad17ef9;hp=5dd1529388c147ccd5f188a47d1ba3135d5750f7;hpb=8542119444e2f6ea5fe122434f4e6fca0ad41209;p=pgp-tools.git

diff --git a/debian/rules b/debian/rules
index 5dd1529..1bcf101 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 
-include /usr/share/quilt/quilt.make
+export DEB_BUILD_MAINT_OPTIONS := hardening=+bindnow
+DPKG_EXPORT_BUILDFLAGS = 1
+-include /usr/share/dpkg/buildflags.mk
 
 VERSION := $(shell dpkg-parsechangelog | grep ^Version | cut -d' ' -f2)
 
@@ -12,6 +14,7 @@ GPGDIR_DIR          = gpgdir
 GPGDIR_PROG         = gpgdir
 
 GPGWRAP_DIR         = gpgwrap
+GPGWRAP_PROG        = bin/gpgwrap
 
 DESTDIR             = $(CURDIR)/debian/signing-party
 DESTDIR_BIN         = $(DESTDIR)/usr/bin
@@ -22,13 +25,15 @@ configure-stamp:
 	dh_testdir
 	touch $@
 
-build: build-stamp
-build-stamp: $(QUILT_STAMPFN) configure-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
+build-stamp: configure-stamp
 	dh_testdir
 	$(MAKE)
 	touch $@
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	$(MAKE) clean
@@ -38,25 +43,28 @@ clean: unpatch
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 	$(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_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
+			caff/README.gpg-agent \
+			caff/README.many-keys \
+			caff/README.v3-keys \
+			caff/caffrc.sample \
+			$(DESTDIR_DOC)/caff
+	
+	$(INSTALL_PROGRAM) $(GPGDIR_DIR)/$(GPGDIR_PROG) $(DESTDIR_BIN)		
 	$(INSTALL_DATA) $(GPGDIR_DIR)/ChangeLog $(DESTDIR_DOC)/changelog.gpgdir
+	
+	$(INSTALL_PROGRAM) $(GPGWRAP_DIR)/$(GPGWRAP_PROG) $(DESTDIR_BIN)		
 	$(INSTALL_DATA) $(GPGWRAP_DIR)/NEWS $(DESTDIR_DOC)/changelog.gpgwrap
-	# ignore errors with older debhelper versions
-	-dh_lintian
+	
+	dh_lintian
 
 binary-indep: build install
+binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installdocs
@@ -64,6 +72,7 @@ binary-indep: build install
 	dh_installcron
 	dh_installinfo
 	dh_installchangelogs
+	dh_perl
 	dh_strip
 	dh_compress
 	dh_fixperms
@@ -73,8 +82,6 @@ binary-indep: build install
 	dh_md5sums
 	dh_builddeb
 
-# Build architecture-dependent files here.
-binary-arch: build install
+binary: binary-indep binary-arch
 
-binary: binary-indep
 .PHONY: build clean binary-indep binary-arch binary install configure