r15980 - in packages/trunk/boswars/debian: . patches

[Markus Koschany]

Author: apo
Date: 2017-07-16 14:13:07 +0000 (Sun, 16 Jul 2017)
New Revision: 15980

Added:
   packages/trunk/boswars/debian/patches/reproducible-build.patch
Removed:
   packages/trunk/boswars/debian/boswars.menu
Modified:
   packages/trunk/boswars/debian/boswars-data.install
   packages/trunk/boswars/debian/changelog
   packages/trunk/boswars/debian/compat
   packages/trunk/boswars/debian/control
   packages/trunk/boswars/debian/patches/series
   packages/trunk/boswars/debian/rules
Log:
Release boswars 2.7+svn160110-2


Modified: packages/trunk/boswars/debian/boswars-data.install
===================================================================
--- packages/trunk/boswars/debian/boswars-data.install	2017-07-15 13:05:25 UTC (rev 15979)
+++ packages/trunk/boswars/debian/boswars-data.install	2017-07-16 14:13:07 UTC (rev 15980)
@@ -1,5 +1,4 @@
 campaigns           usr/share/games/boswars
-debian/boswars.xpm  usr/share/pixmaps
 graphics            usr/share/games/boswars
 intro               usr/share/games/boswars
 languages           usr/share/games/boswars

Deleted: packages/trunk/boswars/debian/boswars.menu
===================================================================
--- packages/trunk/boswars/debian/boswars.menu	2017-07-15 13:05:25 UTC (rev 15979)
+++ packages/trunk/boswars/debian/boswars.menu	2017-07-16 14:13:07 UTC (rev 15980)
@@ -1,6 +0,0 @@
-?package(boswars):needs="X11" \
-  section="Games/Strategy" \
-  title="Bos Wars" \
-  longtitle="Bos Wars - a futuristic real-time strategy game" \
-  command="/usr/games/boswars" \
-  icon="/usr/share/pixmaps/boswars.xpm"

Modified: packages/trunk/boswars/debian/changelog
===================================================================
--- packages/trunk/boswars/debian/changelog	2017-07-15 13:05:25 UTC (rev 15979)
+++ packages/trunk/boswars/debian/changelog	2017-07-16 14:13:07 UTC (rev 15980)
@@ -1,3 +1,15 @@
+boswars (2.7+svn160110-2) unstable; urgency=medium
+
+  * Team upload.
+  * Switch to compat level 10.
+  * Declare compliance with Debian Policy 4.0.0.
+  * Drop deprecated menu file and xpm. Remove imagemagick from Build-Depends,
+    no longer needed.
+  * Add reproducible-build.patch and make the build reproducible.
+    Thanks to Reiner Herrmann for the report and patch. (Closes: #827112)
+
+ -- Markus Koschany <apo at debian.org>  Sun, 16 Jul 2017 16:04:03 +0200
+
 boswars (2.7+svn160110-1) unstable; urgency=medium
 
   * Team upload.

Modified: packages/trunk/boswars/debian/compat
===================================================================
--- packages/trunk/boswars/debian/compat	2017-07-15 13:05:25 UTC (rev 15979)
+++ packages/trunk/boswars/debian/compat	2017-07-16 14:13:07 UTC (rev 15980)
@@ -1 +1 @@
-9
+10

Modified: packages/trunk/boswars/debian/control
===================================================================
--- packages/trunk/boswars/debian/control	2017-07-15 13:05:25 UTC (rev 15979)
+++ packages/trunk/boswars/debian/control	2017-07-16 14:13:07 UTC (rev 15980)
@@ -6,7 +6,7 @@
  Barry deFreese <bdefreese at debian.org>,
  Marc Dequènes (Duck) <Duck at DuckCorp.org>
 Build-Depends:
- debhelper (>= 9),
+ debhelper (>= 10),
  liblua5.1-0-dev,
  libpng-dev,
  libsdl1.2-dev,
@@ -14,9 +14,7 @@
  libvorbis-dev,
  pkg-config,
  scons
-Build-Depends-Indep:
- imagemagick
-Standards-Version: 3.9.6
+Standards-Version: 4.0.0
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/boswars/
 Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/boswars/
 Homepage: http://www.boswars.org/

Added: packages/trunk/boswars/debian/patches/reproducible-build.patch
===================================================================
--- packages/trunk/boswars/debian/patches/reproducible-build.patch	                        (rev 0)
+++ packages/trunk/boswars/debian/patches/reproducible-build.patch	2017-07-16 14:13:07 UTC (rev 15980)
@@ -0,0 +1,14 @@
+Author: Reiner Herrmann <reiner at reiner-h.de>
+Description: Sort source files for deterministic linking order
+
+--- a/SConstruct
++++ b/SConstruct
+@@ -68,7 +68,7 @@
+   sources = []
+   sourceDirs = Split(sourceDirs)
+   for d in sourceDirs:
+-    sources.append(glob.glob(engineSourceDir + '/' + d + '/*.cpp'))
++    sources.append(sorted(glob.glob(engineSourceDir + '/' + d + '/*.cpp')))
+   sources = Flatten(sources)
+   targetsources = []
+   for s in sources:

Modified: packages/trunk/boswars/debian/patches/series
===================================================================
--- packages/trunk/boswars/debian/patches/series	2017-07-15 13:05:25 UTC (rev 15979)
+++ packages/trunk/boswars/debian/patches/series	2017-07-16 14:13:07 UTC (rev 15980)
@@ -1 +1,2 @@
 buildsys_flags_fix.patch
+reproducible-build.patch

Modified: packages/trunk/boswars/debian/rules
===================================================================
--- packages/trunk/boswars/debian/rules	2017-07-15 13:05:25 UTC (rev 15979)
+++ packages/trunk/boswars/debian/rules	2017-07-16 14:13:07 UTC (rev 15980)
@@ -14,9 +14,6 @@
 	# rename binary
 	mv build/boswars-release build/boswars
 
-override_dh_auto_build-indep:
-	convert -monitor -resize 32x32 units/tank/ico_tank.png debian/boswars.xpm
-
 override_dh_auto_install:
 
 override_dh_install:
@@ -42,7 +39,6 @@
 	scons -c
 	# Additional icon (see build-indep-stamp)
 	$(RM) debian/boswars.png
-	$(RM) debian/boswars.xpm
 	# Scons is stupid and leaves them behind no matter what.
 	$(RM) .sconsign.dblite
 	$(RM) .sconf_temp