[Python-modules-commits] r11226 - in packages/soya/trunk/debian (4 files)

[deavid-guest at users.alioth.debian.org]

    Date: Tuesday, January 19, 2010 @ 22:35:18
  Author: deavid-guest
Revision: 11226

(II) New Upstream release 0.15rc1

* Updates changelog (more verbose log)
* Adds again use-ode-config patch
* Quilt Patches use-ode-config and pyrex-compilation-fix have been refreshed. 

You can download the official upstream release for this package from here:
http://download.gna.org/soya/
http://download.gna.org/soya/Soya-0.15rc1.tar.bz2

Modified:
  packages/soya/trunk/debian/changelog
  packages/soya/trunk/debian/patches/pyrex-compilation-fix
  packages/soya/trunk/debian/patches/series
  packages/soya/trunk/debian/patches/use-ode-config

Modified: packages/soya/trunk/debian/changelog
===================================================================
--- packages/soya/trunk/debian/changelog	2010-01-19 17:49:13 UTC (rev 11225)
+++ packages/soya/trunk/debian/changelog	2010-01-19 22:35:18 UTC (rev 11226)
@@ -8,8 +8,16 @@
   [ David Martínez Martí ]
   * New upstream release. Allows soya to be compiled with
     newer pyrex versions.
+  * Copyright file: Changed license text from GPLv2 only to 
+    GPLv2 or later.
+  * Some changes in debian/patches:
+    + elementtree: removed because upstream solved this issue.  
+    + enable-pyrex: removed because upsream no longer restricts pyrex 
+      compilation when a .svn folder exists
+    + pyrex-compilation: patch refreshed using quilt
+    + use-ode-config: patch refreshed using quilt
 
- -- David Martínez Martí <deavidsedice at gmail.com>  Tue, 19 Jan 2010 16:17:18 +0100
+ -- David Martínez Martí (mainkey) <deavidsedice at gmail.com>  Tue, 19 Jan 2010 16:17:18 +0100
 
 soya (0.14-4) unstable; urgency=low
 

Modified: packages/soya/trunk/debian/patches/pyrex-compilation-fix
===================================================================
--- packages/soya/trunk/debian/patches/pyrex-compilation-fix	2010-01-19 17:49:13 UTC (rev 11225)
+++ packages/soya/trunk/debian/patches/pyrex-compilation-fix	2010-01-19 22:35:18 UTC (rev 11226)
@@ -3,10 +3,11 @@
 therefore the name of the directory is soya-VERSION. This patch
 reverts previous behaviour of Pyrex. Thanks to Jakub Wilk.
 
-diff --git a/setup.py b/setup.py
---- a/setup.py
-+++ b/setup.py
-@@ -80,6 +80,13 @@
+Index: soya-0.15~rc1-1/setup.py
+===================================================================
+--- soya-0.15~rc1-1.orig/setup.py	2010-01-19 22:56:07.000000000 +0100
++++ soya-0.15~rc1-1/setup.py	2010-01-19 22:56:15.000000000 +0100
+@@ -82,6 +82,13 @@
  
  MACOSX_DEPLOYMENT_TARGET  = os.getenv('MACOSX_DEPLOYMENT_TARGET')
  try:
@@ -18,5 +19,5 @@
 +	Context.extract_module_name = extract_module_name
 +	del Context
  	from Pyrex.Distutils import build_ext
- 	HAVE_PYREX = 1
- except:
+ 	USE_PYREX = 1
+ except ImportError:

Modified: packages/soya/trunk/debian/patches/series
===================================================================
--- packages/soya/trunk/debian/patches/series	2010-01-19 17:49:13 UTC (rev 11225)
+++ packages/soya/trunk/debian/patches/series	2010-01-19 22:35:18 UTC (rev 11226)
@@ -1,5 +1,5 @@
 pyrex-compilation-fix
-# use-ode-config
+use-ode-config
 no_bytecompilation
 useless_shebang
 openal_sound_autodetect

Modified: packages/soya/trunk/debian/patches/use-ode-config
===================================================================
--- packages/soya/trunk/debian/patches/use-ode-config	2010-01-19 17:49:13 UTC (rev 11225)
+++ packages/soya/trunk/debian/patches/use-ode-config	2010-01-19 22:35:18 UTC (rev 11226)
@@ -1,39 +1,44 @@
 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 @@
- 		
- 	
- 	
+Index: soya-0.15~rc1-1/setup.py
+===================================================================
+--- soya-0.15~rc1-1.orig/setup.py	2010-01-19 22:56:15.000000000 +0100
++++ soya-0.15~rc1-1/setup.py	2010-01-19 22:59:28.000000000 +0100
+@@ -214,6 +214,14 @@
+ 		distutils.command.install_data.install_data.finalize_options(self)
+ 
+ 
++
 +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 @@
++
+ def do(command):
+ 	print command
+ 	r = os.system(command)
+@@ -236,19 +244,19 @@
  	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, 
+ 							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, 
+ 							extra_compile_args = COMPILE_ARGS,
+ 							extra_link_args = LINK_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, 
- 							),
+ 							extra_compile_args = COMPILE_ARGS,
+ 							extra_link_args = LINK_ARGS,