[Python-modules-commits] r21074 - in packages/python-poppler/trunk/debian (8 files)
gaspa-guest at users.alioth.debian.org
gaspa-guest at users.alioth.debian.org
Fri Apr 6 10:48:18 UTC 2012
Date: Friday, April 6, 2012 @ 10:48:13
Author: gaspa-guest
Revision: 21074
poppler 0.18 transition. Typo in poppler.defs.
Added:
packages/python-poppler/trunk/debian/patches/01-poppler-0.15.diff
packages/python-poppler/trunk/debian/patches/02-poppler-0.18.diff
packages/python-poppler/trunk/debian/patches/03-psfilenew.diff
Modified:
packages/python-poppler/trunk/debian/changelog
packages/python-poppler/trunk/debian/control
packages/python-poppler/trunk/debian/patches/series
Deleted:
packages/python-poppler/trunk/debian/patches/poppler-0.15.diff
packages/python-poppler/trunk/debian/patches/poppler-0.18.diff
Modified: packages/python-poppler/trunk/debian/changelog
===================================================================
--- packages/python-poppler/trunk/debian/changelog 2012-04-06 06:26:16 UTC (rev 21073)
+++ packages/python-poppler/trunk/debian/changelog 2012-04-06 10:48:13 UTC (rev 21074)
@@ -1,3 +1,14 @@
+python-poppler (0.12.1-7) unstable; urgency=low
+
+ * debian/control: bump standard version to 3.9.3
+ * debian/patches:
+ + added 03-psfilenew.diff that fix a typo (Closes: #662890). Thanks to
+ Jens Stimpfle.
+ + reenabled poppler-0.18.diff for poppler transition (Closes: #651388)
+ + renamed patches file prepending number of the patch order.
+
+ -- Andrea Gasparini <gaspa at yattaweb.it> Fri, 06 Apr 2012 12:05:36 +0200
+
python-poppler (0.12.1-6) unstable; urgency=low
* patches/series: reverted applied poppler-0.18.diff (Closes: #651388)
Modified: packages/python-poppler/trunk/debian/control
===================================================================
--- packages/python-poppler/trunk/debian/control 2012-04-06 06:26:16 UTC (rev 21073)
+++ packages/python-poppler/trunk/debian/control 2012-04-06 10:48:13 UTC (rev 21074)
@@ -7,7 +7,7 @@
python-gobject-dev (>= 2.10.1), python-cairo-dev (>= 1.8.4), libpoppler-glib-dev (>= 0.15),
libatk1.0-dev (>= 1.6.0),
libxcb-render-util0-dev (>= 0.2+git36-1~), python-support (>= 0.8)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
XS-Python-Version: >= 2.4
Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-poppler/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-poppler/trunk/
Added: packages/python-poppler/trunk/debian/patches/01-poppler-0.15.diff
===================================================================
--- packages/python-poppler/trunk/debian/patches/01-poppler-0.15.diff (rev 0)
+++ packages/python-poppler/trunk/debian/patches/01-poppler-0.15.diff 2012-04-06 10:48:13 UTC (rev 21074)
@@ -0,0 +1,79 @@
+Description: Follow API changes in Poppler 0.15.
+ The undermentioned API changes were made (following similar changes in Poppler API):
+ - PopplerPage.get_text(style, rect)
+ + PopplerPage.get_text()
+ + PopplerPage.get_selected_text(style, selection)
+Author: Tom Callaway <tcallawa at redhat.com>
+Origin: vendor, http://pkgs.fedoraproject.org/gitweb/?p=pypoppler.git;a=blob;f=pypoppler-0.12.1-poppler0.15.0-changes.patch;h=628b37951a2c1ae68101e00da424ee8651e4dc2f;hb=a418189ad25d27c6d4dff025c5e323a768c81ae7
+Bug: https://bugs.launchpad.net/poppler-python/+bug/696025
+Bug-Debian: http://bugs.debian.org/628047
+Forwarded: yes
+Last-Update: 2011-07-02
+
+diff -up pypoppler-0.12.1/poppler.defs.poppler15 pypoppler-0.12.1/poppler.defs
+--- pypoppler-0.12.1/poppler.defs.poppler15 2010-10-06 16:02:47.023101009 -0400
++++ pypoppler-0.12.1/poppler.defs 2010-10-06 16:10:32.749101000 -0400
+@@ -1760,6 +1760,12 @@
+ (return-type "int")
+ )
+
++(define-method get_label
++ (of-object "PopplerPage")
++ (c-name "poppler_page_get_label")
++ (return-type "gchar*")
++)
++
+ (define-method get_duration
+ (of-object "PopplerPage")
+ (c-name "poppler_page_get_duration")
+@@ -1805,9 +1811,15 @@
+ (of-object "PopplerPage")
+ (c-name "poppler_page_get_text")
+ (return-type "char*")
++)
++
++(define-method get_selected_text
++ (of-object "PopplerPage")
++ (c-name "poppler_page_get_selected_text")
++ (return-type "char*")
+ (parameters
+ '("PopplerSelectionStyle" "style")
+- '("PopplerRectangle*" "rect")
++ '("PopplerRectangle*" "selection")
+ )
+ )
+
+@@ -1895,6 +1907,16 @@
+ )
+ )
+
++(define-function poppler_page_add_annot
++ (of-object "PopplerPage")
++ (c-name "poppler_page_add_annot")
++ (return-type "none")
++ (parameters
++ '("PopplerAnnot*" "annot")
++ '("GList*" "list")
++ )
++)
++
+ (define-method get_crop_box
+ (of-object "PopplerPage")
+ (c-name "poppler_page_get_crop_box")
+@@ -1904,6 +1926,16 @@
+ )
+ )
+
++(define-method get_text_layout
++ (of-object "PopplerPage")
++ (c-name "poppler_page_get_text_layout")
++ (return-type "gboolean")
++ (parameters
++ '("PopplerRectangle**" "rectangles")
++ '("guint*" "n_rectangles")
++ )
++)
++
+ (define-function poppler_rectangle_get_type
+ (c-name "poppler_rectangle_get_type")
+ (return-type "GType")
Added: packages/python-poppler/trunk/debian/patches/02-poppler-0.18.diff
===================================================================
--- packages/python-poppler/trunk/debian/patches/02-poppler-0.18.diff (rev 0)
+++ packages/python-poppler/trunk/debian/patches/02-poppler-0.18.diff 2012-04-06 10:48:13 UTC (rev 21074)
@@ -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")
Added: packages/python-poppler/trunk/debian/patches/03-psfilenew.diff
===================================================================
--- packages/python-poppler/trunk/debian/patches/03-psfilenew.diff (rev 0)
+++ packages/python-poppler/trunk/debian/patches/03-psfilenew.diff 2012-04-06 10:48:13 UTC (rev 21074)
@@ -0,0 +1,11 @@
+--- python-poppler-0.12.1.orig/poppler.defs 2012-04-04 23:06:47.000000000 +0200
++++ python-poppler-0.12.1/poppler.defs 2012-04-04 23:13:31.000000000 +0200
+@@ -1212,7 +1212,7 @@
+
+ (define-function poppler_ps_file_new
+ (c-name "poppler_ps_file_new")
+- (is-constructor-of "PopplerPsFile")
++ (is-constructor-of "PopplerPSFile")
+ (return-type "PopplerPSFile*")
+ (parameters
+ '("PopplerDocument*" "document")
Deleted: packages/python-poppler/trunk/debian/patches/poppler-0.15.diff
===================================================================
--- packages/python-poppler/trunk/debian/patches/poppler-0.15.diff 2012-04-06 06:26:16 UTC (rev 21073)
+++ packages/python-poppler/trunk/debian/patches/poppler-0.15.diff 2012-04-06 10:48:13 UTC (rev 21074)
@@ -1,79 +0,0 @@
-Description: Follow API changes in Poppler 0.15.
- The undermentioned API changes were made (following similar changes in Poppler API):
- - PopplerPage.get_text(style, rect)
- + PopplerPage.get_text()
- + PopplerPage.get_selected_text(style, selection)
-Author: Tom Callaway <tcallawa at redhat.com>
-Origin: vendor, http://pkgs.fedoraproject.org/gitweb/?p=pypoppler.git;a=blob;f=pypoppler-0.12.1-poppler0.15.0-changes.patch;h=628b37951a2c1ae68101e00da424ee8651e4dc2f;hb=a418189ad25d27c6d4dff025c5e323a768c81ae7
-Bug: https://bugs.launchpad.net/poppler-python/+bug/696025
-Bug-Debian: http://bugs.debian.org/628047
-Forwarded: yes
-Last-Update: 2011-07-02
-
-diff -up pypoppler-0.12.1/poppler.defs.poppler15 pypoppler-0.12.1/poppler.defs
---- pypoppler-0.12.1/poppler.defs.poppler15 2010-10-06 16:02:47.023101009 -0400
-+++ pypoppler-0.12.1/poppler.defs 2010-10-06 16:10:32.749101000 -0400
-@@ -1760,6 +1760,12 @@
- (return-type "int")
- )
-
-+(define-method get_label
-+ (of-object "PopplerPage")
-+ (c-name "poppler_page_get_label")
-+ (return-type "gchar*")
-+)
-+
- (define-method get_duration
- (of-object "PopplerPage")
- (c-name "poppler_page_get_duration")
-@@ -1805,9 +1811,15 @@
- (of-object "PopplerPage")
- (c-name "poppler_page_get_text")
- (return-type "char*")
-+)
-+
-+(define-method get_selected_text
-+ (of-object "PopplerPage")
-+ (c-name "poppler_page_get_selected_text")
-+ (return-type "char*")
- (parameters
- '("PopplerSelectionStyle" "style")
-- '("PopplerRectangle*" "rect")
-+ '("PopplerRectangle*" "selection")
- )
- )
-
-@@ -1895,6 +1907,16 @@
- )
- )
-
-+(define-function poppler_page_add_annot
-+ (of-object "PopplerPage")
-+ (c-name "poppler_page_add_annot")
-+ (return-type "none")
-+ (parameters
-+ '("PopplerAnnot*" "annot")
-+ '("GList*" "list")
-+ )
-+)
-+
- (define-method get_crop_box
- (of-object "PopplerPage")
- (c-name "poppler_page_get_crop_box")
-@@ -1904,6 +1926,16 @@
- )
- )
-
-+(define-method get_text_layout
-+ (of-object "PopplerPage")
-+ (c-name "poppler_page_get_text_layout")
-+ (return-type "gboolean")
-+ (parameters
-+ '("PopplerRectangle**" "rectangles")
-+ '("guint*" "n_rectangles")
-+ )
-+)
-+
- (define-function poppler_rectangle_get_type
- (c-name "poppler_rectangle_get_type")
- (return-type "GType")
Deleted: packages/python-poppler/trunk/debian/patches/poppler-0.18.diff
===================================================================
--- packages/python-poppler/trunk/debian/patches/poppler-0.18.diff 2012-04-06 06:26:16 UTC (rev 21073)
+++ packages/python-poppler/trunk/debian/patches/poppler-0.18.diff 2012-04-06 10:48:13 UTC (rev 21074)
@@ -1,67 +0,0 @@
-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 2012-04-06 06:26:16 UTC (rev 21073)
+++ packages/python-poppler/trunk/debian/patches/series 2012-04-06 10:48:13 UTC (rev 21074)
@@ -1 +1,3 @@
-poppler-0.15.diff
+01-poppler-0.15.diff
+02-poppler-0.18.diff
+03-psfilenew.diff
More information about the Python-modules-commits
mailing list