[Python-modules-commits] r24720 - in packages/fabulous/trunk/debian (4 files)

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

    Date: Monday, June 10, 2013 @ 20:31:29
  Author: laarmen-guest
Revision: 24720

Merge the xtermspeedup package into python-fabulous (making it arch:any)
Rewrite the fix_except patch to raise an IOError when the compilation fails instead of an assertion

Modified:
  packages/fabulous/trunk/debian/control
  packages/fabulous/trunk/debian/patches/fix_except
  packages/fabulous/trunk/debian/python-fabulous.install
Deleted:
  packages/fabulous/trunk/debian/fabulous-xtermspeedup.install

Modified: packages/fabulous/trunk/debian/control
===================================================================
--- packages/fabulous/trunk/debian/control	2013-06-10 18:27:36 UTC (rev 24719)
+++ packages/fabulous/trunk/debian/control	2013-06-10 20:31:29 UTC (rev 24720)
@@ -16,26 +16,14 @@
 Vcs-Browser: http://anonscm.debian.org/viewsvn/python-modules/packages/fabulous/trunk/
 
 Package: python-fabulous
-Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}
-Recommends: fabulous-xtermspeedup
+Architecture: any
+Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
 Description: Python module to make your terminal output fabulous
  Fabulous is a Python library designed to make the output of terminal
  applications look fabulous. Fabulous allows you to print colors, images, and
  stylized text to the console (without curses.) Fabulous also offers features
  to improve the usability of Python's standard logging system.
 
-Package: fabulous-xtermspeedup
-Architecture: any
-Depends: ${misc:Depends}, python-fabulous, ${shlibs:Depends}
-Description: Python module to make your terminal output fabulous - speedup extension
- Fabulous is a Python library designed to make the output of terminal
- applications look fabulous. Fabulous allows you to print colors, images, and
- stylized text to the console (without curses.) Fabulous also offers features
- to improve the usability of Python's standard logging system.
- .
- This private extension greatly speeds up the xterm256 module.
-
 Package: python-fabulous-doc
 Section: doc
 Architecture: all

Deleted: packages/fabulous/trunk/debian/fabulous-xtermspeedup.install
===================================================================
--- packages/fabulous/trunk/debian/fabulous-xtermspeedup.install	2013-06-10 18:27:36 UTC (rev 24719)
+++ packages/fabulous/trunk/debian/fabulous-xtermspeedup.install	2013-06-10 20:31:29 UTC (rev 24720)
@@ -1 +0,0 @@
-xtermspeedup.so /usr/lib/fabulous

Modified: packages/fabulous/trunk/debian/patches/fix_except
===================================================================
--- packages/fabulous/trunk/debian/patches/fix_except	2013-06-10 18:27:36 UTC (rev 24719)
+++ packages/fabulous/trunk/debian/patches/fix_except	2013-06-10 20:31:29 UTC (rev 24720)
@@ -17,15 +17,25 @@
          else:
              height, width = struct.unpack("hhhh", call)[:2]
 diff --git a/fabulous/xterm256.py b/fabulous/xterm256.py
-index 65ed75f..16e8cf8 100644
+index 65ed75f..6662a89 100644
 --- a/fabulous/xterm256.py
 +++ b/fabulous/xterm256.py
-@@ -102,5 +102,5 @@ def compile_speedup():
+@@ -91,7 +91,8 @@ def compile_speedup():
+     sauce = join(dirname(__file__), '_xterm256.c')
+     if not exists(library) or getmtime(sauce) > getmtime(library):
+         build = "gcc -fPIC -shared -o %s %s" % (library, sauce)
+-        assert os.system(build + " >/dev/null 2>&1") == 0
++        if (os.system(build + " >/dev/null 2>&1") != 0):
++            raise OSError("GCC error")
+     xterm256_c = ctypes.cdll.LoadLibrary(library)
+     xterm256_c.init()
+     def xterm_to_rgb(xcolor):
+@@ -102,5 +103,5 @@ def compile_speedup():
  
  try:
      (rgb_to_xterm, xterm_to_rgb) = compile_speedup()
 -except:
-+except OSError, AssertionError:
++except OSError:
      logging.debug("fabulous failed to compile xterm256 speedup code")
 -- 
 1.7.10.4

Modified: packages/fabulous/trunk/debian/python-fabulous.install
===================================================================
--- packages/fabulous/trunk/debian/python-fabulous.install	2013-06-10 18:27:36 UTC (rev 24719)
+++ packages/fabulous/trunk/debian/python-fabulous.install	2013-06-10 20:31:29 UTC (rev 24720)
@@ -1 +1,2 @@
 usr/lib
+xtermspeedup.so /usr/lib/fabulous