Use debhelper v7; rules file minimisation.

diff --git a/debian/changelog b/debian/changelog
index ac1e2e1a8cdc9d50000e6c8a21e0176478413858..e4c03d0de0360012d064a31f0b7efe8ceae3c562 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pristine-tar (0.14) UNRELEASED; urgency=low
+
+  * Use debhelper v7; rules file minimisation.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 24 Apr 2008 02:05:47 -0400
+
 pristine-tar (0.13) unstable; urgency=low
 
   * Man page typo fix. Closes: #475698

diff --git a/debian/clean b/debian/clean
new file mode 100644 (file)
index 0000000..f7e585b
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+*.1

diff --git a/debian/compat b/debian/compat
index 7ed6ff82de6bcc2a78243fc9c54d3ef5ac14da69..7f8f011eb73d6043d2e6db9d2c101195ae2801f2 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7

diff --git a/debian/control b/debian/control
index 087acc5304a7e8faab0b8e7fd52360db0a43f9b3..dcf0e04424d3ef95e6d14ab5c0a6df8d48d0e69c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: pristine-tar
 Section: utils
 Priority: optional
-Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.9.0), zlib1g-dev
+Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.9.0), zlib1g-dev
 Maintainer: Joey Hess <joeyh@debian.org>
 Standards-Version: 3.7.3
 Vcs-Git: git://git.kitenet.net/pristine-tar/

diff --git a/debian/rules b/debian/rules
index 31f12217cd69be94cd299d24b328a59bebdbe664..f43910be73e79632518d34644744675a1679b204 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,37 +1,19 @@
 #!/usr/bin/make -f
+%:
+       dh $@
 
 build:
-       $(MAKE)
+       dh build
        pod2man -c pristine-tar pristine-tar > pristine-tar.1
        pod2man -c pristine-gz  pristine-gz  > pristine-gz.1
        pod2man -c pristine-bz2 pristine-bz2 > pristine-bz2.1
        pod2man -c zgz zgz.pod > zgz.1
 
-clean:
-       dh_testdir
-       dh_testroot
-       $(MAKE) clean
-       dh_clean pristine-tar.1 pristine-gz.1 pristine-bz2.1 zgz.1
-
-binary-indep: build
-
 binary-arch: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k
+       dh binary-arch --until dh_prep
        dh_install pristine-tar pristine-gz pristine-bz2 zgz usr/bin
        dh_installdocs TODO delta-format.txt
        dh_installman *.1
-       dh_installchangelogs
-       dh_compress
-       dh_strip
-       dh_fixperms
-       dh_perl
-       dh_shlibdeps
-       dh_installdeb
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
+       dh binary-arch --remaining
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary