[Python-modules-commits] r33351 - in packages/circuits/trunk/debian (3 files)

[eriol-guest at users.alioth.debian.org]

    Date: Sunday, July 12, 2015 @ 16:09:54
  Author: eriol-guest
Revision: 33351

Remove 05_fix-pil-import.patch since it is not needed anymore

Modified:
  packages/circuits/trunk/debian/changelog
  packages/circuits/trunk/debian/patches/series
Deleted:
  packages/circuits/trunk/debian/patches/05_fix-pil-import.patch

Modified: packages/circuits/trunk/debian/changelog
===================================================================
--- packages/circuits/trunk/debian/changelog	2015-07-12 15:44:53 UTC (rev 33350)
+++ packages/circuits/trunk/debian/changelog	2015-07-12 16:09:54 UTC (rev 33351)
@@ -7,8 +7,10 @@
     - Refresh.
   * debian/patches/04_fix-python3-sintax-error.patch
     - Remove since it is not needed anymore.
+  * debian/patches/05_fix-pil-import.patch
+    - Remove since it is not needed anymore.
 
- -- Daniele Tricoli <eriol at mornie.org>  Sun, 12 Jul 2015 16:53:14 +0200
+ -- Daniele Tricoli <eriol at mornie.org>  Sun, 12 Jul 2015 18:08:34 +0200
 
 circuits (2.1.0-2) unstable; urgency=low
 

Deleted: packages/circuits/trunk/debian/patches/05_fix-pil-import.patch
===================================================================
--- packages/circuits/trunk/debian/patches/05_fix-pil-import.patch	2015-07-12 15:44:53 UTC (rev 33350)
+++ packages/circuits/trunk/debian/patches/05_fix-pil-import.patch	2015-07-12 16:09:54 UTC (rev 33351)
@@ -1,21 +0,0 @@
-Description: Fix PIL import
- see http://lists.debian.org/debian-python/2013/02/msg00017.html for details.
-Author: Daniele Tricoli <eriol at mornie.org>
-Last-Update: 2013-07-09
-
---- a/circuits/web/apps/memorymonitor/__init__.py
-+++ b/circuits/web/apps/memorymonitor/__init__.py
-@@ -6,8 +6,11 @@
- import threading
- from types import FrameType, ModuleType
- 
--import Image
--import ImageDraw
-+try:
-+    from PIL import Image, ImageDraw
-+except ImportError:
-+    import Image
-+    import ImageDraw
- 
- from circuits import handler
- from circuits.web import Controller

Modified: packages/circuits/trunk/debian/patches/series
===================================================================
--- packages/circuits/trunk/debian/patches/series	2015-07-12 15:44:53 UTC (rev 33350)
+++ packages/circuits/trunk/debian/patches/series	2015-07-12 16:09:54 UTC (rev 33351)
@@ -1,4 +1,3 @@
 01_disable_sphinxcontrib_extensions.patch
 02_remove_templatebuiltins_js.patch
 03_disable-address-check.patch
-05_fix-pil-import.patch