r15338 - in packages/trunk: ! dirs' list truncated !

Paul Wise pabs at moszumanska.debian.org
Wed Nov 26 08:44:13 UTC 2014


Author: pabs
Date: 2014-11-26 08:44:13 +0000 (Wed, 26 Nov 2014)
New Revision: 15338

Modified:
   packages/trunk/alienblaster/debian/changelog
   packages/trunk/alienblaster/debian/rules
   packages/trunk/cultivation/debian/changelog
   packages/trunk/cultivation/debian/rules
   packages/trunk/gnujump/debian/changelog
   packages/trunk/gnujump/debian/rules
   packages/trunk/gravitation/debian/changelog
   packages/trunk/gravitation/debian/rules
   packages/trunk/passage/debian/changelog
   packages/trunk/passage/debian/rules
   packages/trunk/primrose/debian/changelog
   packages/trunk/primrose/debian/rules
   packages/trunk/ri-li/debian/changelog
   packages/trunk/ri-li/debian/rules
   packages/trunk/sleepisdeath/debian/rules
   packages/trunk/transcend/debian/changelog
   packages/trunk/transcend/debian/rules
Log:
Fix build reproducibility issues due to use of imagemagick

Modified: packages/trunk/alienblaster/debian/changelog
===================================================================
--- packages/trunk/alienblaster/debian/changelog	2014-11-26 08:19:18 UTC (rev 15337)
+++ packages/trunk/alienblaster/debian/changelog	2014-11-26 08:44:13 UTC (rev 15338)
@@ -1,3 +1,10 @@
+alienblaster (1.1.0-9) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fix build reproducibility issues due to use of imagemagick
+
+ -- Paul Wise <pabs at debian.org>  Wed, 26 Nov 2014 16:41:07 +0800
+
 alienblaster (1.1.0-8) unstable; urgency=low
 
   [ Gonéri Le Bouder ]

Modified: packages/trunk/alienblaster/debian/rules
===================================================================
--- packages/trunk/alienblaster/debian/rules	2014-11-26 08:19:18 UTC (rev 15337)
+++ packages/trunk/alienblaster/debian/rules	2014-11-26 08:44:13 UTC (rev 15338)
@@ -1,5 +1,7 @@
 #!/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
@@ -7,7 +9,7 @@
 override_dh_install:
 	mv $(CURDIR)/alienblaster $(CURDIR)/alienblaster.bin
 	convert -monitor -resize 50% -trim \
-	$(CURDIR)/images/alienblasterintro.bmp $(CURDIR)/alienblaster.png
+	$(CURDIR)/images/alienblasterintro.bmp $(PNGRBTD) $(CURDIR)/alienblaster.png
 	convert -monitor $(CURDIR)/images/alienblastericon.bmp $(CURDIR)/alienblaster.xpm
 	dh_install
 

Modified: packages/trunk/cultivation/debian/changelog
===================================================================
--- packages/trunk/cultivation/debian/changelog	2014-11-26 08:19:18 UTC (rev 15337)
+++ packages/trunk/cultivation/debian/changelog	2014-11-26 08:44:13 UTC (rev 15338)
@@ -1,3 +1,9 @@
+cultivation (9+dfsg1-3) UNRELEASED; urgency=medium
+
+  * Fix build reproducibility issues due to use of imagemagick
+
+ -- Paul Wise <pabs at debian.org>  Wed, 26 Nov 2014 16:25:06 +0800
+
 cultivation (9+dfsg1-2) unstable; urgency=low
 
   [ Barry deFreese ]

Modified: packages/trunk/cultivation/debian/rules
===================================================================
--- packages/trunk/cultivation/debian/rules	2014-11-26 08:19:18 UTC (rev 15337)
+++ packages/trunk/cultivation/debian/rules	2014-11-26 08:44:13 UTC (rev 15338)
@@ -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 game2 && ./configure --linux
 
 override_dh_auto_build:
-	convert -type Grayscale -negate ./game2/build/macOSX/icon128_mask.png mask.png
-	composite -compose CopyOpacity mask.png ./game2/build/macOSX/icon128_color.png cultivation.png
+	convert -type Grayscale -negate ./game2/build/macOSX/icon128_mask.png $(PNGRBTD) mask.png
+	composite -compose CopyOpacity mask.png ./game2/build/macOSX/icon128_color.png $(PNGRBT) cultivation.png
 	mkdir -p 32x32
