X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=debian%2Frules;h=57a360a1d03c8d9bd8526733a175e34da840e02b;hb=8b16f5d3cdfc8dd2886d86fabd7467c65b687c86;hp=ebe0bb2421fc827270ad3f35d261174d03675b17;hpb=7c1900e1bf15cafd4a35097353f284012a4b9335;p=pgp-tools.git

diff --git a/debian/rules b/debian/rules
index ebe0bb2..57a360a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,8 +25,9 @@ install: build
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/signing-party
 	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 \
 		caff/README.gpg-agent \
@@ -34,17 +35,8 @@ install: build
 		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/doc/signing-party/gpgsigs/examples
-	install -m 644 gpgsigs/gpgsigs-lt2k5*.txt $(CURDIR)/debian/signing-party/usr/share/doc/signing-party/gpgsigs/examples
-	install -d $(CURDIR)/debian/signing-party/usr/share/doc/signing-party/keylookup
-	install -m 644 keylookup/NEWS $(CURDIR)/debian/signing-party/usr/share/doc/signing-party/keylookup
-	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
-
-	install -d $(CURDIR)/debian/keylookup/usr/share/doc/keylookup
-	ln -s ../signing-party/changelog.Debian.gz $(CURDIR)/debian/keylookup/usr/share/doc/keylookup/
-	install -d $(CURDIR)/debian/keylookup/usr/share/lintian/overrides
-	install -m 644 debian/overrides/keylookup $(CURDIR)/debian/keylookup/usr/share/lintian/overrides
+	# ignore errors with older debhelper versions
+	-dh_lintian
 
 binary-indep: build install
 	dh_testdir
@@ -53,13 +45,13 @@ binary-indep: build install
 	dh_installmenu
 	dh_installcron
 	dh_installinfo
-	dh_installchangelogs -psigning-party
+	dh_installchangelogs
+	dh_strip
 	dh_compress
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
-	dh_gencontrol -psigning-party
-	dh_gencontrol -pkeylookup -- -v3.0-$(VERSION)
+	dh_gencontrol
 	dh_md5sums
 	dh_builddeb