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

[morph at users.alioth.debian.org]

    Date: Monday, January 9, 2012 @ 14:38:40
  Author: morph
Revision: 19949

* debian/patches/10_exceptions_catch_fix.dpatch
  - removed, we don't support 2.5 anymore

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

Modified: packages/python-graph/trunk/debian/changelog
===================================================================
--- packages/python-graph/trunk/debian/changelog	2012-01-09 14:16:29 UTC (rev 19948)
+++ packages/python-graph/trunk/debian/changelog	2012-01-09 14:38:40 UTC (rev 19949)
@@ -7,8 +7,10 @@
     - update to reflecg Google Code changes
   * debian/copyright
     - updated copyright years
+  * debian/patches/10_exceptions_catch_fix.dpatch
+    - removed, we don't support 2.5 anymore
 
- -- Sandro Tosi <morph at debian.org>  Mon, 09 Jan 2012 15:14:38 +0100
+ -- Sandro Tosi <morph at debian.org>  Mon, 09 Jan 2012 15:36:39 +0100
 
 python-graph (1.8.0-2) unstable; urgency=low
 

Modified: packages/python-graph/trunk/debian/patches/00list
===================================================================
--- packages/python-graph/trunk/debian/patches/00list	2012-01-09 14:16:29 UTC (rev 19948)
+++ packages/python-graph/trunk/debian/patches/00list	2012-01-09 14:38:40 UTC (rev 19949)
@@ -1,2 +1 @@
-10_exceptions_catch_fix
 20_remove_reset

Deleted: packages/python-graph/trunk/debian/patches/10_exceptions_catch_fix.dpatch
===================================================================
--- packages/python-graph/trunk/debian/patches/10_exceptions_catch_fix.dpatch	2012-01-09 14:16:29 UTC (rev 19948)
+++ packages/python-graph/trunk/debian/patches/10_exceptions_catch_fix.dpatch	2012-01-09 14:38:40 UTC (rev 19949)
@@ -1,68 +0,0 @@
-#! /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-03-02 21:02:27.193909298 +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~/dot/setup.py python-graph/dot/setup.py
---- python-graph~/dot/setup.py	2009-11-17 15:37:51.000000000 +0100
-+++ python-graph/dot/setup.py	2010-03-02 21:02:40.017908811 +0100
-@@ -6,7 +6,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-03-02 21:02:27.193909298 +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
-+    
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' python-graph~/tests/unittests-heuristics.py python-graph/tests/unittests-heuristics.py
---- python-graph~/tests/unittests-heuristics.py	2009-11-09 16:28:41.000000000 +0100
-+++ python-graph/tests/unittests-heuristics.py	2010-03-02 21:02:27.193909298 +0100
-@@ -65,7 +65,7 @@
-         
-         try:
-             result = pygraph.algorithms.minmax.heuristic_search( self.G, "England", "Sealand" , heuristic )
--        except exceptions.NodeUnreachable as _:
-+        except exceptions.NodeUnreachable:
-             return
-         
-         assert False, "This test should raise an unreachable error."
-@@ -91,4 +91,4 @@
-         assert result == ['A', 'D', 'C']
-         
- if __name__ == "__main__":
--    unittest.main()
-\ No newline at end of file
-+    unittest.main()