From 4ea13c421c17e100dbb8a532321d43f9be3b9677 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 18 Feb 2010 03:01:24 +0000 Subject: Convert rules file to use dh with overrides. r62298 --- debian/changelog | 1 + debian/control | 2 +- debian/rules | 81 +++++++++++++++++--------------------------------------- 3 files changed, 26 insertions(+), 58 deletions(-) diff --git a/debian/changelog b/debian/changelog index 398832e..48cdf04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,7 @@ debootstrap (1.0.21) UNRELEASED; urgency=low * Make scripts directory in source tree look like installed directory, and add a section to README explaining an easy way to run debootstrap w/o installing it. Closes: #345762 + * Convert rules file to use dh with overrides. -- Frans Pop Sun, 27 Dec 2009 18:51:06 +0100 diff --git a/debian/control b/debian/control index 01e7d2d..0b949a6 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: extra Maintainer: Debian Install System Team Uploaders: Anthony Towns , Joey Hess , Frans Pop , Junichi Uekawa , Colin Watson -Build-Depends: debhelper (>= 7.0.0), makedev (>= 2.3.1-69) +Build-Depends: debhelper (>= 7.0.50), makedev (>= 2.3.1-69) Standards-Version: 3.8.0 Vcs-Svn: svn://svn.debian.org/d-i/trunk/packages/debootstrap diff --git a/debian/rules b/debian/rules index 87f0515..d40fe8d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,33 +1,34 @@ #! /usr/bin/make -f -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +%: + dh $@ -configure: - dh_testdir - -clean: - dh_testdir - dh_auto_clean - dh_clean +# need to be root to make devices, so build is done in install target +override_dh_auto_build: -build: configure -# need to be root to make devices, so build is done in install target - -real-build: build - dh_testdir - dh_testroot +override_dh_auto_install: dh_auto_build + + $(MAKE) install DESTDIR=$(CURDIR)/debian/debootstrap + $(MAKE) install DESTDIR=$(CURDIR)/debian/debootstrap-udeb + + # remove scripts not needed by d-i + -rm -rf debian/debootstrap-udeb/usr/share/debootstrap/scripts/potato \ + debian/debootstrap-udeb/usr/share/debootstrap/scripts/woody \ + debian/debootstrap-udeb/usr/share/debootstrap/scripts/sarge \ + debian/debootstrap-udeb/usr/share/debootstrap/scripts/warty \ + debian/debootstrap-udeb/usr/share/debootstrap/scripts/hoary \ + debian/debootstrap-udeb/usr/share/debootstrap/scripts/breezy \ + debian/debootstrap-udeb/usr/share/debootstrap/scripts/dapper \ + debian/debootstrap-udeb/usr/share/debootstrap/scripts/edgy \ + debian/debootstrap-udeb/usr/share/debootstrap/scripts/feisty \ + debian/debootstrap-udeb/usr/share/debootstrap/scripts/*.buildd \ + debian/debootstrap-udeb/usr/share/debootstrap/scripts/*.fakechroot \ + debian/debootstrap-udeb/usr/share/debootstrap/scripts/stable \ + debian/debootstrap-udeb/usr/share/debootstrap/scripts/testing \ + debian/debootstrap-udeb/usr/share/debootstrap/scripts/unstable -install: real-build - dh_testdir - dh_testroot - dh_prep - dh_installdirs -# install the package into debian/debootstrap - $(MAKE) install DESTDIR=$(CURDIR)/debian/debootstrap - $(MAKE) install DESTDIR=$(CURDIR)/debian/debootstrap-udeb ARCHES="i386" SUITE="testing" @@ -49,37 +50,3 @@ binary-basedebs: rm -rf chroot-dir; \ done rm -f scripts - -binary-indep: install - dh_testdir - dh_testroot - dh_installdocs -i - dh_installman -i - dh_installchangelogs -i - dh_link -i - -rm -rf debian/debootstrap-udeb/usr/share/debootstrap/scripts/potato \ - debian/debootstrap-udeb/usr/share/debootstrap/scripts/woody \ - debian/debootstrap-udeb/usr/share/debootstrap/scripts/sarge \ - debian/debootstrap-udeb/usr/share/debootstrap/scripts/warty \ - debian/debootstrap-udeb/usr/share/debootstrap/scripts/hoary \ - debian/debootstrap-udeb/usr/share/debootstrap/scripts/breezy \ - debian/debootstrap-udeb/usr/share/debootstrap/scripts/dapper \ - debian/debootstrap-udeb/usr/share/debootstrap/scripts/edgy \ - debian/debootstrap-udeb/usr/share/debootstrap/scripts/feisty \ - debian/debootstrap-udeb/usr/share/debootstrap/scripts/*.buildd \ - debian/debootstrap-udeb/usr/share/debootstrap/scripts/*.fakechroot \ - debian/debootstrap-udeb/usr/share/debootstrap/scripts/stable \ - debian/debootstrap-udeb/usr/share/debootstrap/scripts/testing \ - debian/debootstrap-udeb/usr/share/debootstrap/scripts/unstable - dh_compress -i - dh_fixperms -i - dh_installdeb -i - dh_shlibdeps -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i - -binary-arch: - -binary: binary-indep binary-arch -.PHONY: build real-build clean binary-indep binary-arch binary install configure binary-basedebs -- cgit v0.12