[Python-modules-commits] r21939 - in packages/gamera/trunk/debian (3 files)

[jwilk at users.alioth.debian.org]

    Date: Saturday, May 26, 2012 @ 19:19:52
  Author: jwilk
Revision: 21939

Fix compatibility with PIL ?\226?\137?\165 1.2.

Added:
  packages/gamera/trunk/debian/patches/pil-import.diff
Modified:
  packages/gamera/trunk/debian/changelog
  packages/gamera/trunk/debian/patches/series

Modified: packages/gamera/trunk/debian/changelog
===================================================================
--- packages/gamera/trunk/debian/changelog	2012-05-26 14:41:02 UTC (rev 21938)
+++ packages/gamera/trunk/debian/changelog	2012-05-26 19:19:52 UTC (rev 21939)
@@ -8,8 +8,10 @@
     + Redirect nosetests output from stderr to stdout.
     + Copy tests to a temporary directory; remove rw-build-tree restriction.
     + Rename them, so that they match binary package names.
+  * Fix compatibility with PIL ≥ 1.2.
+    (pil-import.diff)
 
- -- Jakub Wilk <jwilk at debian.org>  Sat, 26 May 2012 16:31:29 +0200
+ -- Jakub Wilk <jwilk at debian.org>  Sat, 26 May 2012 21:11:18 +0200
 
 gamera (3.3.2-3) unstable; urgency=low
 

Added: packages/gamera/trunk/debian/patches/pil-import.diff
===================================================================
--- packages/gamera/trunk/debian/patches/pil-import.diff	                        (rev 0)
+++ packages/gamera/trunk/debian/patches/pil-import.diff	2012-05-26 19:19:52 UTC (rev 21939)
@@ -0,0 +1,16 @@
+Description: fix compatibility with PIL ≥ 1.2
+Author: Jakub Wilk <jwilk at debian.org>
+Forwarded: no
+Last-Update: 2012-05-26
+
+--- a/gamera/plugins/pil_io.py
++++ b/gamera/plugins/pil_io.py
+@@ -22,7 +22,7 @@
+ from gamera import config
+ 
+ try:
+-    import Image as PIL
++    from PIL import Image as PIL
+ except ImportError:
+     try:
+         verbose = config.get("verbosity_level")

Modified: packages/gamera/trunk/debian/patches/series
===================================================================
--- packages/gamera/trunk/debian/patches/series	2012-05-26 14:41:02 UTC (rev 21938)
+++ packages/gamera/trunk/debian/patches/series	2012-05-26 19:19:52 UTC (rev 21939)
@@ -8,3 +8,4 @@
 namespace-package.diff
 nosetests.diff
 trap-errors-from-pclose.diff
+pil-import.diff