[Python-modules-commits] r19573 - in packages/python-poppler/trunk/debian (4 files)

[gaspa-guest at users.alioth.debian.org]

    Date: Friday, December 9, 2011 @ 15:39:17
  Author: gaspa-guest
Revision: 19573

added patch for poppoler 0.18, specified GPL version for debian/copyright

Added:
  packages/python-poppler/trunk/debian/patches/poppler-0.18.diff
Modified:
  packages/python-poppler/trunk/debian/changelog
  packages/python-poppler/trunk/debian/copyright
  packages/python-poppler/trunk/debian/patches/series

Modified: packages/python-poppler/trunk/debian/changelog
===================================================================
--- packages/python-poppler/trunk/debian/changelog	2011-12-09 11:07:28 UTC (rev 19572)
+++ packages/python-poppler/trunk/debian/changelog	2011-12-09 15:39:17 UTC (rev 19573)
@@ -1,3 +1,11 @@
+python-poppler (0.12.1-5) unstable; urgency=low
+
+  * Specified version of GPL in debian/copyright
+  * Add poppler-0.18.diff: Drop API which does not exist any more in poppler
+    0.18. Thanks to Martin Pitt for the patch.(LP: #900707) (Closes: #651388)
+
+ -- Andrea Gasparini <gaspa at yattaweb.it>  Fri, 09 Dec 2011 15:37:15 +0100
+
 python-poppler (0.12.1-4) unstable; urgency=low
 
   * Team upload.

Modified: packages/python-poppler/trunk/debian/copyright
===================================================================
--- packages/python-poppler/trunk/debian/copyright	2011-12-09 11:07:28 UTC (rev 19572)
+++ packages/python-poppler/trunk/debian/copyright	2011-12-09 15:39:17 UTC (rev 19573)
@@ -31,4 +31,4 @@
 /usr/share/common-licenses/GPL-2
 
 The Debian packaging is © 2007, Andrea Gasparini <gaspa at yattaweb.it>
-and is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+and is licensed under the GPL-2, see `/usr/share/common-licenses/GPL-2'.

Added: packages/python-poppler/trunk/debian/patches/poppler-0.18.diff
===================================================================
--- packages/python-poppler/trunk/debian/patches/poppler-0.18.diff	                        (rev 0)
+++ packages/python-poppler/trunk/debian/patches/poppler-0.18.diff	2011-12-09 15:39:17 UTC (rev 19573)
@@ -0,0 +1,67 @@
+Description: Drop API which does not exist any more in poppler 0.18.
+Author: Martin Pitt <martin.pitt at ubuntu.com>
+Bug: https://launchpad.net/bugs/900707
+
+Index: python-poppler-0.12.1/poppler.defs
+===================================================================
+--- python-poppler-0.12.1.orig/poppler.defs	2011-12-06 12:54:05.000000000 +0100
++++ python-poppler-0.12.1/poppler.defs	2011-12-06 12:55:58.465615027 +0100
+@@ -1646,58 +1646,6 @@
+   (return-type "GType")
+ )
+ 
+-(define-method render_to_pixbuf
+-  (of-object "PopplerPage")
+-  (c-name "poppler_page_render_to_pixbuf")
+-  (return-type "none")
+-  (parameters
+-    '("int" "src_x")
+-    '("int" "src_y")
+-    '("int" "src_width")
+-    '("int" "src_height")
+-    '("double" "scale")
+-    '("int" "rotation")
+-    '("GdkPixbuf*" "pixbuf")
+-  )
+-)
+-
+-(define-method render_to_pixbuf_for_printing
+-  (of-object "PopplerPage")
+-  (c-name "poppler_page_render_to_pixbuf_for_printing")
+-  (return-type "none")
+-  (parameters
+-    '("int" "src_x")
+-    '("int" "src_y")
+-    '("int" "src_width")
+-    '("int" "src_height")
+-    '("double" "scale")
+-    '("int" "rotation")
+-    '("GdkPixbuf*" "pixbuf")
+-  )
+-)
+-
+-(define-method get_thumbnail_pixbuf
+-  (of-object "PopplerPage")
+-  (c-name "poppler_page_get_thumbnail_pixbuf")
+-  (return-type "GdkPixbuf*")
+-)
+-
+-(define-method render_selection_to_pixbuf
+-  (of-object "PopplerPage")
+-  (c-name "poppler_page_render_selection_to_pixbuf")
+-  (return-type "none")
+-  (parameters
+-    '("gdouble" "scale")
+-    '("int" "rotation")
+-    '("GdkPixbuf*" "pixbuf")
+-    '("PopplerRectangle*" "selection")
+-    '("PopplerRectangle*" "old_selection")
+-    '("PopplerSelectionStyle" "style")
+-    '("GdkColor*" "glyph_color")
+-    '("GdkColor*" "background_color")
+-  )
+-)
+-
+ (define-method render
+   (of-object "PopplerPage")
+   (c-name "poppler_page_render")

Modified: packages/python-poppler/trunk/debian/patches/series
===================================================================
--- packages/python-poppler/trunk/debian/patches/series	2011-12-09 11:07:28 UTC (rev 19572)
+++ packages/python-poppler/trunk/debian/patches/series	2011-12-09 15:39:17 UTC (rev 19573)
@@ -1 +1,2 @@
 poppler-0.15.diff
+poppler-0.18.diff