[Python-modules-commits] r12371 - in packages/aafigure/trunk/debian (4 files)

[jwilk at users.alioth.debian.org]

    Date: Thursday, March 25, 2010 @ 11:57:01
  Author: jwilk
Revision: 12371

Enable font lookup code on non-Linux paltforms. Versioned recommendation on python-imaging turned out to be unnecessary.

Added:
  packages/aafigure/trunk/debian/patches/pilhelper-nonlinux.diff
Modified:
  packages/aafigure/trunk/debian/changelog
  packages/aafigure/trunk/debian/control
  packages/aafigure/trunk/debian/patches/series

Modified: packages/aafigure/trunk/debian/changelog
===================================================================
--- packages/aafigure/trunk/debian/changelog	2010-03-25 11:38:42 UTC (rev 12370)
+++ packages/aafigure/trunk/debian/changelog	2010-03-25 11:57:01 UTC (rev 12371)
@@ -1,8 +1,9 @@
 aafigure (0.5-1) UNRELEASED; urgency=low
 
   * New upstream release:
-    + Drop patch to use Liberation fonts, no longer needed; recommend
-      python-imaging (>= 1.1.7) instead.
+    + Drop patch to use Liberation fonts, no longer needed.
+    + Enable font lookup code on non-Linux paltforms.
+      [pilhelper-nonlinux.diff]
     + Update debian/copyright.
   * Bump standards version to 3.8.4 (no changes needed).
   * Switch to source format 3.0 (quilt).

Modified: packages/aafigure/trunk/debian/control
===================================================================
--- packages/aafigure/trunk/debian/control	2010-03-25 11:38:42 UTC (rev 12370)
+++ packages/aafigure/trunk/debian/control	2010-03-25 11:57:01 UTC (rev 12371)
@@ -12,7 +12,7 @@
 Package: python-aafigure
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}
-Recommends: python-reportlab, python-imaging (>= 1.1.7), ttf-liberation
+Recommends: python-reportlab, python-imaging, ttf-liberation
 Description: ASCII art to image converter
  aafigure is an ASCII art to image converter.
  .

Added: packages/aafigure/trunk/debian/patches/pilhelper-nonlinux.diff
===================================================================
--- packages/aafigure/trunk/debian/patches/pilhelper-nonlinux.diff	                        (rev 0)
+++ packages/aafigure/trunk/debian/patches/pilhelper-nonlinux.diff	2010-03-25 11:57:01 UTC (rev 12371)
@@ -0,0 +1,18 @@
+Description: Enable font lookup code on non-Linux paltforms.
+Author: Jakub Wilk <jwilk at debian.org>
+Forwarded: no
+Last-Updated: 2010-03-25
+
+Index: aafigure-0.5/aafigure/PILhelper.py
+===================================================================
+--- aafigure-0.5.orig/aafigure/PILhelper.py	2010-03-25 12:46:08.000000000 +0100
++++ aafigure-0.5/aafigure/PILhelper.py	2010-03-25 12:48:25.000000000 +0100
+@@ -33,7 +33,7 @@
+         font = ImageFont.truetype(name, size)
+     except IOError:
+         # PIL upto 1.1.7b1 only tries absolute paths for win32
+-        if sys.platform.startswith('linux'):
++        if os.name == 'posix':
+             font_path = _find_file(name, '/usr/share/fonts')
+             if font_path:
+                 try:

Modified: packages/aafigure/trunk/debian/patches/series
===================================================================
--- packages/aafigure/trunk/debian/patches/series	2010-03-25 11:38:42 UTC (rev 12370)
+++ packages/aafigure/trunk/debian/patches/series	2010-03-25 11:57:01 UTC (rev 12371)
@@ -0,0 +1 @@
+pilhelper-nonlinux.diff