Revert "debhelper v7; rules file minimisation"

This reverts commit 83e8da32e5d3154f1c97e6eb62c30450ff95b5af.

diff --git a/Makefile b/Makefile
index b0595c417e33a8115ed8e2f62e50e9762d5cede7..4160adf351de456ffcfa3d08b79b74b3d0a6db20 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ BINS=isutf8 ifdata ifne pee sponge mispipe lckdo
 PERLSCRIPTS=vidir vipe ts combine zrun
 MANS=sponge.1 vidir.1 vipe.1 isutf8.1 ts.1 combine.1 ifdata.1 ifne.1 pee.1 zrun.1 mispipe.1 lckdo.1
 CFLAGS=-O2 -g -Wall
-INSTALL_BIN?=install -s
+INSTALL_BIN=install -s
 
 DOCBOOK2XMAN="docbook2x-man"
 
@@ -12,12 +12,12 @@ clean:
        rm -f $(BINS) $(MANS)
 
 install:
-       mkdir -p $(DESTDIR)/usr/bin
-       $(INSTALL_BIN) $(BINS) $(DESTDIR)/usr/bin
-       install $(PERLSCRIPTS) $(DESTDIR)/usr/bin
+       mkdir -p $(PREFIX)/usr/bin
+       $(INSTALL_BIN) $(BINS) $(PREFIX)/usr/bin
+       install $(PERLSCRIPTS) $(PREFIX)/usr/bin
        
-       mkdir -p $(DESTDIR)/usr/share/man/man1
-       install $(MANS) $(DESTDIR)/usr/share/man/man1
+       mkdir -p $(PREFIX)/usr/share/man/man1
+       install $(MANS) $(PREFIX)/usr/share/man/man1
 
 check: isutf8
        ./check-isutf8

diff --git a/debian/changelog b/debian/changelog
index 227afbf6c679709be868369c3b4413054749fdcf..f4157e93c41243294d564d6e74cdc5da1ece33a9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,3 @@
-moreutils (0.30) UNRELEASED; urgency=low
-
-  * debhelper v7; rules file minimisation
-  * Use DESTDIR instead of PREFIX.
-
- -- Joey Hess <joeyh@debian.org>  Sat, 26 Apr 2008 19:23:10 -0400
-
 moreutils (0.29) unstable; urgency=low
 
   * Add ifne, contributed by Javier Merino.

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

diff --git a/debian/control b/debian/control
index 966ac888342a83aaf874fde9a56c983d4429c0ec..5db3b331ed0ad5007be213ca9f534694c6a5dd97 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: moreutils
 Section: utils
 Priority: optional
-Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.9.0), docbook2x, docbook-xml
+Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.9.0), docbook2x, docbook-xml
 Maintainer: Joey Hess <joeyh@debian.org>
 Standards-Version: 3.7.3
 Vcs-Git: git://git.kitenet.net/moreutils

diff --git a/debian/docs b/debian/docs
deleted file mode 100644 (file)
index e845566..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-README

diff --git a/debian/rules b/debian/rules
index 8172a57b8f53882809883c9ab775449bbdb9c59e..d379a64a1a3696b362ca234618e07fd55cc41b9f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,42 @@
 #!/usr/bin/make -f
 
-# Prevent the makefile from stripping, in case it's being build in
-# unstripped mode.
-export INSTALL_BIN=install
+build: build-stamp
+build-stamp:
+       dh_testdir
+       $(MAKE)
+       $(MAKE) check
+       touch build-stamp
 
-%:
-       dh $@
+clean:
+       dh_testdir
+       dh_testroot
+       rm -f build-stamp
+       $(MAKE) clean
+       dh_clean
+
+binary-indep: build
+
+binary-arch: build
+       dh_testdir
+       dh_testroot
+       dh_clean -k
+       dh_installdirs
+       $(MAKE) PREFIX=debian/moreutils INSTALL_BIN=install install
+       dh_installdocs README
+       dh_installchangelogs
+       dh_perl
+       dh_strip
+       dh_compress
+       dh_fixperms
+       dh_installdeb
+       dh_shlibdeps
+       dh_gencontrol
+       dh_md5sums
+       dh_builddeb
 
 # Not intended for use by anyone except the author.
 announcedir:
        @echo ${HOME}/src/joeywiki/code/moreutils/news
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary