diff -Nru boswars-2.7+svn160110/debian/boswars-data.install boswars-2.7+svn160110/debian/boswars-data.install --- boswars-2.7+svn160110/debian/boswars-data.install 2016-01-17 20:24:08.000000000 +0000 +++ boswars-2.7+svn160110/debian/boswars-data.install 2017-07-16 14:04:03.000000000 +0000 @@ -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 diff -Nru boswars-2.7+svn160110/debian/boswars.menu boswars-2.7+svn160110/debian/boswars.menu --- boswars-2.7+svn160110/debian/boswars.menu 2016-01-17 20:24:08.000000000 +0000 +++ boswars-2.7+svn160110/debian/boswars.menu 1970-01-01 00:00:00.000000000 +0000 @@ -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" diff -Nru boswars-2.7+svn160110/debian/changelog boswars-2.7+svn160110/debian/changelog --- boswars-2.7+svn160110/debian/changelog 2016-04-22 23:58:51.000000000 +0000 +++ boswars-2.7+svn160110/debian/changelog 2017-07-16 14:04:03.000000000 +0000 @@ -1,8 +1,14 @@ -boswars (2.7+svn160110-1build1) yakkety; urgency=medium +boswars (2.7+svn160110-2) unstable; urgency=medium - * No-change rebuild for libpng soname change. + * 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) - -- Matthias Klose Fri, 22 Apr 2016 23:58:51 +0000 + -- Markus Koschany Sun, 16 Jul 2017 16:04:03 +0200 boswars (2.7+svn160110-1) unstable; urgency=medium diff -Nru boswars-2.7+svn160110/debian/compat boswars-2.7+svn160110/debian/compat --- boswars-2.7+svn160110/debian/compat 2016-01-17 20:24:08.000000000 +0000 +++ boswars-2.7+svn160110/debian/compat 2017-07-16 14:04:03.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru boswars-2.7+svn160110/debian/control boswars-2.7+svn160110/debian/control --- boswars-2.7+svn160110/debian/control 2016-01-17 20:24:08.000000000 +0000 +++ boswars-2.7+svn160110/debian/control 2017-07-16 14:04:03.000000000 +0000 @@ -6,7 +6,7 @@ Barry deFreese , Marc Dequènes (Duck) 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/ diff -Nru boswars-2.7+svn160110/debian/patches/reproducible-build.patch boswars-2.7+svn160110/debian/patches/reproducible-build.patch --- boswars-2.7+svn160110/debian/patches/reproducible-build.patch 1970-01-01 00:00:00.000000000 +0000 +++ boswars-2.7+svn160110/debian/patches/reproducible-build.patch 2017-07-16 14:04:03.000000000 +0000 @@ -0,0 +1,14 @@ +Author: Reiner Herrmann +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: diff -Nru boswars-2.7+svn160110/debian/patches/series boswars-2.7+svn160110/debian/patches/series --- boswars-2.7+svn160110/debian/patches/series 2016-01-17 20:24:08.000000000 +0000 +++ boswars-2.7+svn160110/debian/patches/series 2017-07-16 14:04:03.000000000 +0000 @@ -1 +1,2 @@ buildsys_flags_fix.patch +reproducible-build.patch diff -Nru boswars-2.7+svn160110/debian/rules boswars-2.7+svn160110/debian/rules --- boswars-2.7+svn160110/debian/rules 2016-01-17 20:24:08.000000000 +0000 +++ boswars-2.7+svn160110/debian/rules 2017-07-16 14:04:03.000000000 +0000 @@ -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