Merge branch 'master' of git.deb.at:pkg/t-prot

Conflicts:
	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index fbad7e0d3059c8951c1994edaed74409d72d93c4..3e5fa090fecadc3cf9d433b6093dd774fb83178b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+t-prot (3.4-2) UNRELEASED; urgency=medium
+
+  * debian/rules: Set timestamp of all new files to the same time to make
+    builds reproducible.
+
+ -- Axel Beckert <abe@debian.org>  Sun, 26 Apr 2015 04:51:36 +0200
+
 t-prot (3.4-1) unstable; urgency=medium
 
   * New upstream release

diff --git a/debian/rules b/debian/rules
index 0c667399bd6a980bb7a2dc486ea735e08610c648..3104ee7cbf347106377ae6d7f445ed75433c6d83 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,7 @@
 
 PKG = t-prot
 TMP = $(CURDIR)/debian/$(PKG)
+BUILD_DATE = $(shell dpkg-parsechangelog --show-field Date)
 
 INSTALL = install
 INSTALL_FILE    = $(INSTALL) -p    -oroot -groot -m644
@@ -71,6 +72,8 @@ binary-indep: install
        dpkg-gencontrol -ldebian/changelog -isp -p$(PKG) -P$(TMP)
        cd $(TMP) && find * -type f ! -regex '^DEBIAN/.*' -print0 | \
                xargs -r0 md5sum > DEBIAN/md5sums
+       find $(TMP) -depth -newermt '$(BUILD_DATE)' -print0 | \
+               xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
        dpkg --build $(TMP) ..