Bug#770791: unblock: pisa/3.0.32-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package pisa
RC bug fix.
unblock pisa/3.0.32-2
diff -u pisa-3.0.32/debian/changelog pisa-3.0.32/debian/changelog
--- pisa-3.0.32/debian/changelog
+++ pisa-3.0.32/debian/changelog
@@ -1,3 +1,14 @@
+pisa (3.0.32-2) unstable; urgency=medium
+
+ * Team upload.
+ * Add debian/patches/02-reportlab_bigger_than_two.patch.dpatch to fix
+ reportlab version compatibility problems (Closes: #571120)
+ - Thanks to Walter Doekes and Jamie McClelland for patches - both were
+ fine patches, but the one used was the smaller change since Debian is in
+ pre-release freeze
+
+ -- Scott Kitterman <scott@kitterman.com> Sun, 23 Nov 2014 21:51:06 -0500
+
pisa (3.0.32-1) unstable; urgency=low
* Initial release (Closes: #504277). Thanks to Toby Smithe
diff -u pisa-3.0.32/debian/patches/00list pisa-3.0.32/debian/patches/00list
--- pisa-3.0.32/debian/patches/00list
+++ pisa-3.0.32/debian/patches/00list
@@ -1,0 +2 @@
+02-reportlab_bigger_than_two.patch
only in patch2:
unchanged:
--- pisa-3.0.32.orig/debian/patches/02-reportlab_bigger_than_two.patch.dpatch
+++ pisa-3.0.32/debian/patches/02-reportlab_bigger_than_two.patch.dpatch
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02-reportlab_bigger_than_two.patch.dpatch by <wjdoekes@osso.nl>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix checking for reportlab major version greater than 2 Closes: #571120
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pisa-3.0.32~/sx/pisa3/pisa_util.py pisa-3.0.32/sx/pisa3/pisa_util.py
+--- pisa-3.0.32~/sx/pisa3/pisa_util.py 2009-05-08 01:41:46.000000000 -0400
++++ pisa-3.0.32/sx/pisa3/pisa_util.py 2014-11-23 21:48:31.738533971 -0500
+@@ -40,10 +40,10 @@
+
+ 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
Reply to: