for dh_lintian we need debhelper >= 6.0.4, so upgrade to 7 right away while

[pgp-tools.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index de04816ccece7bb77e1431a482532cbb641ee8d0..89c67f1b7f1be401df111718cd432c35948afbad 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,7 @@ GPGDIR_DIR          = gpgdir
 GPGDIR_PROG         = gpgdir
 
 GPGWRAP_DIR         = gpgwrap
+GPGWRAP_PROG        = bin/gpgwrap
 
 DESTDIR             = $(CURDIR)/debian/signing-party
 DESTDIR_BIN         = $(DESTDIR)/usr/bin
@@ -38,10 +39,9 @@ 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_DATA) caff/README \
@@ -50,8 +50,13 @@ install: build
                        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