[Python-modules-commits] [xhtml2pdf] 02/04: remove redundant patches

[Drew Parsons]

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

dparsons pushed a commit to branch master
in repository xhtml2pdf.

commit f9eb66bd362e6d1ade159baa1684ce0b4d22f00e
Author: Drew Parsons <dparsons at emerall.com>
Date:   Mon Oct 30 02:45:08 2017 +0800

    remove redundant patches
    
    fixes applied upstream
---
 ...ab-version-detection-for-versions-greater.patch | 29 ----------------------
 debian/patches/0004-pypdf-2-pypdf2.patch           | 29 ----------------------
 2 files changed, 58 deletions(-)

diff --git a/debian/patches/0002-Fix-reportlab-version-detection-for-versions-greater.patch b/debian/patches/0002-Fix-reportlab-version-detection-for-versions-greater.patch
deleted file mode 100644
index ff69249..0000000
--- a/debian/patches/0002-Fix-reportlab-version-detection-for-versions-greater.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 34895381b5860a7278f8a0e9d8d85644ef629008 Mon Sep 17 00:00:00 2001
-From: Matthias Schmitz <matthias at sigxcpu.org>
-Date: Tue, 8 Apr 2014 22:32:47 +0200
-Subject: 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 .
-Patch-Name: 0002-Fix-reportlab-version-detection-for-versions-greater.patch
----
- 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
diff --git a/debian/patches/0004-pypdf-2-pypdf2.patch b/debian/patches/0004-pypdf-2-pypdf2.patch
deleted file mode 100644
index 4e1c71b..0000000
--- a/debian/patches/0004-pypdf-2-pypdf2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Luciano Bello <luciano at debian.org>
-Date: Fri, 10 Jun 2016 12:30:04 +0200
-Subject: Removing python-pypdf in favor of python-pypdf2
-
-python-pypdf is not supported anymore (#749321). python-pypdf2 
-is the new way to go.
----
---- a/sx/pisa3/pisa_pdf.py
-+++ b/sx/pisa3/pisa_pdf.py
-@@ -39,7 +39,7 @@ class pisaPDF:
-             self.files.append(doc.dest)
- 
-     def join(self, file=None):
--        import pyPdf
-+        import PyPDF2 as pyPdf
-         if pyPdf:
-             output = pyPdf.PdfFileWriter()
-             for pdffile in self.files:
---- a/sx/pisa3/pisa_util.py
-+++ b/sx/pisa3/pisa_util.py
-@@ -55,7 +55,7 @@ except:
-     import StringIO
- 
- try:
--    import pyPdf
-+    import PyPDF2 as pyPdf
- except:
-     pyPdf = None
- 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/xhtml2pdf.git