tags 562406 + patch
thanks

* [email protected] <[email protected]>, 2009-12-24, 15:03:
This package build-depends or depends on one or more packages built
on top of the python2.4 source package, and will be uninstallable
when they will be removed from Sid and Squeeze.

The attached patch makes balder2d link to the current default version of Python (as opposed to a version hardcoded in debian/control and sources).

--
Jakub Wilk
diff --git a/SConstruct b/SConstruct
--- a/SConstruct
+++ b/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_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)
diff --git a/bin/scripts/test/SConscript b/bin/scripts/test/SConscript
--- a/bin/scripts/test/SConscript
+++ b/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])
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@
 Section: games
 Priority: optional
 Maintainer: Bjørn Hansen <[email protected]>
-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/
 

Attachment: signature.asc
Description: Digital signature

Reply via email to