From f7f15bc4f31d48693ee896f2e442926eabcd2dca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 23 Feb 2015 14:27:12 +0100 Subject: Make build results reproducible, change to replace date/time --- debian/changelog | 8 ++++++-- debian/control | 1 + debian/rules | 15 ++++++--------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 65dd7b4..f023cbc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,12 @@ argyll (1.6.3-5) UNRELEASED; urgency=medium - For future use in kfreebsd-* add libusbhid-dev [kfreebsd-any] to Build-Depends. * Make debian/man/scanin.1 more readable (LP: #1192368). - * debian/rules: - - Remove timestamps from ref files to make build results reproducible. + * Make build results reproducible: + - debian/rules: + + Replace build timestamps from ref files with date/time from + debian/changelog. + - debian/control: + + Add dpkg-dev to Build-Depends. -- Jörg Frings-Fürst Tue, 11 Nov 2014 16:43:23 +0100 diff --git a/debian/control b/debian/control index 1f7275e..7cd8b3b 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,7 @@ Standards-Version: 3.9.6 Build-Depends: debhelper (>= 9), dh-autoreconf, + dpkg-dev (>= 1.17.0), jam, libjpeg-dev, libtiff5-dev, diff --git a/debian/rules b/debian/rules index 242a33e..f24ed3e 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,9 @@ export DH_OPTIONS NO_PROC=$(shell cat /proc/cpuinfo | grep processor | wc -l) JAMCMDLINE = -q -fJambase -j$(NO_PROC) -sPREFIX=/usr -sDESTDIR=$(CURDIR)/debian/tmp -sREFSUBDIR=share/color/argyll/ref +CHDATE=$(shell dpkg-parsechangelog -S Date) +CRDATE=$(shell date -d "$(CHDATE)" "+%a %b %d %T %Y") + %: dh $@ @@ -19,15 +22,9 @@ override_dh_auto_install: # # Make build results reproducible. # - cp $(CURDIR)/debian/tmp/usr/share/color/argyll/ref/RefMediumGamut.gam $(CURDIR)/debian/tmp/usr/share/color/argyll/ref/RefMediumGamut.tmp - cat $(CURDIR)/debian/tmp/usr/share/color/argyll/ref/RefMediumGamut.tmp | grep -v CREATED >$(CURDIR)/debian/tmp/usr/share/color/argyll/ref/RefMediumGamut.gam - rm -f $(CURDIR)/debian/tmp/usr/share/color/argyll/ref/RefMediumGamut.tmp - cp $(CURDIR)/debian/tmp/usr/share/color/argyll/ref/linear.cal $(CURDIR)/debian/tmp/usr/share/color/argyll/ref/linear.tmp - cat $(CURDIR)/debian/tmp/usr/share/color/argyll/ref/linear.tmp | grep -v CREATED >$(CURDIR)/debian/tmp/usr/share/color/argyll/ref/linear.cal - rm -f $(CURDIR)/debian/tmp/usr/share/color/argyll/ref/linear.tmp - cp $(CURDIR)/debian/tmp/usr/share/color/argyll/ref/strange.cal $(CURDIR)/debian/tmp/usr/share/color/argyll/ref/strange.tmp - cat $(CURDIR)/debian/tmp/usr/share/color/argyll/ref/strange.tmp | grep -v CREATED >$(CURDIR)/debian/tmp/usr/share/color/argyll/ref/strange.cal - rm -f $(CURDIR)/debian/tmp/usr/share/color/argyll/ref/strange.tmp + sed -i 's/CREATED.*/CREATED $(CRDATE)/' $(CURDIR)/debian/tmp/usr/share/color/argyll/ref/RefMediumGamut.gam + sed -i 's/CREATED.*/CREATED $(CRDATE)/' $(CURDIR)/debian/tmp/usr/share/color/argyll/ref/linear.cal + sed -i 's/CREATED.*/CREATED $(CRDATE)/' $(CURDIR)/debian/tmp/usr/share/color/argyll/ref/strange.cal override_dh_installdocs: dh_installdocs -- cgit v1.2.3