From e50b585f11021c9f1580edde015c11bfe1fb697f Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Mon, 14 Jan 2019 00:22:59 +0100 Subject: [PATCH] d/rules: use the awesome "dh $@" simplification. I've confirmed with diffoscope that this only affects comments/timestampes within images inside ./usr/share/debian-cd/data/cts_amiga_info.tar.gz and that those are only set to the date defined by SOURCE_DATE_EPOCH, thus the package still builds reproducibly, just the timestamps are of todaz/SOURCE_DATE_EPOCH and not from 2007. Signed-off-by: Holger Levsen --- debian/changelog | 1 + debian/rules | 57 +++++++----------------------------------------- 2 files changed, 9 insertions(+), 49 deletions(-) diff --git a/debian/changelog b/debian/changelog index 76b46662..8e4bbd6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -46,6 +46,7 @@ debian-cd (3.1.22) UNRELEASED; urgency=medium - don't recommend syslinux-utils twice, thanks lintian. - bump standards version to 4.3.0, no changes needed. - add "Rules-Requires-Root: no" to support building as non-root. + * d/rules: use the awesome "dh $@" simplification. * Add lintian override for missing-depends-on-sensible-utils as sensible-editor is merely mentioned in the README. * d/copyright: explicitly refer to /usr/share/common-licenses/GPL-2. diff --git a/debian/rules b/debian/rules index 010be0e0..957f595e 100755 --- a/debian/rules +++ b/debian/rules @@ -1,29 +1,15 @@ #!/usr/bin/make -f -#-*- makefile -*- -# Made with the aid of dh_make, by Craig Small -# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. -# Some lines taken from debmake, by Christoph Lameter. -build-arch build-indep: build-stamp -build-stamp: - dh_testdir - touch build-stamp +# Uncomment this to turn on verbose mode. +# #export DH_VERBOSE=1 -clean: - dh_testdir - dh_testroot - rm -f build-stamp install-stamp - dh_clean +%: + dh $@ -install: install-stamp -install-stamp: build-stamp - dh_testdir - dh_testroot - dh_prep - dh_installdirs - dh_lintian +override_dh_auto_clean: + : - # Add here commands to install the package into debian/tmp. +override_dh_auto_install: cp -r contrib tools tasks data Makefile README README.devel build.sh \ build_all.sh update-cd easy-build.sh README.easy-build \ debian/debian-cd/usr/share/debian-cd/ @@ -40,32 +26,5 @@ install-stamp: build-stamp merge-sums mkjigsnap mklist mktorrent \ report_build_error testingcds - touch install-stamp - -# Build architecture-dependent files here. -binary-arch: build install -# We have nothing to do by default. - -# Build architecture-independent files here. -binary-indep: build install - dh_testdir - dh_testroot +override_dh_installdocs: dh_installdocs README* DEDICATION.txt - dh_installexamples - dh_installmenu - dh_installcron - dh_installman - dh_installchangelogs - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -build: build-arch build-indep -.PHONY: build-arch build-indep build clean binary-indep binary-arch binary