[Python-modules-commits] [pisa] 01/01: new release to include 0004-pypdf-2-pypdf2

[Luciano Bello]

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

luciano pushed a commit to branch master
in repository pisa.

commit acf3e6d8a6f4672421074b1334b6d031c1e30d0e
Author: Luciano Bello <luciano at debian.org>
Date:   Fri Jun 10 12:35:37 2016 +0200

    new release to include 0004-pypdf-2-pypdf2
---
 debian/changelog                         | 12 ++++++++++--
 debian/control                           |  4 ++--
 debian/patches/0004-pypdf-2-pypdf2.patch | 29 +++++++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 4 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1a6f448..d43771f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,16 @@
-pisa (3.0.32-4) UNRELEASED; urgency=medium
+pisa (3.0.32-4) unstable; urgency=medium
 
+  * Team upload.
+
+  [ Ondřej Nový ]
   * Fixed VCS URL (https)
 
- -- Ondřej Nový <novy at ondrej.org>  Tue, 29 Mar 2016 21:46:48 +0200
+  [ Luciano Bello ]
+  * Removing dependency to python-pypdf in favor of python-pypdf2.
+    (Closes: #763981)
+  * Standards-Version updated. 
+
+ -- Luciano Bello <luciano at debian.org>  Thu, 09 Jun 2016 15:27:11 +0200
 
 pisa (3.0.32-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index ca7482e..bf09f00 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.
 Uploaders: W. Martin Borgert <debacle at debian.org>
 Build-Depends: debhelper (>= 9), python, xsltproc, docbook-xsl
 Build-Depends-Indep: dh-python, python-setuptools
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Homepage: http://www.xhtml2pdf.com/
 Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/pisa.git
 Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/pisa.git
@@ -13,7 +13,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/pisa.git
 Package: python-pisa
 Architecture: all
 Provides: ${python:Provides}
-Depends: ${misc:Depends}, ${python:Depends}, python-html5lib, python-imaging, python-pypdf, python-reportlab (>= 2.2), python-pkg-resources
+Depends: ${misc:Depends}, ${python:Depends}, python-html5lib, python-imaging, python-pypdf2, python-reportlab (>= 2.2), python-pkg-resources
 Description: PDF generator using HTML and CSS (Python module)
  pisa is an html2pdf converter using the ReportLab Toolkit, HTML5lib and pyPdf.
  .
diff --git a/debian/patches/0004-pypdf-2-pypdf2.patch b/debian/patches/0004-pypdf-2-pypdf2.patch
new file mode 100644
index 0000000..4e1c71b
--- /dev/null
+++ b/debian/patches/0004-pypdf-2-pypdf2.patch
@@ -0,0 +1,29 @@
+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
+ 
diff --git a/debian/patches/series b/debian/patches/series
index c2c4850..a15fc8f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Fix-path-to-interpreter.patch
 0002-Fix-reportlab-version-detection-for-versions-greater.patch
 0003-Fix-interpreter-path-to-please-lintian.patch
+0004-pypdf-2-pypdf2.patch

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