[Python-apps-commits] r13237 - in packages/pdfshuffler/trunk/debian (3 files)

[vcheng at users.alioth.debian.org]

    Date: Thursday, May 26, 2016 @ 02:16:32
  Author: vcheng
Revision: 13237

default to pypdf2

Modified:
  packages/pdfshuffler/trunk/debian/changelog
  packages/pdfshuffler/trunk/debian/control
  packages/pdfshuffler/trunk/debian/patches/use-pypdf2

Modified: packages/pdfshuffler/trunk/debian/changelog
===================================================================
--- packages/pdfshuffler/trunk/debian/changelog	2016-05-26 02:11:48 UTC (rev 13236)
+++ packages/pdfshuffler/trunk/debian/changelog	2016-05-26 02:16:32 UTC (rev 13237)
@@ -1,6 +1,8 @@
 pdfshuffler (0.6.0-8) UNRELEASED; urgency=medium
 
   * Add build-dep on dh-python.
+  * Default to pypdf2 instead of deprecated pypdf. (Closes: #763973, #763976,
+    LP: #656382)
   * Fix missing UI translations and add Spanish and Catalan translations.
     (Closes: #756281, LP: #1328862)
   * Install hi-res scalable svg icon. (Closes: #768306, LP: #1081190)

Modified: packages/pdfshuffler/trunk/debian/control
===================================================================
--- packages/pdfshuffler/trunk/debian/control	2016-05-26 02:11:48 UTC (rev 13236)
+++ packages/pdfshuffler/trunk/debian/control	2016-05-26 02:16:32 UTC (rev 13237)
@@ -15,7 +15,7 @@
 Depends:
  python-gtk2,
  python-poppler,
- python-pypdf (>= 1.10),
+ python-pypdf2 | python-pypdf (>= 1.10),
  ${misc:Depends},
  ${python:Depends}
 Description: merge, split and re-arrange pages from PDF documents

Modified: packages/pdfshuffler/trunk/debian/patches/use-pypdf2
===================================================================
--- packages/pdfshuffler/trunk/debian/patches/use-pypdf2	2016-05-26 02:11:48 UTC (rev 13236)
+++ packages/pdfshuffler/trunk/debian/patches/use-pypdf2	2016-05-26 02:16:32 UTC (rev 13237)
@@ -7,17 +7,17 @@
 
 This patch allows pdfshuffler to use either pyPdf or PyPDF2.
 
---- a/pdfshuffler/pdfshuffler.py	2012-04-28 16:15:17.000000000 +0200
-+++ b/pdfshuffler/pdfshuffler.py	2014-09-27 14:12:20.868185865 +0200
+--- a/pdfshuffler/pdfshuffler.py
++++ b/pdfshuffler/pdfshuffler.py
 @@ -71,7 +71,10 @@
  import cairo
  
  import poppler      #for the rendering of pdf pages
 -from pyPdf import PdfFileWriter, PdfFileReader
 +try:
++    from PyPDF2 import PdfFileWriter, PdfFileReader
++except ImportError:
 +    from pyPdf import PdfFileWriter, PdfFileReader
-+except ImportError:
-+    from PyPDF2 import PdfFileWriter, PdfFileReader
  
  from pdfshuffler_iconview import CellRendererImage
  gobject.type_register(CellRendererImage)