diff options
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/compat | 2 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/docs | 1 | ||||
| -rwxr-xr-x | debian/rules | 40 |
6 files changed, 21 insertions, 43 deletions
@@ -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 $(PREFIX)/usr/bin - $(INSTALL_BIN) $(BINS) $(PREFIX)/usr/bin - install $(PERLSCRIPTS) $(PREFIX)/usr/bin + mkdir -p $(DESTDIR)/usr/bin + $(INSTALL_BIN) $(BINS) $(DESTDIR)/usr/bin + install $(PERLSCRIPTS) $(DESTDIR)/usr/bin - mkdir -p $(PREFIX)/usr/share/man/man1 - install $(MANS) $(PREFIX)/usr/share/man/man1 + mkdir -p $(DESTDIR)/usr/share/man/man1 + install $(MANS) $(DESTDIR)/usr/share/man/man1 check: isutf8 ./check-isutf8 diff --git a/debian/changelog b/debian/changelog index f4157e9..227afbf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +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 7ed6ff8..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +7 diff --git a/debian/control b/debian/control index 5db3b33..966ac88 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: moreutils Section: utils Priority: optional -Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.9.0), docbook2x, docbook-xml +Build-Depends: debhelper (>= 7), 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 new file mode 100644 index 0000000..e845566 --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +README diff --git a/debian/rules b/debian/rules index d379a64..8172a57 100755 --- a/debian/rules +++ b/debian/rules @@ -1,42 +1,12 @@ #!/usr/bin/make -f -build: build-stamp -build-stamp: - dh_testdir - $(MAKE) - $(MAKE) check - touch build-stamp +# Prevent the makefile from stripping, in case it's being build in +# unstripped mode. +export INSTALL_BIN=install -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 +%: + dh $@ # 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 |