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/changelog balder2d-1.0/debian/changelog
--- balder2d-1.0/debian/changelog
+++ balder2d-1.0/debian/changelog
@@ -1,20 +1,10 @@
-balder2d (1.0-1.1build3) wily; urgency=medium
+balder2d (1.0-1.2) unstable; urgency=medium
 
-  * No-change rebuild against libguichan*v5
+  * Non-maintainer upload.
+  * Remove python-support, not actually used (Closes: #785947)
+  * Use Debian's tinyxml rather than the bundled one.
 
- -- Martin Pitt <martin.pitt@ubuntu.com>  Wed, 12 Aug 2015 09:58:23 +0200
-
-balder2d (1.0-1.1build2) utopic; urgency=medium
-
-  * Rebuild against libsdl-gfx1.2-5.
-
- -- Colin Watson <cjwatson@ubuntu.com>  Thu, 01 May 2014 10:21:31 +0100
-
-balder2d (1.0-1.1build1) natty; urgency=low
-
-  * Rebuild with python 2.7 as the python default.
-
- -- Matthias Klose <doko@ubuntu.com>  Thu, 09 Dec 2010 16:43:58 +0000
+ -- Stefano Rivera <stefanor@debian.org>  Fri, 21 Aug 2015 17:30:23 +0200
 
 balder2d (1.0-1.1) unstable; urgency=low
 
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 <holomorph@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/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;