Dear maintainer,
The first NMU failed, because we hit a lintian autoreject on the
bundled libtinyxml. I've had a shot at unbundling it.
I've prepared an NMU for balder2d (versioned as 1.0-1.2) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Regards,
SR
diff -u balder2d-1.0/SConstruct balder2d-1.0/SConstruct
--- balder2d-1.0/SConstruct
+++ balder2d-1.0/SConstruct
@@ -12,7 +12,7 @@
import glob
files = glob.glob("src/*.cpp") + glob.glob("src/*/*.cpp") + glob.glob("src/menu/*/*.cpp")+ glob.glob("src/*/*.c")
-libs = Split('guichan_sdl guichan SDL SDL_image SDL_mixer SDL_gfx physfs') + ['python%d.%d' % sys.version_info[:2]]
+libs = Split('guichan_sdl guichan SDL SDL_image SDL_mixer SDL_gfx physfs tinyxml') + ['python%d.%d' % sys.version_info[:2]]
env.ParseConfig('sdl-config --cflags --libs')
env.Program('bin/balder2d',files, LIBS=libs)
diff -u balder2d-1.0/debian/control balder2d-1.0/debian/control
--- balder2d-1.0/debian/control
+++ balder2d-1.0/debian/control
@@ -2,13 +2,13 @@
Section: games
Priority: optional
Maintainer: Bjørn Hansen <holomo...@users.sourceforge.net>
-Build-Depends: debhelper (>= 4.0.0), scons, libphysfs-dev, libguichan-dev, libsdl1.2-dev, libsdl-gfx1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libstdc++6, python-dev (>= 2.4), python-support
+Build-Depends: debhelper (>= 4.0.0), scons, libphysfs-dev, libguichan-dev, libsdl1.2-dev, libsdl-gfx1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libstdc++6, python-dev (>= 2.4), libtinyxml-dev
Standards-Version: 3.8.0
Homepage: http://balder.sourceforge.net/balder2d/
Package: balder2d
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, balder2d-data
+Depends: ${shlibs:Depends}, ${misc:Depends}, balder2d-data
Description: A 2D shooter in zero gravity
In Balder2D, players control small probes which shoot tiny projectiles with
which they try to destroy each other. It features a 2D overhead view of the
diff -u balder2d-1.0/debian/changelog balder2d-1.0/debian/changelog
--- balder2d-1.0/debian/changelog
+++ balder2d-1.0/debian/changelog
@@ -1,3 +1,11 @@
+balder2d (1.0-1.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Remove python-support, not actually used (Closes: #785947)
+ * Use Debian's tinyxml rather than the bundled one.
+
+ -- Stefano Rivera <stefa...@debian.org> Tue, 18 Aug 2015 17:39:53 +0200
+
balder2d (1.0-1.1) unstable; urgency=low
* Non-maintainer upload, to drop Python 2.4; thanks to Luca Falavigna for the
diff -u balder2d-1.0/debian/rules balder2d-1.0/debian/rules
--- balder2d-1.0/debian/rules
+++ balder2d-1.0/debian/rules
@@ -24,6 +24,7 @@
configure-stamp:
dh_testdir
# Add here commands to configure the package.
+ rm -rf src/tinyxml
touch configure-stamp
only in patch2:
unchanged:
--- balder2d-1.0.orig/src/configmanager.cpp
+++ balder2d-1.0/src/configmanager.cpp
@@ -20,7 +20,7 @@
#include "configmanager.h"
#include "renderer.h"
-#include "tinyxml/tinyxml.h"
+#include "tinyxml.h"
#include <fstream>
using namespace Balder;
only in patch2:
unchanged:
--- balder2d-1.0.orig/src/mapparser.cpp
+++ balder2d-1.0/src/mapparser.cpp
@@ -21,7 +21,7 @@
#include "log.h"
#include "mapparser.h"
#include "gamemanager.h"
-#include "tinyxml/tinyxml.h"
+#include "tinyxml.h"
#include "filepathmanager.h"
using namespace Balder;
