[Python-apps-commits] r6286 - in packages/pyspread/trunk/debian (3 files)

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

    Date: Sunday, November 7, 2010 @ 21:51:12
  Author: anoteng-guest
Revision: 6286

Add patch to disable psyco in source, remove conflicts: python-psyco

Added:
  packages/pyspread/trunk/debian/patches/disable_psyco.patch
Modified:
  packages/pyspread/trunk/debian/control
  packages/pyspread/trunk/debian/patches/series

Modified: packages/pyspread/trunk/debian/control
===================================================================
--- packages/pyspread/trunk/debian/control	2010-11-07 18:20:01 UTC (rev 6285)
+++ packages/pyspread/trunk/debian/control	2010-11-07 21:51:12 UTC (rev 6286)
@@ -12,7 +12,6 @@
 Architecture: all
 Depends: ${misc:Depends}, python (>= 2.4), python-numpy (>= 1.1.0), python-wxgtk2.8 (>= 2.8.10.1)
 Recommends: python-pyme (>= 0.8.1), python-gmpy (>= 1.1.0), python-rpy (>= 1.0.3)
-Conflicts: python-psyco
 Breaks: ${python:Breaks}
 Description: cross-platform Python spreadsheet application
  Pyspread is a cross-platform Python spreadsheet application. Instead of 

Added: packages/pyspread/trunk/debian/patches/disable_psyco.patch
===================================================================
--- packages/pyspread/trunk/debian/patches/disable_psyco.patch	                        (rev 0)
+++ packages/pyspread/trunk/debian/patches/disable_psyco.patch	2010-11-07 21:51:12 UTC (rev 6286)
@@ -0,0 +1,14 @@
+Index: pyspread-0.1.2/_pyspread/pyspread
+===================================================================
+--- pyspread-0.1.2.orig/_pyspread/pyspread	2010-11-07 22:40:24.549542002 +0100
++++ pyspread-0.1.2/_pyspread/pyspread	2010-11-07 22:41:15.000000000 +0100
+@@ -142,9 +142,4 @@
+         import cProfile
+         cProfile.run('main()')
+     else:
+-        try:
+-            import psyco
+-            psyco.full()
+-        except ImportError:
+-            pass
+         main()

Modified: packages/pyspread/trunk/debian/patches/series
===================================================================
--- packages/pyspread/trunk/debian/patches/series	2010-11-07 18:20:01 UTC (rev 6285)
+++ packages/pyspread/trunk/debian/patches/series	2010-11-07 21:51:12 UTC (rev 6286)
@@ -1 +1,2 @@
+disable_psyco.patch
 remove_extra_COPYING.patch