From fdcfb3646161ce8453653997eec4611dfa779b8e Mon Sep 17 00:00:00 2001 From: Mattia Rizzolo Date: Tue, 23 Jun 2015 15:58:44 +0000 Subject: debian/*: move to the debehelper 'dh' sequencer --- debian/dirs | 8 ------ debian/doc-base | 12 --------- debian/docs | 4 --- debian/pbuilder-uml.manpages | 3 +++ debian/pbuilder.dirs | 8 ++++++ debian/pbuilder.doc-base | 12 +++++++++ debian/pbuilder.docs | 4 +++ debian/pbuilder.manpages | 4 +++ debian/rules | 60 ++++++++------------------------------------ 9 files changed, 41 insertions(+), 74 deletions(-) delete mode 100644 debian/dirs delete mode 100644 debian/doc-base delete mode 100644 debian/docs create mode 100644 debian/pbuilder-uml.manpages create mode 100644 debian/pbuilder.dirs create mode 100644 debian/pbuilder.doc-base create mode 100644 debian/pbuilder.docs create mode 100644 debian/pbuilder.manpages (limited to 'debian') diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index 34e7e70..0000000 --- a/debian/dirs +++ /dev/null @@ -1,8 +0,0 @@ -usr/bin -usr/lib/pbuilder -usr/sbin -var/cache/pbuilder -var/cache/pbuilder/aptcache -var/cache/pbuilder/build -var/cache/pbuilder/ccache -var/cache/pbuilder/result diff --git a/debian/doc-base b/debian/doc-base deleted file mode 100644 index 33fd16d..0000000 --- a/debian/doc-base +++ /dev/null @@ -1,12 +0,0 @@ -Document: pbuilder -Title: pbuilder user's manual -Author: Junichi Uekawa -Abstract: This manual documents pbuilder for users -Section: Debian - -Format: HTML -Index: /usr/share/doc/pbuilder/pbuilder-doc.html -Files: /usr/share/doc/pbuilder/pbuilder-doc.html - -Format: PDF -Files: /usr/share/doc/pbuilder/pbuilder-doc.pdf diff --git a/debian/docs b/debian/docs deleted file mode 100644 index c1abc17..0000000 --- a/debian/docs +++ /dev/null @@ -1,4 +0,0 @@ -AUTHORS -README -THANKS -debian/TODO diff --git a/debian/pbuilder-uml.manpages b/debian/pbuilder-uml.manpages new file mode 100644 index 0000000..ec3aa62 --- /dev/null +++ b/debian/pbuilder-uml.manpages @@ -0,0 +1,3 @@ +pbuilder-uml.conf.5 +pbuilder-user-mode-linux.1 +pdebuild-user-mode-linux.1 diff --git a/debian/pbuilder.dirs b/debian/pbuilder.dirs new file mode 100644 index 0000000..34e7e70 --- /dev/null +++ b/debian/pbuilder.dirs @@ -0,0 +1,8 @@ +usr/bin +usr/lib/pbuilder +usr/sbin +var/cache/pbuilder +var/cache/pbuilder/aptcache +var/cache/pbuilder/build +var/cache/pbuilder/ccache +var/cache/pbuilder/result diff --git a/debian/pbuilder.doc-base b/debian/pbuilder.doc-base new file mode 100644 index 0000000..33fd16d --- /dev/null +++ b/debian/pbuilder.doc-base @@ -0,0 +1,12 @@ +Document: pbuilder +Title: pbuilder user's manual +Author: Junichi Uekawa +Abstract: This manual documents pbuilder for users +Section: Debian + +Format: HTML +Index: /usr/share/doc/pbuilder/pbuilder-doc.html +Files: /usr/share/doc/pbuilder/pbuilder-doc.html + +Format: PDF +Files: /usr/share/doc/pbuilder/pbuilder-doc.pdf diff --git a/debian/pbuilder.docs b/debian/pbuilder.docs new file mode 100644 index 0000000..c1abc17 --- /dev/null +++ b/debian/pbuilder.docs @@ -0,0 +1,4 @@ +AUTHORS +README +THANKS +debian/TODO diff --git a/debian/pbuilder.manpages b/debian/pbuilder.manpages new file mode 100644 index 0000000..8b53898 --- /dev/null +++ b/debian/pbuilder.manpages @@ -0,0 +1,4 @@ +debuild-pbuilder.1 +pbuilder.8 +pbuilderrc.5 +pdebuild.1 diff --git a/debian/rules b/debian/rules index 7895b1a..1647df8 100755 --- a/debian/rules +++ b/debian/rules @@ -1,56 +1,16 @@ #!/usr/bin/make -f +export DH_VERBOSE=1 -build: build-stamp -build-stamp: - dh_testdir - touch $@ +%: + dh $@ -clean: - dh_testdir - dh_testroot - rm -f build-stamp - $(MAKE) clean - dh_clean +override_dh_auto_install: + dh_auto_install --destdir=$(CURDIR)/debian/pbuilder -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs -ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) - $(MAKE) check -endif - $(MAKE) install DESTDIR=$(CURDIR)/debian/pbuilder - dh_movefiles -ppbuilder-uml --sourcedir=debian/pbuilder +override_dh_install: + dh_movefiles --sourcedir=debian/pbuilder + dh_install -binary-indep: build install - dh_testdir -i - dh_testroot -i - dh_installdocs -i - dh_installman pbuilder.8 pbuilderrc.5 pdebuild.1 debuild-pbuilder.1 - dh_installchangelogs -i - dh_installdebconf - dh_link -i - dh_compress -i -X.pdf - dh_fixperms -i - dh_installdeb -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i +override_dh_compress: + dh_compress -X.pdf -binary-arch: build install - dh_testdir -s - dh_testroot -s - dh_installdocs -s - dh_installman -ppbuilder-uml pbuilder-user-mode-linux.1 pbuilder-uml.conf.5 pdebuild-user-mode-linux.1 - dh_installchangelogs -s - dh_link -s - dh_compress -s -X.pdf - dh_fixperms -s - dh_installdeb -s - dh_gencontrol -s - dh_md5sums -s - dh_builddeb -s - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install -- cgit v1.2.3