-	convert -scale 32x32 cultivation.png 32x32/cultivation.png
+	convert -scale 32x32 cultivation.png $(PNGRBTD) 32x32/cultivation.png
 	convert 32x32/cultivation.png 32x32/cultivation.xpm
 	sed -i -e 's/-lX11//' game2/gameSource/Makefile
 	sed -i -e 's/^DEBUG_FLAG = .*/DEBUG_FLAG = /' game2/gameSource/Makefile

Modified: packages/trunk/gnujump/debian/changelog
===================================================================
--- packages/trunk/gnujump/debian/changelog	2014-11-26 08:19:18 UTC (rev 15337)
+++ packages/trunk/gnujump/debian/changelog	2014-11-26 08:44:13 UTC (rev 15338)
@@ -1,7 +1,11 @@
 gnujump (1.0.8-3) UNRELEASED; urgency=medium
 
+  [ Bas Wijnen ]
   * NOT RELEASED YET
 
+  [ Paul Wise ]
+  * Fix build reproducibility issues due to use of imagemagick
+
  -- Bas Wijnen <wijnen at debian.org>  Mon, 06 Oct 2014 00:04:48 -0400
 
 gnujump (1.0.8-2) unstable; urgency=medium

Modified: packages/trunk/gnujump/debian/rules
===================================================================
--- packages/trunk/gnujump/debian/rules	2014-11-26 08:19:18 UTC (rev 15337)
+++ packages/trunk/gnujump/debian/rules	2014-11-26 08:44:13 UTC (rev 15338)
@@ -2,6 +2,8 @@
 
 AUTO_JUNK = config.guess config.sub configure depcomp INSTALL \
 	install-sh ltmain.sh missing mkinstalldirs aclocal.m4 config.h.in m4
+export PNGRBT=-define png:exclude-chunk=time
+export PNGRBTD=+set date:create +set date:modify $(PNGRBT)
 
 %:
 	dh $@
@@ -13,7 +15,7 @@
 override_dh_auto_build:
 	dh_auto_build
 	convert -transparent '#00fff6' skins/default/hero1.0.png debian/gnujump.xpm
-	convert debian/gnujump.xpm debian/gnujump.png
+	convert debian/gnujump.xpm $(PNGRBTD) debian/gnujump.png
 
 override_dh_auto_clean:
 	test ! -e Makefile || $(MAKE) maintainer-clean

Modified: packages/trunk/gravitation/debian/changelog
===================================================================
--- packages/trunk/gravitation/debian/changelog	2014-11-26 08:19:18 UTC (rev 15337)
+++ packages/trunk/gravitation/debian/changelog	2014-11-26 08:44:13 UTC (rev 15338)
@@ -1,3 +1,9 @@
+gravitation (3+dfsg1-5) UNRELEASED; urgency=medium
+
+  * Fix build reproducibility issues due to use of imagemagick
+
+ -- Paul Wise <pabs at debian.org>  Wed, 26 Nov 2014 16:25:06 +0800
+
 gravitation (3+dfsg1-4) unstable; urgency=low
 
   * Wrap and sort various files

Modified: packages/trunk/gravitation/debian/rules
===================================================================
--- packages/trunk/gravitation/debian/rules	2014-11-26 08:19:18 UTC (rev 15337)
+++ packages/trunk/gravitation/debian/rules	2014-11-26 08:44:13 UTC (rev 15338)
@@ -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 game5/gameSource && platformSelection=1 ./configure
 
 override_dh_auto_build:
-	convert -type Grayscale -negate ./game5/build/macOSX/iconMask.png mask.png
-	composite -compose CopyOpacity mask.png ./game5/build/macOSX/iconColor.png gravitation.png
+	convert -type Grayscale -negate ./game5/build/macOSX/iconMask.png $(PNGRBTD) mask.png
+	composite -compose CopyOpacity mask.png ./game5/build/macOSX/iconColor.png $(PNGRBT) gravitation.png
 	mkdir -p 32x32
-	convert -scale 32x32 gravitation.png 32x32/gravitation.png
+	convert -scale 32x32 gravitation.png $(PNGRBTD) 32x32/gravitation.png
 	convert 32x32/gravitation.png 32x32/gravitation.xpm
 	sed -i -e 's/PLATFORM_COMPILE_FLAGS = */PLATFORM_COMPILE_FLAGS = $$(CFLAGS) $$(CPPFLAGS) /' game5/gameSource/Makefile
 	sed -i -e 's/PLATFORM_LINK_FLAGS = */PLATFORM_LINK_FLAGS = $$(LDFLAGS) /' game5/gameSource/Makefile

