[Python-modules-commits] r9367 - in packages/soya/trunk/debian (5 files)

bernat at users.alioth.debian.org bernat at users.alioth.debian.org
Sun Aug 16 13:01:18 UTC 2009


    Date: Sunday, August 16, 2009 @ 13:01:16
  Author: bernat
Revision: 9367

* Use (freetype|ode)-config when compiling and linking to
  lib(freetype|ode). Closes: #521754.
* Depends on libode-sp-dev instead of libode-dev since soya
  only works with single precision.

Added:
  packages/soya/trunk/debian/patches/use-ode-config
Modified:
  packages/soya/trunk/debian/changelog
  packages/soya/trunk/debian/control
  packages/soya/trunk/debian/control.in
  packages/soya/trunk/debian/patches/series

Modified: packages/soya/trunk/debian/changelog
===================================================================
--- packages/soya/trunk/debian/changelog	2009-08-16 12:11:21 UTC (rev 9366)
+++ packages/soya/trunk/debian/changelog	2009-08-16 13:01:16 UTC (rev 9367)
@@ -1,3 +1,12 @@
+soya (0.14-4) unstable; urgency=low
+
+  * Use (freetype|ode)-config when compiling and linking to
+    lib(freetype|ode). Closes: #521754.
+  * Depends on libode-sp-dev instead of libode-dev since soya only works
+    with single precision.
+
+ -- Vincent Bernat <bernat at debian.org>  Sun, 16 Aug 2009 15:00:29 +0200
+
 soya (0.14-3) unstable; urgency=low
 
   * Upload to unstable.

Modified: packages/soya/trunk/debian/control
===================================================================
--- packages/soya/trunk/debian/control	2009-08-16 12:11:21 UTC (rev 9366)
+++ packages/soya/trunk/debian/control	2009-08-16 13:01:16 UTC (rev 9367)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Vincent Bernat <bernat at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), cdbs (>= 0.4.43), python-all-dev, python-support, quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), libsdl1.2-dev, libcal3d12-dev, libglu1-mesa-dev | libglu-dev, libfreetype6-dev, libpng12-dev, libglew1.5-dev, libode-dev | libode0-dev (>= 0.7), libopenal-dev (>= 0.2005080600-2), libalut-dev, python-pyrex (>= 0.9.7.2)
+Build-Depends: cdbs, debhelper, python-all-dev, python-support, quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), libsdl1.2-dev, libcal3d12-dev, libglu1-mesa-dev | libglu-dev, libfreetype6-dev, libpng12-dev, libglew1.5-dev, libode-sp-dev, libopenal-dev (>= 0.2005080600-2), libalut-dev, python-pyrex (>= 0.9.7.2)
 Standards-Version: 3.8.1
 Homepage: http://home.gna.org/oomadness/en/soya/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/soya/trunk

Modified: packages/soya/trunk/debian/control.in
===================================================================
--- packages/soya/trunk/debian/control.in	2009-08-16 12:11:21 UTC (rev 9366)
+++ packages/soya/trunk/debian/control.in	2009-08-16 13:01:16 UTC (rev 9367)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Vincent Bernat <bernat at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: @cdbs@, libsdl1.2-dev, libcal3d12-dev, libglu1-mesa-dev | libglu-dev, libfreetype6-dev, libpng12-dev, libglew1.5-dev, libode-dev | libode0-dev (>= 0.7), libopenal-dev (>= 0.2005080600-2), libalut-dev, python-pyrex (>= 0.9.7.2)
+Build-Depends: @cdbs@, libsdl1.2-dev, libcal3d12-dev, libglu1-mesa-dev | libglu-dev, libfreetype6-dev, libpng12-dev, libglew1.5-dev, libode-sp-dev, libopenal-dev (>= 0.2005080600-2), libalut-dev, python-pyrex (>= 0.9.7.2)
 Standards-Version: 3.8.1
 Homepage: http://home.gna.org/oomadness/en/soya/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/soya/trunk

Modified: packages/soya/trunk/debian/patches/series
===================================================================
--- packages/soya/trunk/debian/patches/series	2009-08-16 12:11:21 UTC (rev 9366)
+++ packages/soya/trunk/debian/patches/series	2009-08-16 13:01:16 UTC (rev 9367)
@@ -1,3 +1,4 @@
+use-ode-config
 no_bytecompilation
 useless_shebang
 openal_sound_autodetect

Added: packages/soya/trunk/debian/patches/use-ode-config
===================================================================
--- packages/soya/trunk/debian/patches/use-ode-config	                        (rev 0)
+++ packages/soya/trunk/debian/patches/use-ode-config	2009-08-16 13:01:16 UTC (rev 9367)
@@ -0,0 +1,39 @@
+Use *-config for CFLAGS and LDFLAGS
+
+--- a/setup.py~	2008-08-29 13:17:36.000000000 +0200
++++ a/setup.py	2009-03-30 21:51:53.000000000 +0200
+@@ -203,6 +203,12 @@
+ 		
+ 	
+ 	
++import commands
++COMPILE_ARGS.extend(commands.getoutput("ode-config --cflags").split(" "))
++COMPILE_ARGS.extend(commands.getoutput("freetype-config --cflags").split(" "))
++LINK_ARGS = []
++LINK_ARGS.extend(commands.getoutput("ode-config --libs").split(" "))
++LINK_ARGS.extend(commands.getoutput("freetype-config --libs").split(" "))
+ if HAVE_PYREX:
+ 	# make pyrex recompile the soya module if any of the .pyx files have changed
+ 	# should probably recurse directories
+@@ -215,17 +218,18 @@
+ 	KARGS = {
+ 		"ext_modules" : [
+ 		Extension("soya._soya", SOYA_PYREX_SOURCES,
+-							include_dirs=INCDIR, library_dirs=LIBDIR,
++#							include_dirs=INCDIR, library_dirs=LIBDIR,
+ 							libraries=LIBS, define_macros=DEFINES,
+ 							extra_compile_args = COMPILE_ARGS, 
++							extra_link_args = LINK_ARGS, 
+ 							),
+ 		Extension("soya.opengl",   ["opengl.pyx"],
+-							include_dirs=INCDIR, library_dirs=LIBDIR,
++#							include_dirs=INCDIR, library_dirs=LIBDIR,
+ 							libraries=LIBS, define_macros=DEFINES,
+ 							extra_compile_args = COMPILE_ARGS, 
+ 							),
+ 		Extension("soya.sdlconst", ["sdlconst.pyx"],
+-							include_dirs=INCDIR, library_dirs=LIBDIR,
++#							include_dirs=INCDIR, library_dirs=LIBDIR,
+ 							libraries=LIBS, define_macros=DEFINES,
+ 							extra_compile_args = COMPILE_ARGS, 
+ 							),




More information about the Python-modules-commits mailing list