tags 553931 + patch thanks Dear maintainer,
I've prepared an NMU for balder2d (versioned as 1.0-1.1) and uploaded it to DELAYED/2 (I'll upload tomorrow morning, so 2 days from that time). Regards.
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,18 @@ +balder2d (1.0-1.1) unstable; urgency=low + + * Non-maintainer upload, to drop Python 2.4; thanks to Luca Falavigna for the + report and to Jakub Wilk; Closes: #562406, #518172 + - debian/control + + b-d on 'python-dev (>= 2.4)' and not in the hardcoded 'python2.4-dev' + + added python-support to b-d + - SConstruct, bin/scripts/test/SConscript + + dinamically include default python, instead of hardcode python2.4 + * SConstruct + - added SDL to the list of library: it fixes a FTBFS when using gold as + linker; thanks to Peter Fritzsche for the report; Closes: #553931 + + -- Sandro Tosi <mo...@debian.org> Tue, 12 Jan 2010 21:42:11 +0100 + balder2d (1.0-1) unstable; urgency=low * new upstream release diff -u balder2d-1.0/debian/control balder2d-1.0/debian/control --- balder2d-1.0/debian/control +++ balder2d-1.0/debian/control @@ -2,7 +2,7 @@ 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, python2.4-dev +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 Standards-Version: 3.8.0 Homepage: http://balder.sourceforge.net/balder2d/ only in patch2: unchanged: --- balder2d-1.0.orig/SConstruct +++ balder2d-1.0/SConstruct @@ -1,5 +1,7 @@ # SConstruct for building balder2d with scons -includepath = ['/usr/include/python2.4','include'] +import sys + +includepath = ['/usr/include/python%d.%d' % sys.version_info[:2], 'include'] env = Environment(CPPPATH=includepath) #avoid leaving .sconsign files all over the place, put all signatures in: env.SConsignFile("scons-signatures") @@ -10,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_image SDL_mixer SDL_gfx python2.4 physfs') +libs = Split('guichan_sdl guichan SDL SDL_image SDL_mixer SDL_gfx physfs') + ['python%d.%d' % sys.version_info[:2]] env.ParseConfig('sdl-config --cflags --libs') env.Program('bin/balder2d',files, LIBS=libs) only in patch2: unchanged: --- balder2d-1.0.orig/bin/scripts/test/SConscript +++ balder2d-1.0/bin/scripts/test/SConscript @@ -1,4 +1,5 @@ +import sys -env = Environment(CPPPATH='/usr/include/python2.4') +env = Environment(CPPPATH='/usr/include/python%d.%d' % sys.version_info[:2]) -env.Program('runtests', 'runtests.cpp', LIBS='python2.4') +env.Program('runtests', 'runtests.cpp', LIBS='python%d.%d' % sys.version_info[:2])
