Control: tags -1 + patch

I fixed the problem by changing Imaging to PIL. See attached patch.

--- comix-4.0.4/debian/changelog        2016-02-24 14:16:57.000000000 +0100
+++ comix-4.0.4/debian/changelog        2018-09-28 19:07:08.000000000 +0200
@@ -1,3 +1,10 @@
+comix (4.0.4-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * added patch import PIL rather than Imaging (Closes: #866421)
+
+ --  <t...@flinkebits.de>  Fri, 28 Sep 2018 19:07:08 +0200
+
 comix (4.0.4-3) unstable; urgency=low
 
   * Didn't really add unar support, remove suggestion.
--- comix-4.0.4/debian/control  2016-02-24 13:45:55.000000000 +0100
+++ comix-4.0.4/debian/control  2018-09-28 19:07:08.000000000 +0200
@@ -8,7 +8,7 @@
 
 Package: comix
 Architecture: all
-Depends: ${misc:Depends}, python (>= 2.4), python-gtk2 (>= 2.12), 
python-imaging (>= 1.1.5)
+Depends: ${misc:Depends}, python (>= 2.4), python-gtk2 (>= 2.12), python-pil 
(>= 1.1.5)
 Recommends: mcomix
 Suggests: unrar-free | unrar, python (>=2.5)|python-sqllite2
 Description: GTK Comic Book Viewer
--- comix-4.0.4/debian/patches/866421-python-imaging-removal.patch      
1970-01-01 01:00:00.000000000 +0100
+++ comix-4.0.4/debian/patches/866421-python-imaging-removal.patch      
2018-09-28 19:07:08.000000000 +0200
@@ -0,0 +1,144 @@
+Description: remove python-imaging dependency
+
+
+Author: Thomas Walz <t...@flinkebits.de>
+Bug-Debian: https://bugs.debian.org/866421
+
+Last-Update: 2018-09-28
+
+Index: comix-4.0.4/install.py
+===================================================================
+--- comix-4.0.4.orig/install.py
++++ comix-4.0.4/install.py
+@@ -240,14 +240,14 @@ def check_dependencies():
+         print '    !!! PyGTK .................... Not found'
+         required_found = False
+     try:
+-        import Image
+-        assert Image.VERSION >= '1.1.5'
++        import PIL
++        assert PIL.VERSION >= '1.1.5'
+         print '    Python Imaging Library ....... OK'
+     except ImportError:
+         print '    !!! Python Imaging Library ... Not found'
+         required_found = False
+     except AssertionError:
+-        print '    !!! Python Imaging Library ... version', Image.VERSION,
++        print '    !!! Python Imaging Library ... version', PIL.VERSION,
+         print 'found'
+         print '    !!! Python Imaging Library 1.1.5 or higher is required'
+         required_found = False
+Index: comix-4.0.4/src/comix.py
+===================================================================
+--- comix-4.0.4.orig/src/comix.py
++++ comix-4.0.4/src/comix.py
+@@ -49,7 +49,7 @@ except ImportError:
+     sys.exit(1)
+ 
+ try:
+-    import Image
++    import PIL as Image
+     assert Image.VERSION >= '1.1.5'
+ except AssertionError:
+     print "You don't have the required version of the Python Imaging",
+Index: comix-4.0.4/src/histogram.py
+===================================================================
+--- comix-4.0.4.orig/src/histogram.py
++++ comix-4.0.4/src/histogram.py
+@@ -1,9 +1,9 @@
+ """histogram.py - Draw histograms (RGB) from pixbufs."""
+ 
+ import gtk
+-import Image
+-import ImageDraw
+-import ImageOps
++from PIL import Image
++from PIL import ImageDraw
++from PIL import ImageOps
+ 
+ import image
+ 
+Index: comix-4.0.4/src/image.py
+===================================================================
+--- comix-4.0.4.orig/src/image.py
++++ comix-4.0.4/src/image.py
+@@ -1,10 +1,10 @@
+ """image.py - Various image manipulations."""
+ 
+ import gtk
+-import Image
+-import ImageEnhance
+-import ImageOps
+-import ImageStat
++from PIL import Image
++from PIL import ImageEnhance
++from PIL import ImageOps
++from PIL import ImageStat
+ 
+ from preferences import prefs
+ 
+@@ -169,7 +169,7 @@ def get_most_common_edge_colour(pixbuf):
+ 
+ def pil_to_pixbuf(image):
+     """Return a pixbuf created from the PIL <image>."""
+-    imagestr = image.tostring()
++    imagestr = image.tobytes()
+     IS_RGBA = image.mode == 'RGBA'
+     return gtk.gdk.pixbuf_new_from_data(imagestr, gtk.gdk.COLORSPACE_RGB,
+         IS_RGBA, 8, image.size[0], image.size[1],
+Index: comix-4.0.4/src/library.py
+===================================================================
+--- comix-4.0.4.orig/src/library.py
++++ comix-4.0.4/src/library.py
+@@ -8,8 +8,8 @@ from xml.sax.saxutils import escape as x
+ import gtk
+ import gobject
+ import pango
+-import Image
+-import ImageDraw
++import PIL as Image
++from PIL import ImageDraw
+ 
+ import archive
+ import encoding
+Index: comix-4.0.4/src/thumbbar.py
+===================================================================
+--- comix-4.0.4.orig/src/thumbbar.py
++++ comix-4.0.4/src/thumbbar.py
+@@ -4,8 +4,8 @@ import urllib
+ 
+ import gtk
+ import gobject
+-import Image
+-import ImageDraw
++from PIL import Image
++from PIL import ImageDraw
+ 
+ import image
+ from preferences import prefs
+Index: comix-4.0.4/src/thumbnail.py
+===================================================================
+--- comix-4.0.4.orig/src/thumbnail.py
++++ comix-4.0.4/src/thumbnail.py
+@@ -15,7 +15,7 @@ import shutil
+ import tempfile
+ 
+ import gtk
+-import Image
++from PIL import Image
+ 
+ import archive
+ import constants
+Index: comix-4.0.4/src/thumbremover.py
+===================================================================
+--- comix-4.0.4.orig/src/thumbremover.py
++++ comix-4.0.4/src/thumbremover.py
+@@ -7,7 +7,7 @@ import urllib
+ 
+ import gtk
+ import pango
+-import Image
++import PIL as Image
+ 
+ import encoding
+ import labels
--- comix-4.0.4/debian/patches/series   2016-02-24 14:10:44.000000000 +0100
+++ comix-4.0.4/debian/patches/series   2018-09-28 19:07:08.000000000 +0200
@@ -1 +1,2 @@
 remove-build-dep-check.patch
+866421-python-imaging-removal.patch

Reply via email to