From 2aa6bc371848f6065e413db3c711e26fa751b5f7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 28 May 2008 22:33:56 +0000 Subject: [PATCH] * Use debhelper v7; rules file simplification. - Removed commit target from rules file. (Doubt anyone uses it.) - DEBUG=0 has no effect when building anymore, removed that from rules file. --- debian/changelog | 4 ++++ debian/compat | 2 +- debian/control | 2 +- debian/docs | 1 + debian/rules | 52 +++++------------------------------------------- 5 files changed, 12 insertions(+), 49 deletions(-) create mode 100644 debian/docs diff --git a/debian/changelog b/debian/changelog index 27bae61e..d013f44b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,10 @@ tasksel (2.75) UNRELEASED; urgency=low * Add uim-applet-{kde,gnome} to the japanese desktop tasks, as Kenshi suggests. * Add libgl1-mesa-dri to the desktop task. Closes: #481464 + * Use debhelper v7; rules file simplification. + - Removed commit target from rules file. (Doubt anyone uses it.) + - DEBUG=0 has no effect when building anymore, removed that from rules + file. -- Joey Hess Wed, 14 May 2008 17:10:27 -0400 diff --git a/debian/compat b/debian/compat index 7ed6ff82..7f8f011e 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +7 diff --git a/debian/control b/debian/control index dd876bda..8ce0c735 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: important Maintainer: Debian Install System Team Uploaders: Joey Hess Standards-Version: 3.7.3 -Build-Depends: po-debconf, debhelper (>= 5), gettext, dpkg-dev (>= 1.9.0) +Build-Depends: po-debconf, debhelper (>= 7), gettext, dpkg-dev (>= 1.9.0) Vcs-Svn: svn://svn.debian.org/tasksel/trunk Package: tasksel diff --git a/debian/docs b/debian/docs new file mode 100644 index 00000000..49476d3b --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +TODO README diff --git a/debian/rules b/debian/rules index b3bcc4ec..73044fb1 100755 --- a/debian/rules +++ b/debian/rules @@ -1,60 +1,18 @@ #!/usr/bin/make -f +%: + dh $@ VERSION=$(shell LC_ALL=C dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2) TARNAME=task-overrides_$(VERSION)_all.tar.gz -commit: commit-stamp -commit-stamp: - dh_testdir - svn commit - touch commit-stamp - -build: build-stamp -build-stamp: - dh_testdir - $(MAKE) DEBUG=0 - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp install-stamp commit-stamp - $(MAKE) clean - dh_clean - -install: install-stamp -install-stamp: build-stamp - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs +binary-indep: + dh $@ --before dh_auto_install $(MAKE) install DESTDIR=`pwd`/debian/tasksel $(MAKE) install-data DESTDIR=`pwd`/debian/tasksel-data - touch install-stamp - -binary-arch: build install - -binary-indep: build install - dh_testdir - dh_testroot - dh_installdocs TODO README - dh_installmenu - dh_installman - dh_installchangelogs - dh_link - dh_strip - dh_compress - dh_installdebconf - dh_fixperms - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb + dh $@ --after dh_auto_install # Add tarball with overrides file for byhand processing cd debian/external-overrides && tar czvf ../../../$(TARNAME) . dpkg-distaddfile $(TARNAME) byhand - - binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install