From 78606db3acf3cb446a14bcf648f2cd3f8c73dff9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= Date: Wed, 7 May 2008 14:15:42 +0000 Subject: [PATCH] * Switch debhelper compatibility level to 5 and use debian/compat instead of DH_COMPAT. * Clean up debian/rules a bit. --- debian/changelog | 5 +++++ debian/compat | 1 + debian/control | 2 +- debian/rules | 25 +------------------------ 4 files changed, 8 insertions(+), 25 deletions(-) create mode 100644 debian/compat diff --git a/debian/changelog b/debian/changelog index af782777..1d8bd9c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,11 @@ debian-cd (3.0.5) UNRELEASED; urgency=low [ Frans Pop ] * Drop the base-{etch,lenny} tasks files as make_disc_trees.pl already takes care of including packages needed by debootstrap. + + [ Raphael Hertzog ] + * Switch debhelper compatibility level to 5 and use debian/compat + instead of DH_COMPAT. + * Clean up debian/rules a bit. -- Frans Pop Sun, 04 May 2008 19:55:17 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 00000000..7ed6ff82 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/control b/debian/control index ce772cc8..8081291c 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: extra Maintainer: Debian CD Group Uploaders: Raphael Hertzog , Santiago Garcia Mantinan , Steve McIntyre <93sam@debian.org> -Build-Depends: debhelper (>= 4) +Build-Depends: debhelper (>= 5) Build-Depends-Indep: tofrodos Standards-Version: 3.6.1.0 Vcs-Svn: svn://svn.debian.org/debian-cd/trunk diff --git a/debian/rules b/debian/rules index ffcb98fc..4282cc86 100755 --- a/debian/rules +++ b/debian/rules @@ -4,28 +4,15 @@ # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. # Some lines taken from debmake, by Christoph Lameter. -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 -export DH_COMPAT=4 - build: build-stamp build-stamp: dh_testdir - - #CONFIGURE# - # Add here commands to compile the package. - #$(MAKE) - touch build-stamp clean: dh_testdir dh_testroot rm -f build-stamp install-stamp - - # Add here commands to clean up after the build process. - #-#CLEAN# - dh_clean install: install-stamp @@ -54,33 +41,23 @@ binary-arch: build install # Build architecture-independent files here. binary-indep: build install -# dh_testversion dh_testdir dh_testroot dh_installdocs README* dh_installexamples dh_installmenu -# dh_installemacsen -# dh_installinit dh_installcron - dh_installmanpages -# dh_undocumented + dh_installman dh_installchangelogs dh_link dh_strip dh_compress dh_fixperms - # You may want to make some executables suid here -# dh_makeshlibs dh_installdeb -# dh_perl dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb -source diff: - @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false - binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary