Hi,

I've just prepared an NMU and uploaded 0.19.3-2.1 to DELAYED/7.
The debdiff is attached.

If you want to have the NMU cancelled as you plan to upload a fix yourself,
please let me know.

Cheers,
Michael

-- 
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?
diff -Nru ruby-gnome2-0.19.3/debian/changelog ruby-gnome2-0.19.3/debian/changelog
--- ruby-gnome2-0.19.3/debian/changelog	2010-04-15 22:11:47.000000000 +0200
+++ ruby-gnome2-0.19.3/debian/changelog	2011-06-01 12:55:46.000000000 +0200
@@ -1,3 +1,12 @@
+ruby-gnome2 (0.19.3-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/patches/poppler-0.15.patch
+    - Add support for poppler >= 0.15. Patch cherry-picked from upstream SVN
+      trunk. (Closes: #618960)
+
+ -- Michael Biebl <[email protected]>  Wed, 01 Jun 2011 12:54:40 +0200
+
 ruby-gnome2 (0.19.3-2) unstable; urgency=low
 
   * Add libjpeg62-dev build-dep (Closes: #577912)
diff -Nru ruby-gnome2-0.19.3/debian/patches/poppler-0.15.patch ruby-gnome2-0.19.3/debian/patches/poppler-0.15.patch
--- ruby-gnome2-0.19.3/debian/patches/poppler-0.15.patch	1970-01-01 01:00:00.000000000 +0100
+++ ruby-gnome2-0.19.3/debian/patches/poppler-0.15.patch	2011-06-01 12:54:18.000000000 +0200
@@ -0,0 +1,34 @@
+Index: ruby-gnome2/poppler/src/rbpoppler-page.c
+===================================================================
+--- ruby-gnome2/poppler/src/rbpoppler-page.c	(Revision 3941)
++++ ruby-gnome2/poppler/src/rbpoppler-page.c	(Revision 3942)
+@@ -332,6 +332,9 @@
+     }
+ 
+     if (NIL_P(rb_rect)) {
++#if POPPLER_CHECK_VERSION(0, 15, 0)
++        text = poppler_page_get_text(page);
++#else
+         PopplerRectangle rect;
+         double width, height;
+ 
+@@ -343,10 +346,16 @@
+         text = poppler_page_get_text(page,
+                                      style,
+                                      &rect);
++#endif
+     } else {
+-        text = poppler_page_get_text(page,
+-                                     style,
+-                                     RVAL2POPPLER_RECT(rb_rect));
++        PopplerRectangle *rect;
++
++	rect = RVAL2POPPLER_RECT(rb_rect);
++#if POPPLER_CHECK_VERSION(0, 15, 0)
++        text = poppler_page_get_selected_text(page, style, rect);
++#else
++        text = poppler_page_get_text(page, style, rect);
++#endif
+     }
+ 
+     rb_text = CSTR2RVAL(text);
diff -Nru ruby-gnome2-0.19.3/debian/patches/series ruby-gnome2-0.19.3/debian/patches/series
--- ruby-gnome2-0.19.3/debian/patches/series	2009-10-14 21:54:40.000000000 +0200
+++ ruby-gnome2-0.19.3/debian/patches/series	2011-06-01 12:54:24.000000000 +0200
@@ -5,3 +5,4 @@
 gtkmozembed-rpath.patch
 greversionrange.patch
 buildsys-abort-on-error.patch
+poppler-0.15.patch

Attachment: signature.asc
Description: OpenPGP digital signature

_______________________________________________
Pkg-ruby-extras-maintainers mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ruby-extras-maintainers

Reply via email to