* Debian package: small cleanups.

[pgp-tools.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 2345609ed3fe5e0d88ba328839da34e407ca5823..b863c7348db5919684c3ca58a6242561bb6b696b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-include /usr/share/quilt/quilt.make
-
 VERSION := $(shell dpkg-parsechangelog | grep ^Version | cut -d' ' -f2)
 
 INSTALL             = install
@@ -11,21 +9,27 @@ INSTALL_DATA        = $(INSTALL) -m 644
 GPGDIR_DIR          = gpgdir
 GPGDIR_PROG         = gpgdir
 
+GPGWRAP_DIR         = gpgwrap
+GPGWRAP_PROG        = bin/gpgwrap
+
 DESTDIR             = $(CURDIR)/debian/signing-party
-DESTDIR_BIN         = $(CURDIR)/debian/signing-party/usr/bin
+DESTDIR_BIN         = $(DESTDIR)/usr/bin
+DESTDIR_DOC         = $(DESTDIR)/usr/share/doc/signing-party
 
 configure: configure-stamp
 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
@@ -35,23 +39,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
-       # ignore errors with older debhelper versions
-       -dh_lintian
+                       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
+       
+       dh_lintian
 
 binary-indep: build install
+binary-arch: build install
        dh_testdir
        dh_testroot
        dh_installdocs
@@ -59,6 +68,7 @@ binary-indep: build install
        dh_installcron
        dh_installinfo
        dh_installchangelogs
+       dh_perl
        dh_strip
        dh_compress
        dh_fixperms
@@ -68,8 +78,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