r15337 - packages/trunk/between/debian

[Paul Wise]

Author: pabs
Date: 2014-11-26 08:19:18 +0000 (Wed, 26 Nov 2014)
New Revision: 15337

Modified:
   packages/trunk/between/debian/changelog
   packages/trunk/between/debian/rules
Log:
Fix build reproducibility issues due to use of imagemagick

Modified: packages/trunk/between/debian/changelog
===================================================================
--- packages/trunk/between/debian/changelog	2014-11-24 23:11:29 UTC (rev 15336)
+++ packages/trunk/between/debian/changelog	2014-11-26 08:19:18 UTC (rev 15337)
@@ -1,3 +1,9 @@
+between (6+dfsg1-4) UNRELEASED; urgency=medium
+
+  * Fix build reproducibility issues due to use of imagemagick
+
+ -- Paul Wise <pabs at debian.org>  Wed, 26 Nov 2014 15:37:37 +0800
+
 between (6+dfsg1-3) unstable; urgency=low
 
   * Bump the debhelper compat to 9 and enable extra hardening

Modified: packages/trunk/between/debian/rules
===================================================================
--- packages/trunk/between/debian/rules	2014-11-24 23:11:29 UTC (rev 15336)
+++ packages/trunk/between/debian/rules	2014-11-26 08:19:18 UTC (rev 15337)
@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+export PNGRBT=-define png:exclude-chunk=time
+export PNGRBTD=+set date:create +set date:modify $(PNGRBT)
 
 %:
 	dh $@ --parallel
@@ -10,10 +12,10 @@
 	cd game7 && platformSelection=1 ./configure
 
 override_dh_auto_build:
-	convert -type Grayscale -negate ./game7/build/macOSX/iconMask.png mask.png
-	composite -compose CopyOpacity mask.png ./game7/build/macOSX/iconColor.png between.png
+	convert -type Grayscale -negate ./game7/build/macOSX/iconMask.png $(PNGRBTD) mask.png
+	composite -compose CopyOpacity mask.png ./game7/build/macOSX/iconColor.png $(PNGRBT) between.png
 	mkdir -p 32x32
-	convert -scale 32x32 between.png 32x32/between.png
+	convert -scale 32x32 between.png $(PNGRBTD) 32x32/between.png
 	convert 32x32/between.png 32x32/between.xpm
 	sed -i -e 's/-lX11//' game7/gameSource/Makefile
 	sed -i -e 's/^DEBUG_FLAG = .*/DEBUG_FLAG = /' game7/gameSource/Makefile