[Python-modules-commits] r28559 - in packages/pisa/trunk/debian/patches (2 files)

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

    Date: Friday, April 18, 2014 @ 11:51:49
  Author: matthias-guest
Revision: 28559

Add patch to fix wrong version detection of reportlab

This fixes #571120

Added:
  packages/pisa/trunk/debian/patches/0002-Fix-reportlab-version-detection-for-versions-greater.patch
Modified:
  packages/pisa/trunk/debian/patches/series

Added: packages/pisa/trunk/debian/patches/0002-Fix-reportlab-version-detection-for-versions-greater.patch
===================================================================
--- packages/pisa/trunk/debian/patches/0002-Fix-reportlab-version-detection-for-versions-greater.patch	                        (rev 0)
+++ packages/pisa/trunk/debian/patches/0002-Fix-reportlab-version-detection-for-versions-greater.patch	2014-04-18 11:51:49 UTC (rev 28559)
@@ -0,0 +1,31 @@
+From 25efc8f0dbf0fe2b509ab5ce788b57357d995095 Mon Sep 17 00:00:00 2001
+From: Matthias Schmitz <matthias at sigxcpu.org>
+Date: Tue, 8 Apr 2014 22:32:47 +0200
+Subject: [PATCH] Fix reportlab version detection for versions greater 2.x
+
+Since python-reportlab 3 is in sid the version detection was broken as
+it only detects versions starting with 2.x .
+---
+ sx/pisa3/pisa_util.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/sx/pisa3/pisa_util.py b/sx/pisa3/pisa_util.py
+index d31d5a9..f5bfa68 100644
+--- a/sx/pisa3/pisa_util.py
++++ b/sx/pisa3/pisa_util.py
+@@ -40,10 +40,10 @@ import shutil
+ 
+ rgb_re = re.compile("^.*?rgb[(]([0-9]+).*?([0-9]+).*?([0-9]+)[)].*?[ ]*$")
+ 
+-if not(reportlab.Version[0] == "2" and reportlab.Version[2] >= "1"):
++if not((reportlab.Version[0] == "2" and reportlab.Version[2] >= "1") or reportlab.Version[0] > "2"):
+     raise ImportError("Reportlab Version 2.1+ is needed!")
+ 
+-REPORTLAB22 = (reportlab.Version[0] == "2" and reportlab.Version[2] >= "2")
++REPORTLAB22 = ((reportlab.Version[0] == "2" and reportlab.Version[2] >= "2") or reportlab.Version[0] > "2")
+ # print "***", reportlab.Version, REPORTLAB22, reportlab.__file__
+ 
+ import logging
+-- 
+1.8.5.3
+

Modified: packages/pisa/trunk/debian/patches/series
===================================================================
--- packages/pisa/trunk/debian/patches/series	2014-04-18 11:51:45 UTC (rev 28558)
+++ packages/pisa/trunk/debian/patches/series	2014-04-18 11:51:49 UTC (rev 28559)
@@ -1 +1,2 @@
 0001-Fix-path-to-interpreter.patch
+0002-Fix-reportlab-version-detection-for-versions-greater.patch