[med-svn] [visionegg] 05/10: Fix problem when importing PIL

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository visionegg.

commit 6afa55554813953ae1bb03f8084160a3e29730fc
Author: Andreas Tille <tille at debian.org>
Date:   Fri May 9 09:23:09 2014 +0000

    Fix problem when importing PIL
---
 debian/changelog                             |  7 ++++---
 debian/control                               |  3 ++-
 debian/patches/condidtioally_impot_pil.patch | 24 ++++++++++++++++++++++++
 debian/patches/series                        |  1 +
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 11758ad..c596c3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
 
diff --git a/debian/control b/debian/control
index ea95213..475327b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: visionegg
 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,
diff --git a/debian/patches/condidtioally_impot_pil.patch b/debian/patches/condidtioally_impot_pil.patch
new file mode 100644
index 0000000..1166fcb
--- /dev/null
+++ b/debian/patches/condidtioally_impot_pil.patch
@@ -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
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..19d35ad
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+condidtioally_impot_pil.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/visionegg.git