[Glibc-bsd-commits] r5917 - trunk/kfreebsd-10/debian

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2016-03-05 16:00:10 +0000 (Sat, 05 Mar 2016)
New Revision: 5917

Modified:
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/rules
Log:
Bump Build-Depends: freebsd-buildutils to (>= 10.3~)


Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2016-03-05 15:59:35 UTC (rev 5916)
+++ trunk/kfreebsd-10/debian/changelog	2016-03-05 16:00:10 UTC (rev 5917)
@@ -13,6 +13,7 @@
     - 921_signal_watchdog.diff
     - 922_cc_version.diff
     - 923_newvers_timestamp.diff
+  * Bump Build-Depends: freebsd-buildutils to (>= 10.3~)
 
  -- Steven Chamberlain <steven at pyro.eu.org>  Sat, 06 Feb 2016 16:23:08 +0000
 

Modified: trunk/kfreebsd-10/debian/rules
===================================================================
--- trunk/kfreebsd-10/debian/rules	2016-03-05 15:59:35 UTC (rev 5916)
+++ trunk/kfreebsd-10/debian/rules	2016-03-05 16:00:10 UTC (rev 5917)
@@ -44,7 +44,7 @@
 ORIG_DIR	:= $(source)-$(tar_version)
 ORIG_TAR	:= $(source)_$(tar_version).orig.tar.xz
 PATH		:= /usr/lib/freebsd:$(PATH)
-BUILD_DATE	?= $(shell dpkg-parsechangelog --show-field=Date)
+SOURCE_DATE_EPOCH ?= $(shell date -d "$$(dpkg-parsechangelog -SDate)" +%s)
 
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -96,6 +96,10 @@
 	rm -rf $(ORIG_DIR)
 	svn export --ignore-keywords -r $(svn_revision) $(SVN)/sys $(ORIG_DIR)/sys
 	cd $(ORIG_DIR) && $(CURDIR)/debian/prune.sh
+	# Clamp timestamps to be no newer than last changelog entry, see
+	# https://wiki.debian.org/ReproducibleBuilds/TimestampsInTarball
+	find $(ORIG_DIR) -newermt "@$(SOURCE_DATE_EPOCH)" -print0 \
+	 | xargs -0r touch --no-dereference --date="@$(SOURCE_DATE_EPOCH)"
 	# Create tarball with files sorted in a stable order, see
 	# https://wiki.debian.org/ReproducibleBuilds/FileOrderInTarballs
 	find $(ORIG_DIR) -print0 | LC_ALL=C sort -z \
@@ -172,8 +176,8 @@
 	chown -R root.src $(SRC_DIR)
 	# Clamp timestamps to be no newer than last changelog entry, see
 	# https://wiki.debian.org/ReproducibleBuilds/TimestampsInTarball
-	find $(SRC_DIR) -newermt "$(BUILD_DATE)" -print0 \
-	 | xargs -0r touch --no-dereference --date="$(BUILD_DATE)"
+	find $(SRC_DIR) -newermt "@$(SOURCE_DATE_EPOCH)" -print0 \
+	 | xargs -0r touch --no-dereference --date="@$(SOURCE_DATE_EPOCH)"
 	# Create tarball with files sorted in a stable order, see
 	# https://wiki.debian.org/ReproducibleBuilds/FileOrderInTarballs
 	# and normalised file permissions regardless of umask, see