[med-svn] r4974 - in trunk/packages/mgltools/mglutil/trunk/debian: . patches

[Piotr Ożarowski]

Author: piotr
Date: 2010-07-01 19:15:14 +0000 (Thu, 01 Jul 2010)
New Revision: 4974

Added:
   trunk/packages/mgltools/mglutil/trunk/debian/patches/
   trunk/packages/mgltools/mglutil/trunk/debian/patches/fix_assertion.patch
   trunk/packages/mgltools/mglutil/trunk/debian/patches/fix_shebangs.patch
   trunk/packages/mgltools/mglutil/trunk/debian/patches/series
Modified:
   trunk/packages/mgltools/mglutil/trunk/debian/changelog
   trunk/packages/mgltools/mglutil/trunk/debian/control
   trunk/packages/mgltools/mglutil/trunk/debian/rules
Log:
* Add fix_shebangs.patch to drop hardcoded pythoh2.5 dependency
* Add fix_assertion.patch to fix compatibility with Python 2.6
* Allow byte-compilation for Python >= 2.5
closes: 586840


Modified: trunk/packages/mgltools/mglutil/trunk/debian/changelog
===================================================================
--- trunk/packages/mgltools/mglutil/trunk/debian/changelog	2010-07-01 18:58:28 UTC (rev 4973)
+++ trunk/packages/mgltools/mglutil/trunk/debian/changelog	2010-07-01 19:15:14 UTC (rev 4974)
@@ -1,3 +1,13 @@
+mgltools-mglutil (1.5.4.cvs.20090603-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add fix_shebangs.patch to drop hardcoded pythoh2.5 dependency
+  * Add fix_assertion.patch to fix compatibility with Python 2.6
+  * Allow byte-compilation for Python >= 2.5
+    (closes: 586840)
+
+ -- Piotr Ożarowski <piotr at debian.org>  Wed, 30 Jun 2010 20:35:25 +0200
+
 mgltools-mglutil (1.5.4.cvs.20090603-1) unstable; urgency=low
 
   * New upstream version.

Modified: trunk/packages/mgltools/mglutil/trunk/debian/control
===================================================================
--- trunk/packages/mgltools/mglutil/trunk/debian/control	2010-07-01 18:58:28 UTC (rev 4973)
+++ trunk/packages/mgltools/mglutil/trunk/debian/control	2010-07-01 19:15:14 UTC (rev 4974)
@@ -5,9 +5,9 @@
 DM-Upload-Allowed: yes
 XS-Autobuild: yes
 Uploaders: Steffen Moeller <moeller at debian.org>, Sargis Dallakyan <sargis at scripps.edu>
-Build-Depends: debhelper (>= 5.0.38), python-central (>= 0.5.6), cdbs (>= 0.4), python2.5-dev
+Build-Depends: debhelper (>= 5.0.38), python-central (>= 0.5.6), cdbs (>= 0.4), python, quilt
 Standards-Version: 3.8.1
-XS-Python-Version: 2.5
+XS-Python-Version: >= 2.5
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/mgltools/pybabel/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/mgltools/pybabel/trunk/
 Homepage: http://mgltools.scripps.edu/

Added: trunk/packages/mgltools/mglutil/trunk/debian/patches/fix_assertion.patch
===================================================================
--- trunk/packages/mgltools/mglutil/trunk/debian/patches/fix_assertion.patch	                        (rev 0)
+++ trunk/packages/mgltools/mglutil/trunk/debian/patches/fix_assertion.patch	2010-07-01 19:15:14 UTC (rev 4974)
@@ -0,0 +1,13 @@
+Index: mgltools-mglutil-1.5.4.cvs.20090603/mglutil/math/Tests/test_matToAxis.py
+===================================================================
+--- mgltools-mglutil-1.5.4.cvs.20090603.orig/mglutil/math/Tests/test_matToAxis.py
++++ mgltools-mglutil-1.5.4.cvs.20090603/mglutil/math/Tests/test_matToAxis.py
+@@ -33,7 +33,7 @@ def rotateObject():
+     for i in range(len(m1)):
+         if fabs(m1[i]-m2[i]) > 1e-4:
+             bSame = False
+-    assert (bSame, True)
++    assert bSame, True
+ 
+ 
+ def test_rotateObject():

Added: trunk/packages/mgltools/mglutil/trunk/debian/patches/fix_shebangs.patch
===================================================================
--- trunk/packages/mgltools/mglutil/trunk/debian/patches/fix_shebangs.patch	                        (rev 0)
+++ trunk/packages/mgltools/mglutil/trunk/debian/patches/fix_shebangs.patch	2010-07-01 19:15:14 UTC (rev 4974)
@@ -0,0 +1,30 @@
+Index: mgltools-mglutil-1.5.4.cvs.20090603/mglutil/TestUtil/bin/publish
+===================================================================
+--- mgltools-mglutil-1.5.4.cvs.20090603.orig/mglutil/TestUtil/bin/publish
++++ mgltools-mglutil-1.5.4.cvs.20090603/mglutil/TestUtil/bin/publish
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python2.5
++#!/usr/bin/env python
+ #
+ from optparse import OptionParser
+ import time, sys, os, string
+Index: mgltools-mglutil-1.5.4.cvs.20090603/mglutil/TestUtil/bin/tester
+===================================================================
+--- mgltools-mglutil-1.5.4.cvs.20090603.orig/mglutil/TestUtil/bin/tester
++++ mgltools-mglutil-1.5.4.cvs.20090603/mglutil/TestUtil/bin/tester
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python2.5
++#!/usr/bin/env python
+ #
+ 
+ from optparse import OptionParser
+Index: mgltools-mglutil-1.5.4.cvs.20090603/mglutil/TestUtil/publishPack.csh
+===================================================================
+--- mgltools-mglutil-1.5.4.cvs.20090603.orig/mglutil/TestUtil/publishPack.csh
++++ mgltools-mglutil-1.5.4.cvs.20090603/mglutil/TestUtil/publishPack.csh
+@@ -1,4 +1,4 @@
+-#!/bin/tcsh
++#!/usr/bin/tcsh
+ 
+ # 1) go to the mgl version of the packages
+ # cd /mgl/python/share/lib/python2.5/site-packages/

Added: trunk/packages/mgltools/mglutil/trunk/debian/patches/series
===================================================================
--- trunk/packages/mgltools/mglutil/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/mgltools/mglutil/trunk/debian/patches/series	2010-07-01 19:15:14 UTC (rev 4974)
@@ -0,0 +1,2 @@
+fix_shebangs.patch
+fix_assertion.patch

Modified: trunk/packages/mgltools/mglutil/trunk/debian/rules
===================================================================
--- trunk/packages/mgltools/mglutil/trunk/debian/rules	2010-07-01 18:58:28 UTC (rev 4973)
+++ trunk/packages/mgltools/mglutil/trunk/debian/rules	2010-07-01 19:15:14 UTC (rev 4974)
@@ -13,11 +13,10 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
-#include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 clean::
 	find . -name CVS -a -type d| xargs -r rm -r
 	find . -name "*.gif" | xargs -r chmod -x
-	find . -name "*.csh" | xargs -r sed -i -e 's%#!/bin/tcsh%#!/usr/bin/tcsh%'
 	find . -name "*.csh" -o -name "getlatest" | xargs -r chmod +x
 	rm -rf build build-stamp debian/Pmv