Binary files /tmp/tmpaxu5oybq/Mh3bODJat1/boswars-2.7+svn160110/campaigns/islands/crescents.png and /tmp/tmpaxu5oybq/PoZqyNoJD3/boswars-2.8/campaigns/islands/crescents.png differ diff -Nru boswars-2.7+svn160110/CHANGELOG boswars-2.8/CHANGELOG --- boswars-2.7+svn160110/CHANGELOG 2016-01-10 11:22:21.000000000 +0000 +++ boswars-2.8/CHANGELOG 2023-06-26 19:29:32.943378000 +0000 @@ -1,17 +1,37 @@ Change log for Bos Wars ----------------------- +Version 2.8 (2023 06 26): +- Add install targets to make.py. See PackagingTips on the wiki for more + information. (François Beerten) +- Treat _("string") as format string only if needed (Kalle Olavi Niemitalo) +- Fix byte size returned by ConvertToStereo32() (François Beerten) +- Remove broken and unmaintained SCons support (François Beerten) +- Python tools and scripts uses python3 by default (Francois Beerten) +- Migrated repositories to Git (Francois Beerten) +- Fix PNGs with iCCP: known incorrect sRGB profile (Francois Beerten) +- Work around warnings "dereferencing type-punned pointer" (Francois Beerten) +- Fix make.py strace dependency tracking (Francois Beerten) +- Remove unused and broken SaveReplay() (Francois Beerten) +- Fix fabricate.py/make.py "--keep" option (Francois Beerten) +- Work around GL_GLEXT_VERSION redefinition in SDL (Francois Beerten) +- Fix map Antarticum terrain.png file (Francois Beerten) +- Make builds with make.py the same across builds (Michiel van der Wulp) +- Remove deprecated auto_ptr (Francois Beerten) +- Rename Mana to Charge (Francois Beerten) +- Pass options for commands of make.py via seperate "option=value" pairs. (Francois Beerten) - Escape key unselects units (Francois Beerten) - Fix save games with too many units. bug 35623, patch 8125 (James McCulloch) - Patch #8319: Fast-forward Through Command Line Option (Douglas Krofcheck) - Fixed command line speed option (Francois Beerten) - Added the Cornered map (Iwan Gabovitch) -- Fixed bug #37854: Objectives screen broken: missing text and +- Fixed bug #37854: Objectives screen broken: missing text and freeze (Francois Beerten) -- Fixed bug #37861: "Set new units target" makes engineers harvest +- Fixed bug #37861: "Set new units target" makes engineers harvest buildings (Francois Beerten) - Added the Ringway map (Michiel van der Wulp) - Added the Wormroads map (Iwan Gabovitch) +- Added 10 "oasis" maps - pick one at random to play (Michiel van der Wulp) Version 2.7 (2013 06 16): - Added the Boxland map (Iwan Gabovitch) @@ -27,7 +47,7 @@ - Added goshgeom patches (Michiel van der Wulp) - Added Lithuanian translation (Vytautas Raškevičius) - Fixed bug "uncontrollable with Wacom tablet when in full-screen mode" - as reported at http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559615 + as reported at http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559615 (Kalle Olavi Niemitalo) - Added Swamp Dwellers map (Michiel van der Wulp) - Added Hungarian translation (Ur Balazs) @@ -87,7 +107,7 @@ - Fix crash on exit in Windows (Francois Beerten, Nehal Mistry, Jimmy Salmon) - Fix bug map editor places magma pump next to hotspot. (Kalle Olavi Niemitalo) - Support libpng 1.4 (Francois Beerten) -- Fix resource consumption and production issues when rescueing units +- Fix resource consumption and production issues when rescueing units (Kalle Olavi Niemitalo) - Add portuguese (pt-pt) translation (Tiago Faria) - Add the 4on4 map (Michiel van der Wulp) @@ -151,7 +171,7 @@ - Add wetlands02 map (Lois Taulelle and llearch n'n'daCorna) - Make the particle based explosions configureable (Francois Beerten) - Fixed bug selecting a map in a subdir (Jimmy Salmon) -- Fix unload button on the APC unit (llearch n'n'daCorna) +- Fix unload button on the APC unit (llearch n'n'daCorna) - Auto repair while patrolling (Jimmy Salmon) - Added patrol button for engineer (Jimmy Salmon) - Enable auto repair for engineers (Jimmy Salmon) @@ -169,9 +189,9 @@ - Enable starting a map from the command line (Francois Beerten) - Added StretchImage option to TitleScreen (Jimmy Salmon) - Fixed crash disabling fog of war (Jimmy Salmon) -- Display the Bos Wars logo image by default instead of the video +- Display the Bos Wars logo image by default instead of the video (Sébastien Kerguen, Francois Beerten) -- Add missing const specifiers to fix compilation with +- Add missing const specifiers to fix compilation with GCC 4.2 (Loïs Taulelle, Forjan Frederic) - Fix compilation error in focushandler.cpp (Francois Beerten) - Fixed attack range off by 1 bug (Jimmy Salmon) @@ -252,10 +272,10 @@ - Support Lua 5.1 (Francois Beerten, Jimmy Salmon) - Don't count units under construction in GetNumUnitsAt (Jimmy Salmon) - Removed 'Do it now' message (Jimmy Salmon) -- In SConstruct, seperate user build options from detection of libs and alike. - This way, when SConstruct changes, the user build options are not lost +- In SConstruct, seperate user build options from detection of libs and alike. + This way, when SConstruct changes, the user build options are not lost any more. (Francois Beerten) -- Fixed off by 1 preventing units from walking along the bottom and right +- Fixed off by 1 preventing units from walking along the bottom and right edges of the map (Jimmy Salmon) - Changed PlayerMax to 8 (Jimmy Salmon) - Engine source code cleanups (Jimmy Salmon, Francois Beerten) @@ -269,8 +289,8 @@ - Fix map lake.smp (Francois Beerten) - Fix extra OK button in sound options menu (Francois Beerten) -The Stratagus engine got merged into Bos Wars. -The file doc/stratagus-changeLog.html contains the list of changes +The Stratagus engine got merged into Bos Wars. +The file doc/stratagus-changeLog.html contains the list of changes made in Stratagus before the merge. Change log for Invasion: Battle of Survival @@ -329,7 +349,7 @@ - List all available campaigns in the campaigns directory automatically. (Francois Beerten) - Added the elites campaign. (Lois Taulelle) - Improved the graphical look of the in-game interface. (Francois Beerten) -- Moved init and exit functions from DefineMenuItem +- Moved init and exit functions from DefineMenuItem to DefineMenu. (Francois Beerten) - Use GetNumOpponents instead of IfOpponents. (Francois Beerten) - Removed attack sound entry in unit definitions. (Francois Beerten) @@ -340,18 +360,18 @@ - Added sounds for the camera and radar unit. (micahf) - Replaced assault attack sound with a bearable one. (micahf) - Added tree unit. (Tejay Penfold, Francois Beerten) -- Playlist created dynamically with music files found in +- Playlist created dynamically with music files found in the music subdirectory. (Francois Beerten) - Added radar unit. (Francois Beerten) - Added camera unit. (Frank Loeffler) - Make ingame text fit nicely in panels. (Francois Beerten) -- Updated scripts to use DefineButtonStyle as required by newer +- Updated scripts to use DefineButtonStyle as required by newer Stratagus engine. (Jimmy Salmon, Francois Beerten) - Fixed maximum width for chat on the status line. (Francois Beerten) -- Made the sound of the attacking assault unit weaker. +- Made the sound of the attacking assault unit weaker. The sound is bearable now. (Francois Beerten) - Fixed bug #8880 where an APC could load another APC. (Francois Beerten) -For changes up to version 1.1 see the CVS repository +For changes up to version 1.1 see the CVS repository at https://savannah.nongnu.org/cvs/?group=stratagus-bos. Binary files /tmp/tmpaxu5oybq/Mh3bODJat1/boswars-2.7+svn160110/debian/antarticum-terrain.png and /tmp/tmpaxu5oybq/PoZqyNoJD3/boswars-2.8/debian/antarticum-terrain.png differ diff -Nru boswars-2.7+svn160110/debian/boswars-data.install boswars-2.8/debian/boswars-data.install --- boswars-2.7+svn160110/debian/boswars-data.install 2020-02-02 18:52:49.000000000 +0000 +++ boswars-2.8/debian/boswars-data.install 2023-07-08 06:10:23.000000000 +0000 @@ -1,7 +1,7 @@ campaigns usr/share/games/boswars graphics usr/share/games/boswars intro usr/share/games/boswars -languages usr/share/games/boswars +languages/*.po usr/share/games/boswars/languages maps usr/share/games/boswars patches usr/share/games/boswars scripts usr/share/games/boswars diff -Nru boswars-2.7+svn160110/debian/boswars-data.lintian-overrides boswars-2.8/debian/boswars-data.lintian-overrides --- boswars-2.7+svn160110/debian/boswars-data.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ boswars-2.8/debian/boswars-data.lintian-overrides 2023-07-08 06:10:23.000000000 +0000 @@ -0,0 +1,5 @@ +# verbatim quote +boswars-data binary: spelling-error-in-copyright "allow to" "allow one to" +boswars-data binary: spelling-error-in-copyright implicitely implicitly +boswars-data binary: spelling-error-in-copyright recommanded recommended + diff -Nru boswars-2.7+svn160110/debian/boswars.install boswars-2.8/debian/boswars.install --- boswars-2.7+svn160110/debian/boswars.install 2020-02-02 18:52:49.000000000 +0000 +++ boswars-2.8/debian/boswars.install 2023-07-08 06:10:23.000000000 +0000 @@ -1,4 +1,3 @@ -build/boswars usr/games +fbuild/release/boswars usr/games debian/boswars.desktop usr/share/applications -debian/boswars.png usr/share/pixmaps doc/* usr/share/doc/boswars/html diff -Nru boswars-2.7+svn160110/debian/boswars.lintian-overrides boswars-2.8/debian/boswars.lintian-overrides --- boswars-2.7+svn160110/debian/boswars.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ boswars-2.8/debian/boswars.lintian-overrides 2023-07-08 06:10:23.000000000 +0000 @@ -0,0 +1,4 @@ +# verbatim quote +boswars binary: spelling-error-in-copyright "allow to" "allow one to" +boswars binary: spelling-error-in-copyright implicitely implicitly +boswars binary: spelling-error-in-copyright recommanded recommended diff -Nru boswars-2.7+svn160110/debian/changelog boswars-2.8/debian/changelog --- boswars-2.7+svn160110/debian/changelog 2020-02-02 18:52:49.000000000 +0000 +++ boswars-2.8/debian/changelog 2023-07-09 19:49:11.000000000 +0000 @@ -1,3 +1,24 @@ +boswars (2.8-2) unstable; urgency=medium + + * FTBFS: redo split -arch vs -any, + add an explicit dependency on python3:any (Closes: #1040763) + + -- Alexandre Detiste Sun, 09 Jul 2023 21:49:11 +0200 + +boswars (2.8-1) unstable; urgency=medium + + * Team upload. + * Support for SCons has been removed upstream, drop SCons-related patches. + * The new build system is based on fabricate.py. + * Update standards version to 4.6.2, no changes needed. + * watch file: declare compatibility with v4 + * the broken .png has been fixed upstream, remove our copy + * lintian: ignore typos we cannot do anything about + * languages/: do not install and then delete these 3 extraneous files + * trim d/rules by using standard buildflags.mk + + -- Alexandre Detiste Sat, 08 Jul 2023 04:20:53 +0200 + boswars (2.7+svn160110-5) unstable; urgency=medium [ Reiner Herrmann ] diff -Nru boswars-2.7+svn160110/debian/clean boswars-2.8/debian/clean --- boswars-2.7+svn160110/debian/clean 1970-01-01 00:00:00.000000000 +0000 +++ boswars-2.8/debian/clean 2023-07-08 06:10:23.000000000 +0000 @@ -0,0 +1,3 @@ +__pycache__/ +.deps +fbuild/ diff -Nru boswars-2.7+svn160110/debian/control boswars-2.8/debian/control --- boswars-2.7+svn160110/debian/control 2020-02-02 18:52:49.000000000 +0000 +++ boswars-2.8/debian/control 2023-07-09 19:49:11.000000000 +0000 @@ -6,15 +6,16 @@ Barry deFreese , Marc Dequènes (Duck) Build-Depends: - debhelper-compat (= 12), + debhelper-compat (= 13), +Build-Depends-Arch: + python3:any, liblua5.1-0-dev, libpng-dev, libsdl1.2-dev, libtheora-dev, libvorbis-dev, - pkg-config, - scons -Standards-Version: 4.5.0 + pkgconf, +Standards-Version: 4.6.2 Rules-Requires-Root: no Vcs-Browser: https://salsa.debian.org/games-team/boswars Vcs-Git: https://salsa.debian.org/games-team/boswars.git diff -Nru boswars-2.7+svn160110/debian/copyright boswars-2.8/debian/copyright --- boswars-2.7+svn160110/debian/copyright 2020-02-02 18:52:49.000000000 +0000 +++ boswars-2.8/debian/copyright 2023-07-08 06:10:23.000000000 +0000 @@ -3,38 +3,38 @@ Files: * -Copyright: © 1998-2013 The Bos Wars and Stratagus Project - © 1998-2013 Francois Beerten - © 2005-2008 Llearch n'n'daCorna - © 2005-2008 Loïs Taulelle - © 1998-2008 Jimmy Salmon - © 1998-2008 Lutz Sammer - © 1999-2008 Nehal Mistry - © 1998-2008 Russell Smith - © 1998-2008 Vladi Belperchinov-Shabanski - © 1998-2008 Crestez Leonard - © 2007 Invasion Team - © 2000-2007 Frank Loeffler - © 2000-2005 Josh Cogliati - © 1998-2008 Fabrice Rossi - © 2004-2007 Frank “gorm” Loeffler - © 2005-2007 Tejay “TimberDragon” Penfold - © 2000-2007 Antonis Chaniotis - © 1998-2008 Joris Dauphin - © 2000-2007 Ludovic Pollet - © 1998-2008 Andreas Arens - © 1999-2007 Patrice Fortier - © 1998-2007 Valery Shchedrin - © 1999-2007 Martin Renold - © 1999-2008 Stephan Rasenberg - © 2001-2004 The SCons Foundation - © 2004-2013 Tina Petersen Jensen +Copyright: © 1998-2023 The Bos Wars and Stratagus Project + © 1998-2023 François Beerten + © 2005-2008 Llearch n'n'daCorna + © 2005-2008 Loïs Taulelle + © 1998-2008 Jimmy Salmon + © 1998-2008 Lutz Sammer + © 1999-2008 Nehal Mistry + © 1998-2008 Russell Smith + © 1998-2008 Vladi Belperchinov-Shabanski + © 1998-2008 Crestez Leonard + © 2007 Invasion Team + © 2000-2007 Frank Loeffler + © 2000-2005 Josh Cogliati + © 1998-2008 Fabrice Rossi + © 2004-2007 Frank “gorm” Loeffler + © 2005-2007 Tejay “TimberDragon” Penfold + © 2000-2007 Antonis Chaniotis + © 1998-2008 Joris Dauphin + © 2000-2007 Ludovic Pollet + © 1998-2008 Andreas Arens + © 1999-2007 Patrice Fortier + © 1998-2007 Valery Shchedrin + © 1999-2007 Martin Renold + © 1999-2008 Stephan Rasenberg + © 2001-2004 The SCons Foundation + © 2004-2013 Tina Petersen Jensen License: GPL-2+ Files: engine/guichan/* Copyright: © 2004-2005 darkbits - © 2004-2005 Per Larsson a.k.a finalman - © 2004-2005 Olof Naessén a.k.a jansem/yakslem + © 2004-2005 Per Larsson a.k.a finalman + © 2004-2005 Olof Naessén a.k.a jansem/yakslem License: BSD-3-clause /* _______ __ __ __ ______ __ __ _______ __ __ * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\ @@ -92,7 +92,7 @@ Files: engine/tolua/* Copyright: © 2003 Waldemar Celes - © 2003-2006 Ariel Manzur + © 2003-2006 Ariel Manzur License: Expat Comment: Original licensing terms: @@ -182,21 +182,21 @@ Files: languages/*.po Copyright: © 2006 Alexander Petkov - © 2006 Bent Jakobsen - © 2006 Dirk - © 2006 Kimmo Merikivi - © 2006 Francois Beerten - © 2006 Encolpe Degoute - © 2007 Eric Kok - © 2006-2007 Giovanni Oliveira - © 2007-2008 Olov Gustavsson - © 2007 Murat Şenel - © 2007 Radim Luža - © 2006 Julien Pourchez - © 2006 Loïs Taulelle - © 2006 Francois Beerten - © 2005 Wojciech Zylinski - © 2007 Olov Gustavsson + © 2006 Bent Jakobsen + © 2006 Dirk + © 2006 Kimmo Merikivi + © 2006 Francois Beerten + © 2006 Encolpe Degoute + © 2007 Eric Kok + © 2006-2007 Giovanni Oliveira + © 2007-2008 Olov Gustavsson + © 2007 Murat Şenel + © 2007 Radim Luža + © 2006 Julien Pourchez + © 2006 Loïs Taulelle + © 2006 Francois Beerten + © 2005 Wojciech Zylinski + © 2007 Olov Gustavsson License: GPL-2+ Files: graphics/general/dejavu*.png @@ -253,6 +253,7 @@ © 2010,2013,2018 Marc Dequènes (Duck) © 2013 Evgeni Golov © 2015-2017 Markus Koschany + © 2023 Alexandre Detiste License: GPL-2+ License: Expat diff -Nru boswars-2.7+svn160110/debian/patches/buildsys_flags_fix.patch boswars-2.8/debian/patches/buildsys_flags_fix.patch --- boswars-2.7+svn160110/debian/patches/buildsys_flags_fix.patch 2020-02-02 18:52:49.000000000 +0000 +++ boswars-2.8/debian/patches/buildsys_flags_fix.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ ---- broken/SConstruct 2013-06-18 22:33:39.635161061 +0200 -+++ new/SConstruct 2013-06-18 22:33:25.283258475 +0200 -@@ -101,29 +101,9 @@ - } - static_libs = [] - -- params = output.split() -- for arg in params: -- if arg[0] != '-': -- static_libs.append(arg) -- elif arg[:2] == '-L': -- flags['LIBPATH'].append(arg[2:]) -- elif arg[:2] == '-l': -- flags['LIBS'].append(arg[2:]) -- elif arg[:2] == '-I': -- flags['CPPPATH'].append(arg[2:]) -- elif arg[:4] == '-Wa,': -- flags['ASFLAGS'].append(arg) -- elif arg[:4] == '-Wl,': -- flags['LINKFLAGS'].append(arg) -- elif arg[:4] == '-Wp,': -- flags['CPPFLAGS'].append(arg) -- elif arg == '-pthread': -- flags['CCFLAGS'].append(arg) -- flags['LINKFLAGS'].append(arg) -- else: -- flags['CCFLAGS'].append(arg) -- apply(env.Append, (), flags) -- return static_libs -+ flags = env.ParseFlags(output) -+ env.MergeFlags(flags, unique=0) -+ return flags['LIBS'] - - if function is None: - function = parse_conf diff -Nru boswars-2.7+svn160110/debian/patches/reproducible-build.patch boswars-2.8/debian/patches/reproducible-build.patch --- boswars-2.7+svn160110/debian/patches/reproducible-build.patch 2020-02-02 18:52:49.000000000 +0000 +++ boswars-2.8/debian/patches/reproducible-build.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -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/scons.patch boswars-2.8/debian/patches/scons.patch --- boswars-2.7+svn160110/debian/patches/scons.patch 2020-02-02 18:52:49.000000000 +0000 +++ boswars-2.8/debian/patches/scons.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,78 +0,0 @@ -Author: Reiner Herrmann -Description: fix build with recent versions of scons -Bug-Debian: https://bugs.debian.org/947554 -Forwarded: https://savannah.nongnu.org/patch/index.php?9887 - ---- a/SConstruct -+++ b/SConstruct -@@ -114,7 +114,7 @@ - read,_ = p.communicate() - exitcode = p.wait() - if exitcode == 0: -- return (0, function(env, read)) -+ return (0, function(env, read.decode())) - else: - return (exitcode, []) - -@@ -170,20 +170,20 @@ - - ## check for required libs ## - if not conf.CheckLibWithHeader('png', 'png.h', 'c'): -- print 'Did not find png library or headers, exiting!' -+ print('Did not find png library or headers, exiting!') - Exit(1) - if not conf.CheckLibWithHeader('z', 'zlib.h', 'c'): -- print 'Did not find the zlib library or headers, exiting!' -+ print('Did not find the zlib library or headers, exiting!') - Exit(1) - if not 'USE_WIN32' in env['CPPDEFINES'] and not sys.platform.startswith('freebsd'): - if not conf.CheckLib('dl'): -- print 'Did not find dl library or header which is needed on some systems for lua. Exiting!' -+ print('Did not find dl library or header which is needed on some systems for lua. Exiting!') - Exit(1) - if not CheckLuaLib(env, conf): -- print 'Did not find required lua library. Exiting!' -+ print('Did not find required lua library. Exiting!') - Exit(1) - if not CheckOpenGL(env, conf): -- print 'Did not find required OpenGL library. Exiting!' -+ print('Did not find required OpenGL library. Exiting!') - Exit(1) - - # Check for optional libraries # -@@ -212,7 +212,7 @@ - env.ParseConfig('sdl-config --libs') - if sys.platform != "darwin" and not '-Dmain=SDL_main' in env['CCFLAGS']: - if not conf.CheckLibWithHeader('SDL', 'SDL.h', 'c'): -- print 'Did not find SDL library or headers, exiting!' -+ print('Did not find SDL library or headers, exiting!') - Exit(1) - - env = conf.Finish() -@@ -225,14 +225,14 @@ - # Remove outdated cache file - os.remove(cachename) - if optionsChanged or not os.path.exists(cachename): -- print cachename + " doesn't exist or out of date." -- print "Generating new build config cache ..." -+ print(cachename + " doesn't exist or out of date.") -+ print("Generating new build config cache ...") - cache = DefineOptions(cachename, {}) - AutoConfigure(env) - cache.Save(cachename, env) - else: - cache = DefineOptions(cachename, {}) -- print "Using " + cachename -+ print("Using " + cachename) - cache.Update(env) - - AutoConfigureIfNeeded(env, '') -@@ -291,7 +291,7 @@ - def DefineVariant(venv, v, vv = None): - if vv == None: - vv = '-' + v -- BuildDir('build/' + v, engineSourceDir, duplicate = 0) -+ VariantDir('build/' + v, engineSourceDir, duplicate = 0) - r = venv.Program('build/boswars' + vv, buildSourcesList('build/' + v)) - Alias(v, 'boswars' + vv) - return r diff -Nru boswars-2.7+svn160110/debian/patches/series boswars-2.8/debian/patches/series --- boswars-2.7+svn160110/debian/patches/series 2020-02-02 18:52:49.000000000 +0000 +++ boswars-2.8/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -buildsys_flags_fix.patch -reproducible-build.patch -scons.patch diff -Nru boswars-2.7+svn160110/debian/rules boswars-2.8/debian/rules --- boswars-2.7+svn160110/debian/rules 2020-02-02 18:52:49.000000000 +0000 +++ boswars-2.8/debian/rules 2023-07-09 19:49:11.000000000 +0000 @@ -1,51 +1,28 @@ #!/usr/bin/make -f # -*- makefile -*- +include /usr/share/dpkg/buildflags.mk export DEB_BUILD_MAINT_OPTIONS = hardening=+all -export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) -export CCFLAGS:=$(shell dpkg-buildflags --get CFLAGS) -DSTRATAGUS_LIB_PATH=\"/usr/share/games/boswars\" -export LINKFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) +export DATA = -DSTRATAGUS_LIB_PATH=\"/usr/share/games/boswars\" %: dh $@ +# https://codeberg.org/boswars/boswars/wiki/PackagingTips override_dh_auto_build-arch: - scons CPPFLAGS='$(CPPFLAGS)' CCFLAGS='$(CCFLAGS)' LINKFLAGS='$(LINKFLAGS)' - # rename binary - mv build/boswars-release build/boswars + # https://codeberg.org/boswars/boswars/commit/5cb645f8c55b536f0027314aac9216a200315708 + sed -i '/os.stat_float_times/d' fabricate.py + ./make.py cflags="$(CPPFLAGS) $(CFLAGS) $(DATA)" ldflags="$(LDFLAGS)" -override_dh_auto_install: - -override_dh_install-arch: +execute_after_dh_install-arch: # Copy (and rename) an icon to be used as desktop file - cp units/tank/ico_tank.png debian/boswars.png - # Default action - dh_install --arch + mkdir -p debian/boswars/usr/share/pixmaps/ + cp units/tank/ico_tank.png debian/boswars/usr/share/pixmaps/boswars.png rm -f debian/boswars/usr/share/doc/boswars/html/README-SDL.txt rm -f debian/boswars/usr/share/doc/boswars/html/*copyright* rm -f debian/boswars/usr/share/doc/boswars/html/gpl3.txt -override_dh_install-indep: - dh_install --indep - # Remove unneeded files. - for i in genpot.sh makesame.py updatepo.sh ; do \ - rm -f debian/boswars-data/usr/share/games/boswars/languages/$$i ; \ - done - # Replace broken terrain.png - cp debian/antarticum-terrain.png debian/boswars-data/usr/share/games/boswars/maps/antarticum.map/terrain.png - -override_dh_fixperms-indep: - dh_fixperms - chmod a-x debian/boswars-data/usr/share/games/boswars/campaigns/swindler/* - chmod a-x debian/boswars-data/usr/share/games/boswars/maps/tokelau.map/presentation.smp - -override_dh_clean: - dh_clean - [ ! -f .sconsign.dblite ] || scons -c - # Additional icon (see build-indep-stamp) - $(RM) debian/boswars.png - # Scons is stupid and leaves them behind no matter what. - $(RM) .sconsign.dblite - $(RM) .sconf_temp - $(RM) build_conf_cache.py build_options.py config.log - $(RM) build/boswars +execute_after_dh_install-indep: + # https://codeberg.org/boswars/boswars/commit/4586e5a8bd120ab1168100e459e6991420c9e24b + iconv -f ISO-8859-1 -t UTF-8 units/corpses/unit-corpses.lua -o debian/boswars-data/usr/share/games/boswars/units/corpses/unit-corpses.lua + iconv -f ISO-8859-1 -t UTF-8 units/gturret/unit-gturret.lua -o debian/boswars-data/usr/share/games/boswars/units/gturret/unit-gturret.lua diff -Nru boswars-2.7+svn160110/debian/source/include-binaries boswars-2.8/debian/source/include-binaries --- boswars-2.7+svn160110/debian/source/include-binaries 2020-02-02 18:52:49.000000000 +0000 +++ boswars-2.8/debian/source/include-binaries 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/antarticum-terrain.png diff -Nru boswars-2.7+svn160110/debian/watch boswars-2.8/debian/watch --- boswars-2.7+svn160110/debian/watch 2020-02-02 18:52:49.000000000 +0000 +++ boswars-2.8/debian/watch 2023-07-08 06:10:23.000000000 +0000 @@ -1,4 +1,4 @@ -version=3 +version=4 https://www.boswars.org/download.shtml dist/releases/boswars-([0-9.]*)-src\.tar\.gz diff -Nru boswars-2.7+svn160110/doc/development.html boswars-2.8/doc/development.html --- boswars-2.7+svn160110/doc/development.html 2016-01-10 11:26:31.000000000 +0000 +++ boswars-2.8/doc/development.html 2023-06-23 13:31:54.531453100 +0000 @@ -3,7 +3,7 @@