[med-svn] r16889 - in trunk/packages/visionegg/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2014-05-09 09:23:09 +0000 (Fri, 09 May 2014)
New Revision: 16889

Added:
   trunk/packages/visionegg/trunk/debian/patches/
   trunk/packages/visionegg/trunk/debian/patches/condidtioally_impot_pil.patch
   trunk/packages/visionegg/trunk/debian/patches/series
Modified:
   trunk/packages/visionegg/trunk/debian/changelog
   trunk/packages/visionegg/trunk/debian/control
Log:
Fix problem when importing PIL


Modified: trunk/packages/visionegg/trunk/debian/changelog
===================================================================
--- trunk/packages/visionegg/trunk/debian/changelog	2014-05-09 07:34:57 UTC (rev 16888)
+++ trunk/packages/visionegg/trunk/debian/changelog	2014-05-09 09:23:09 UTC (rev 16889)
@@ -1,8 +1,9 @@
-visionegg (1.2.1-2) UNRELEASED; urgency=low
+visionegg (1.2.1-2) UNRELEASED; urgency=medium
 
-  * Added citations in debian/upstream
+  * Fix problem when importing PIL
+    Closes: #737828
 
- -- Andreas Tille <tille at debian.org>  Wed, 17 Apr 2013 09:36:50 +0200
+ -- Andreas Tille <tille at debian.org>  Fri, 09 May 2014 11:13:10 +0200
 
 visionegg (1.2.1-1) unstable; urgency=low
 

Modified: trunk/packages/visionegg/trunk/debian/control
===================================================================
--- trunk/packages/visionegg/trunk/debian/control	2014-05-09 07:34:57 UTC (rev 16888)
+++ trunk/packages/visionegg/trunk/debian/control	2014-05-09 09:23:09 UTC (rev 16889)
@@ -2,7 +2,8 @@
 Section: python
 Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-Uploaders: Thorsten Alteholz <debian at alteholz.de>
+Uploaders: Thorsten Alteholz <debian at alteholz.de>,
+           Andreas Tille <tille at debian.org>
 Build-Depends: debhelper (>= 9),
  python-all-dev (>=2.6),
  python-setuptools,

Added: trunk/packages/visionegg/trunk/debian/patches/condidtioally_impot_pil.patch
===================================================================
--- trunk/packages/visionegg/trunk/debian/patches/condidtioally_impot_pil.patch	                        (rev 0)
+++ trunk/packages/visionegg/trunk/debian/patches/condidtioally_impot_pil.patch	2014-05-09 09:23:09 UTC (rev 16889)
@@ -0,0 +1,24 @@
+Author: Bastian Venthur <venthur at debian.org>
+Last-Updated: Fri, 09 May 2014 09:57:29 +0200
+Bugs-Debian: http://bugs.debian.org/737828
+Bugs-Upstream: https://github.com/visionegg/visionegg/issues/4
+Forwardey-Upstream: yes, https://github.com/venthur/visionegg/commit/356c136c1947c8026fe44a9f821ea4b09f094376
+Description:  Don't crash if importing of the _imaging module fails.
+ Importing those modules is only needed when using "Installer".
+
+--- a/VisionEgg/Textures.py
++++ b/VisionEgg/Textures.py
+@@ -38,8 +38,11 @@ import OpenGL.GLU as glu
+ # They are listed here so that Gordon McMillan's Installer properly
+ # locates them.  You will not hurt anything other than your ability to
+ # make executables using Intaller if you remove these lines.
+-import _imaging
+-import ImageFile, ImageFileIO, BmpImagePlugin, JpegImagePlugin, PngImagePlugin
++try:
++    import _imaging
++    import ImageFile, ImageFileIO, BmpImagePlugin, JpegImagePlugin, PngImagePlugin
++except:
++    pass
+ 
+ if Image.VERSION >= '1.1.3':
+     shrink_filter = Image.ANTIALIAS # Added in PIL 1.1.3

Added: trunk/packages/visionegg/trunk/debian/patches/series
===================================================================
--- trunk/packages/visionegg/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/visionegg/trunk/debian/patches/series	2014-05-09 09:23:09 UTC (rev 16889)
@@ -0,0 +1 @@
+condidtioally_impot_pil.patch