[Python-modules-commits] r11990 - in packages/python-graph/trunk/debian (5 files)

[morph at users.alioth.debian.org]

    Date: Saturday, February 27, 2010 @ 10:44:55
  Author: morph
Revision: 11990

* debian/rules
  - upstream changed the build system, updated accordingly
* debian/patches/10_exceptions_catch_fix.dpatch
  - added to catch exceptions in a way compatible with Python 2.5

Added:
  packages/python-graph/trunk/debian/patches/
  packages/python-graph/trunk/debian/patches/00list
  packages/python-graph/trunk/debian/patches/10_exceptions_catch_fix.dpatch
Modified:
  packages/python-graph/trunk/debian/changelog
  packages/python-graph/trunk/debian/rules

Modified: packages/python-graph/trunk/debian/changelog
===================================================================
--- packages/python-graph/trunk/debian/changelog	2010-02-27 10:29:48 UTC (rev 11989)
+++ packages/python-graph/trunk/debian/changelog	2010-02-27 10:44:55 UTC (rev 11990)
@@ -3,8 +3,12 @@
   * New upstream release
   * debian/patches/*
     - removed, no more needed
+  * debian/rules
+    - upstream changed the build system, updated accordingly
+  * debian/patches/10_exceptions_catch_fix.dpatch
+    - added to catch exceptions in a way compatible with Python 2.5
 
- -- Sandro Tosi <morph at debian.org>  Sat, 27 Feb 2010 11:29:30 +0100
+ -- Sandro Tosi <morph at debian.org>  Sat, 27 Feb 2010 11:43:07 +0100
 
 python-graph (1.6.1-1) unstable; urgency=low
 

Added: packages/python-graph/trunk/debian/patches/00list
===================================================================
--- packages/python-graph/trunk/debian/patches/00list	                        (rev 0)
+++ packages/python-graph/trunk/debian/patches/00list	2010-02-27 10:44:55 UTC (rev 11990)
@@ -0,0 +1 @@
+10_exceptions_catch_fix

Added: packages/python-graph/trunk/debian/patches/10_exceptions_catch_fix.dpatch
===================================================================
--- packages/python-graph/trunk/debian/patches/10_exceptions_catch_fix.dpatch	                        (rev 0)
+++ packages/python-graph/trunk/debian/patches/10_exceptions_catch_fix.dpatch	2010-02-27 10:44:55 UTC (rev 11990)
@@ -0,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_setup.py_fix.dpatch by Sandro Tosi <morph at debian.org>
+##
+## DP: Catch exception in a format compatible with Python 2.5
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' python-graph~/core/setup.py python-graph/core/setup.py
+--- python-graph~/core/setup.py	2009-11-17 15:37:51.000000000 +0100
++++ python-graph/core/setup.py	2010-02-27 11:41:17.232986582 +0100
+@@ -5,7 +5,7 @@
+ 
+ try:
+     from setuptools import setup, find_packages
+-except ImportError as ie:
++except ImportError, ie:
+     import ez_setup
+     ez_setup.use_setuptools()
+     from setuptools import setup, find_packages
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' python-graph~/tests/testrunner.py python-graph/tests/testrunner.py
+--- python-graph~/tests/testrunner.py	2009-12-01 00:15:58.000000000 +0100
++++ python-graph/tests/testrunner.py	2010-02-27 11:41:08.468985815 +0100
+@@ -49,7 +49,7 @@
+         for each_module in test_modules():
+             try:
+                 suite.addTests(unittest.TestLoader().loadTestsFromName(each_module))
+-            except ImportError as ie:
++            except ImportError, ie:
+                 log.exception(ie)
+                 continue
+         
+@@ -73,4 +73,4 @@
+    
+ if __name__ == "__main__":
+     main()
+-    
+\ No newline at end of file
++    


Property changes on: packages/python-graph/trunk/debian/patches/10_exceptions_catch_fix.dpatch
___________________________________________________________________
Added: svn:executable
   + *

Modified: packages/python-graph/trunk/debian/rules
===================================================================
--- packages/python-graph/trunk/debian/rules	2010-02-27 10:29:48 UTC (rev 11989)
+++ packages/python-graph/trunk/debian/rules	2010-02-27 10:44:55 UTC (rev 11990)
@@ -11,10 +11,10 @@
 	dh_testdir
 
 	# Add here commands to compile the package.
-	python setup.py build
+	cd core ; python setup.py build
 
 	# run tests
-	( cd tests ; PYTHONPATH=../build/lib/ python testrunner.py )
+	$(MAKE) tests PYTHONPATH=../build/lib/
 
 	$(MAKE) docs