Modified: packages/trunk/passage/debian/changelog
===================================================================
--- packages/trunk/passage/debian/changelog	2014-11-26 08:19:18 UTC (rev 15337)
+++ packages/trunk/passage/debian/changelog	2014-11-26 08:44:13 UTC (rev 15338)
@@ -1,3 +1,9 @@
+passage (4+dfsg1-3) UNRELEASED; urgency=medium
+
+  * Fix build reproducibility issues due to use of imagemagick
+
+ -- Paul Wise <pabs at debian.org>  Wed, 26 Nov 2014 16:25:06 +0800
+
 passage (4+dfsg1-2) unstable; urgency=low
 
   * Wrap and sort various files

Modified: packages/trunk/passage/debian/rules
===================================================================
--- packages/trunk/passage/debian/rules	2014-11-26 08:19:18 UTC (rev 15337)
+++ packages/trunk/passage/debian/rules	2014-11-26 08:44:13 UTC (rev 15338)
@@ -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
@@ -11,11 +13,11 @@
 
 override_dh_auto_build:
 	mkdir -p 256x256 64x64 32x32
-	convert -scale 256x256 gamma256/gameSource/iPhone/LargeIcon.png 256x256/passage.png
-	convert -background None -gravity center -extent 64x64 gamma256/gameSource/iPhone/Icon.png 64x64/passage.png
-	convert -type Grayscale -negate gamma256/build/macOSX/iconMask.png mask.png
-	composite -compose CopyOpacity mask.png gamma256/build/macOSX/iconColor.png passage.png
-	convert -scale 32x32 passage.png 32x32/passage.png 
+	convert -scale 256x256 gamma256/gameSource/iPhone/LargeIcon.png $(PNGRBTD) 256x256/passage.png
+	convert -background None -gravity center -extent 64x64 gamma256/gameSource/iPhone/Icon.png $(PNGRBTD) 64x64/passage.png
+	convert -type Grayscale -negate gamma256/build/macOSX/iconMask.png $(PNGRBTD) mask.png
+	composite -compose CopyOpacity mask.png gamma256/build/macOSX/iconColor.png $(PNGRBT) passage.png
+	convert -scale 32x32 passage.png $(PNGRBTD) 32x32/passage.png 
 	convert 32x32/passage.png 32x32/passage.xpm
 	sed -i -e 's/PLATFORM_COMPILE_FLAGS = */PLATFORM_COMPILE_FLAGS = $$(CFLAGS) $$(CPPFLAGS) /' gamma256/gameSource/Makefile
 	sed -i -e 's/PLATFORM_LINK_FLAGS = */PLATFORM_LINK_FLAGS = $$(LDFLAGS) /' gamma256/gameSource/Makefile

