[Python-apps-commits] r11317 - in packages/pdfshuffler/trunk (5 files)

[sharky at users.alioth.debian.org]

    Date: Saturday, September 27, 2014 @ 12:18:02
  Author: sharky
Revision: 11317

allow pdfshuffler to work with PyPDF2

Added:
  packages/pdfshuffler/trunk/debian/patches/use-pypdf2
Modified:
  packages/pdfshuffler/trunk/debian/	(properties)
  packages/pdfshuffler/trunk/debian/changelog
  packages/pdfshuffler/trunk/debian/control
  packages/pdfshuffler/trunk/debian/patches/series


Property changes on: packages/pdfshuffler/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Modified: packages/pdfshuffler/trunk/debian/changelog
===================================================================
--- packages/pdfshuffler/trunk/debian/changelog	2014-09-22 09:08:52 UTC (rev 11316)
+++ packages/pdfshuffler/trunk/debian/changelog	2014-09-27 12:18:02 UTC (rev 11317)
@@ -1,3 +1,10 @@
+pdfshuffler (0.6.0-6) UNRELEASED; urgency=medium
+
+  * Fall back to PyPDF2 if pyPdf is not found (Closes: #762083).
+  * Add myself to uploaders.
+
+ -- Jeremy Lainé <jeremy.laine at m4x.org>  Sat, 27 Sep 2014 09:47:01 +0200
+
 pdfshuffler (0.6.0-5) unstable; urgency=medium
 
   * Adopt package. (Closes: #728579)

Modified: packages/pdfshuffler/trunk/debian/control
===================================================================
--- packages/pdfshuffler/trunk/debian/control	2014-09-22 09:08:52 UTC (rev 11316)
+++ packages/pdfshuffler/trunk/debian/control	2014-09-27 12:18:02 UTC (rev 11317)
@@ -2,7 +2,7 @@
 Section: x11
 Priority: optional
 Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Uploaders: Vincent Cheng <vcheng at debian.org>
+Uploaders: Vincent Cheng <vcheng at debian.org>, Jeremy Lainé <jeremy.laine at m4x.org>
 Build-Depends: debhelper (>= 9), gettext, python (>= 2.6.6-3~)
 Standards-Version: 3.9.5
 X-Python-Version: >= 2.4

Modified: packages/pdfshuffler/trunk/debian/patches/series
===================================================================
--- packages/pdfshuffler/trunk/debian/patches/series	2014-09-22 09:08:52 UTC (rev 11316)
+++ packages/pdfshuffler/trunk/debian/patches/series	2014-09-27 12:18:02 UTC (rev 11317)
@@ -1 +1,2 @@
 fix-manpage-typo
+use-pypdf2

Added: packages/pdfshuffler/trunk/debian/patches/use-pypdf2
===================================================================
--- packages/pdfshuffler/trunk/debian/patches/use-pypdf2	                        (rev 0)
+++ packages/pdfshuffler/trunk/debian/patches/use-pypdf2	2014-09-27 12:18:02 UTC (rev 11317)
@@ -0,0 +1,17 @@
+From: Jeremy Lainé <jeremy.laine at m4x.org>
+Description: Use PyPDF2 instead of pyPdf
+
+--- a/pdfshuffler/pdfshuffler.py	2012-04-28 16:15:17.000000000 +0200
++++ b/pdfshuffler/pdfshuffler.py	2014-09-27 14:12:20.868185865 +0200
+@@ -71,7 +71,10 @@
+ import cairo
+ 
+ import poppler      #for the rendering of pdf pages
+-from pyPdf import PdfFileWriter, PdfFileReader
++try:
++    from pyPdf import PdfFileWriter, PdfFileReader
++except ImportError:
++    from PyPDF2 import PdfFileWriter, PdfFileReader
+ 
+ from pdfshuffler_iconview import CellRendererImage
+ gobject.type_register(CellRendererImage)