Package: python-poppler Version: 0.12.1-4 Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu ubuntu-patch precise
Hello, In http://bugs.debian.org/644447 there is some discussion about updating poppler to 0.18 in Debian. This will cause some FTBFS. We are doing the transition in Ubuntu now and want to forward patches so that they are readily available in Debian once 0.18 lands there. Debdiff attached. I also sent the patch to upstream at https://launchpad.net/bugs/900707. Thanks, Martin -- Martin Pitt | http://www.piware.de Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org)
diff -Nru python-poppler-0.12.1/debian/changelog python-poppler-0.12.1/debian/changelog --- python-poppler-0.12.1/debian/changelog 2011-12-06 12:24:04.000000000 +0100 +++ python-poppler-0.12.1/debian/changelog 2011-12-06 13:00:30.000000000 +0100 @@ -1,3 +1,10 @@ +python-poppler (0.12.1-4+ubuntu1) precise; urgency=low + + * Add poppler-0.18.diff: Drop API which does not exist any more in poppler + 0.18. (LP: #900707) + + -- Martin Pitt <martin.p...@ubuntu.com> Tue, 06 Dec 2011 12:59:20 +0100 + python-poppler (0.12.1-4+build1) precise; urgency=low * No-change rebuild against libpoppler-glib8. diff -Nru python-poppler-0.12.1/debian/patches/poppler-0.18.diff python-poppler-0.12.1/debian/patches/poppler-0.18.diff --- python-poppler-0.12.1/debian/patches/poppler-0.18.diff 1970-01-01 01:00:00.000000000 +0100 +++ python-poppler-0.12.1/debian/patches/poppler-0.18.diff 2011-12-06 12:59:13.000000000 +0100 @@ -0,0 +1,67 @@ +Description: Drop API which does not exist any more in poppler 0.18. +Author: Martin Pitt <martin.p...@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") diff -Nru python-poppler-0.12.1/debian/patches/series python-poppler-0.12.1/debian/patches/series --- python-poppler-0.12.1/debian/patches/series 2011-07-02 14:07:28.000000000 +0200 +++ python-poppler-0.12.1/debian/patches/series 2011-12-06 12:55:06.000000000 +0100 @@ -1 +1,2 @@ poppler-0.15.diff +poppler-0.18.diff
signature.asc
Description: Digital signature