Modified: packages/trunk/primrose/debian/changelog
===================================================================
--- packages/trunk/primrose/debian/changelog	2014-11-26 08:19:18 UTC (rev 15337)
+++ packages/trunk/primrose/debian/changelog	2014-11-26 08:44:13 UTC (rev 15338)
@@ -1,3 +1,9 @@
+primrose (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 16:25:12 +0800
+
 primrose (6+dfsg1-3) unstable; urgency=low
 
   * Wrap and sort various files

Modified: packages/trunk/primrose/debian/rules
===================================================================
--- packages/trunk/primrose/debian/rules	2014-11-26 08:19:18 UTC (rev 15337)
+++ packages/trunk/primrose/debian/rules	2014-11-26 08:44:13 UTC (rev 15338)
@@ -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
@@ -11,9 +13,9 @@
 
 override_dh_auto_build:
 	mkdir -p 256x256 128x128 64x64 32x32
-	convert -scale 256x256 tilePlacementGames/game1/gameSource/iPhone/largeIcon2.png 256x256/primrose.png 
+	convert -scale 256x256 tilePlacementGames/game1/gameSource/iPhone/largeIcon2.png $(PNGRBTD) 256x256/primrose.png 
 	cp -f tilePlacementGames/game1/build/macOSX/iconColor.png 128x128/primrose.png
-	convert -background None -gravity center -extent 64x64 tilePlacementGames/game1/gameSource/iPhone/icon.png 64x64/primrose.png
+	convert -background None -gravity center -extent 64x64 tilePlacementGames/game1/gameSource/iPhone/icon.png $(PNGRBTD) 64x64/primrose.png
 	cp -f tilePlacementGames/game1/build/win32/icon.png 32x32/primrose.png
 	convert 32x32/primrose.png 32x32/primrose.xpm
 	$(MAKE) -C tilePlacementGames/game1/gameSource PLATFORM_LINK_FLAGS="-lGL -lSDL -lpthread $(LDFLAGS)" PLATFORM_COMPILE_FLAGS="$(CXXFLAGS) $(CPPFLAGS) -DETCDIR=\\\"/etc/primrose\\\" -DDATADIR=\\\"/usr/share/games/primrose/\\\""

Modified: packages/trunk/ri-li/debian/changelog
===================================================================
--- packages/trunk/ri-li/debian/changelog	2014-11-26 08:19:18 UTC (rev 15337)
+++ packages/trunk/ri-li/debian/changelog	2014-11-26 08:44:13 UTC (rev 15338)
@@ -1,3 +1,10 @@
+ri-li (2.0.1+ds-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fix build reproducibility issues due to use of imagemagick
+
+ -- Paul Wise <pabs at debian.org>  Wed, 26 Nov 2014 16:42:10 +0800
+
 ri-li (2.0.1+ds-1) unstable; urgency=medium
 
   [ Miguel Telleria de Esteban ]

Modified: packages/trunk/ri-li/debian/rules
===================================================================
--- packages/trunk/ri-li/debian/rules	2014-11-26 08:19:18 UTC (rev 15337)
+++ packages/trunk/ri-li/debian/rules	2014-11-26 08:44:13 UTC (rev 15338)
@@ -5,6 +5,8 @@
 UVER  = $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s+(?:\d+:)?(\d.*)(?:\-\d+.*)};')
 DTYPE = +ds
 VER  ?= $(subst $(DTYPE),,$(UVER))
+export PNGRBT=-define png:exclude-chunk=time
+export PNGRBTD=+set date:create +set date:modify $(PNGRBT)
 
 %:
 	dh $@ --with autoreconf
@@ -23,7 +25,7 @@
 
 override_dh_auto_build-indep:
 	convert -monitor -resize 32x32 data-src/pov/Textures/Ri-li.ico ri-li.xpm
-	convert -monitor data-src/pov/Textures/Ri-li.ico ri-li.png
+	convert -monitor data-src/pov/Textures/Ri-li.ico $(PNGRBTD) ri-li.png
 
 override_dh_install:
 	mv debian/tmp/usr/games/Ri_li debian/tmp/usr/games/ri-li

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

Modified: packages/trunk/transcend/debian/changelog
===================================================================
--- packages/trunk/transcend/debian/changelog	2014-11-26 08:19:18 UTC (rev 15337)
+++ packages/trunk/transcend/debian/changelog	2014-11-26 08:44:13 UTC (rev 15338)
@@ -1,7 +1,11 @@
 transcend (0.3.dfsg2-4) UNRELEASED; urgency=low
 
+  [ Evgeni Golov ]
   * Correct Vcs-* URLs to point to anonscm.debian.org
 
+  [ Paul Wise ]
+  * Fix build reproducibility issues due to use of imagemagick
+
  -- Evgeni Golov <evgeni at debian.org>  Mon, 15 Jul 2013 22:22:14 +0200
 
 transcend (0.3.dfsg2-3) unstable; urgency=low

Modified: packages/trunk/transcend/debian/rules
===================================================================
--- packages/trunk/transcend/debian/rules	2014-11-26 08:19:18 UTC (rev 15337)
+++ packages/trunk/transcend/debian/rules	2014-11-26 08:44:13 UTC (rev 15338)
@@ -2,6 +2,8 @@
 
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
+export PNGRBT=-define png:exclude-chunk=time
+export PNGRBTD=+set date:create +set date:modify $(PNGRBT)
 
 %:
 	dh $@ --parallel
@@ -12,9 +14,9 @@
 
 override_dh_auto_build:
 	icns2png -x Transcend/build/macOSX/Transcend.app/Contents/Resources/Transcend.icns || true
-	mv Transcend_128x128x32.png transcend.png || convert -scale 128x128 Transcend/doc/moondance/submission/screen1.png transcend.png 
+	mv Transcend_128x128x32.png transcend.png || convert -scale 128x128 Transcend/doc/moondance/submission/screen1.png $(PNGRBTD) transcend.png 
 	mkdir -p 32x32
-	convert -scale 32x32 transcend.png 32x32/transcend.png
+	convert -scale 32x32 transcend.png $(PNGRBTD) 32x32/transcend.png
 	convert 32x32/transcend.png 32x32/transcend.xpm
 	$(MAKE) -C Transcend/game \
 		OPTIMIZE_FLAG="$(CPPFLAGS) $(CXXFLAGS) \




More information about the Pkg-games-commits mailing list