debhelper v7; rules file minimisation

diff --git a/debian/changelog b/debian/changelog
index 88ac66ed3e30772d3aa7fe387a000b6aad1487b6..94b805b76dcf9502a59694326acbae1d14fbe0af 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,9 @@ etckeeper (0.15) UNRELEASED; urgency=low
     Closes: #473069
   * Remove pointless commit.d/40bzr-rm script. 
 
+  [ Joey Hess ]
+  * debhelper v7; rules file minimisation
+
  -- Jelmer Vernooij <jelmer@samba.org>  Sat, 05 Apr 2008 23:39:11 +0200
 
 etckeeper (0.14.2) unstable; urgency=low

diff --git a/debian/control b/debian/control
index 79bd28b149cabcc11758540ca6bfd03fad74405b..46d71ac74bb8a6c48d95d554fa44a4a4de86c2d2 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: etckeeper
 Section: admin
 Priority: optional
-Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.9.0), bzr (>= 1.4~), python-support (>= 0.5.3) 
+Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.9.0), bzr (>= 1.4~), python-support (>= 0.5.3) 
 Maintainer: Joey Hess <joeyh@debian.org>
 Standards-Version: 3.7.3
 Vcs-Git: git://git.kitenet.net/etckeeper

diff --git a/debian/rules b/debian/rules
index 28e3c1bb09e8d8049120e612e459feed8638a6b9..4fe53edf302c66f93b374e69491e78dfe927f4b1 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,35 +1,7 @@
 #!/usr/bin/make -f
-
-build:
-       dh_testdir
-
-clean:
-       dh_testdir
-       dh_testroot
-       dh_clean
-
-binary-arch: build
-
-binary-indep: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k
-       $(MAKE) install DESTDIR=debian/etckeeper
-       dh_pysupport
-       dh_installdocs README TODO
-       dh_installexamples
-       dh_installchangelogs
-       dh_compress
-       dh_fixperms
-       dh_installdebconf
-       dh_installdeb
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
+%:
+       dh $@
 
 # Not intended for use by anyone except the author.
 announcedir:
        @echo ${HOME}/src/joeywiki/code/etckeeper/news
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary