diff -Nru epdfview-0.1.7/debian/changelog epdfview-0.1.7/debian/changelog --- epdfview-0.1.7/debian/changelog 2011-02-06 15:39:48.000000000 +0000 +++ epdfview-0.1.7/debian/changelog 2011-02-18 03:28:48.000000000 +0000 @@ -1,3 +1,12 @@ +epdfview (0.1.7-5ubuntu1) natty; urgency=low + + * Merge from debian unstable. Remaining changes: + - ubuntu_poppler-0.15.patch: Patch taken upstream. This fixes a FTBFS with poppler 0.16 because of API changes. + - debian/rules: added '--with autoreconf' to generate configure script after patching + - debian/control: added b-d on dh-autoreconf + + -- Tarun Kumar Mall Fri, 18 Feb 2011 02:59:14 +0000 + epdfview (0.1.7-5) unstable; urgency=low * debian/source/local-options: @@ -10,6 +19,16 @@ -- Yves-Alexis Perez Sun, 06 Feb 2011 16:39:45 +0100 +epdfview (0.1.7-4ubuntu1) natty; urgency=low + + * ubuntu_poppler-0.15.patch: Patch taken upstream. This fixes a FTBFS with + poppler 0.16 because of API changes. + * debian/rules: added '--with autoreconf' to regenerate configure script after + patching + * debian/control: added b-d on dh-autoreconf + + -- Fabrice Coutadeur Fri, 11 Feb 2011 22:38:22 +0100 + epdfview (0.1.7-4) unstable; urgency=low * debian/patches: @@ -141,3 +160,4 @@ * Initial release. closes: #375410 -- Yves-Alexis Perez Fri, 28 Dec 2007 11:33:21 +0100 + diff -Nru epdfview-0.1.7/debian/control epdfview-0.1.7/debian/control --- epdfview-0.1.7/debian/control 2010-10-20 05:58:39.000000000 +0000 +++ epdfview-0.1.7/debian/control 2011-02-18 03:28:48.000000000 +0000 @@ -1,9 +1,10 @@ Source: epdfview Section: x11 Priority: optional -Maintainer: Yves-Alexis Perez +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Yves-Alexis Perez Build-Depends: debhelper (>= 7.0.0), libgtk2.0-dev, - libpoppler-glib-dev (>= 0.5), libcups2-dev, hardening-includes + libpoppler-glib-dev (>= 0.5), libcups2-dev, dh-autoreconf, hardening-includes Standards-Version: 3.9.1 Homepage: http://trac.emma-soft.com/epdfview/ diff -Nru epdfview-0.1.7/debian/patches/series epdfview-0.1.7/debian/patches/series --- epdfview-0.1.7/debian/patches/series 2010-08-01 11:50:23.000000000 +0000 +++ epdfview-0.1.7/debian/patches/series 2011-02-18 03:28:48.000000000 +0000 @@ -3,3 +3,4 @@ 03_nonexisting-file.patch 04_fix-slash-search.patch 05_fix-gtk-assertions.patch +ubuntu_poppler-0.15.patch diff -Nru epdfview-0.1.7/debian/patches/ubuntu_poppler-0.15.patch epdfview-0.1.7/debian/patches/ubuntu_poppler-0.15.patch --- epdfview-0.1.7/debian/patches/ubuntu_poppler-0.15.patch 1970-01-01 00:00:00.000000000 +0000 +++ epdfview-0.1.7/debian/patches/ubuntu_poppler-0.15.patch 2011-02-18 03:28:48.000000000 +0000 @@ -0,0 +1,74 @@ +Description: Fix FTBFS because of API changes in poppler 0.15 and upper. This + includes the creation of an empty ChangeLog file to fix an error when creating + Makefile.in files +Origin: upstream, http://trac.emma-soft.com/epdfview/changeset?new=354%40trunk&old=353%40trunk + +Index: epdfview-0.1.7/configure.ac +=================================================================== +--- epdfview-0.1.7.orig/configure.ac 2011-02-12 08:01:48.196799996 +0100 ++++ epdfview-0.1.7/configure.ac 2011-02-12 08:02:00.266800007 +0100 +@@ -40,18 +40,22 @@ + AC_SUBST([POPPLER_CFLAGS]) + AC_SUBST([POPPLER_LIBS]) + dnl Check if we have poppler version 0.5.2 or higher. +-PKG_CHECK_EXISTS([poppler-glib >= 0.5.2], [have_poppler_052=yes]) +-if test "x$have_poppler_052" = "xyes"; then ++PKG_CHECK_EXISTS([poppler-glib >= 0.5.2], [have_poppler_0_5_2=yes]) ++if test "x$have_poppler_0_5_2" = "xyes"; then + AC_DEFINE([HAVE_POPPLER_0_5_2], [1], [Define to 1 if you have Poppler version 0.5.2 or higher.]) + fi +-PKG_CHECK_EXISTS([poppler-glib >= 0.6], [have_poppler_060=yes]) +-if test "x$have_poppler_060" = "xyes"; then ++PKG_CHECK_EXISTS([poppler-glib >= 0.6], [have_poppler_0_6_0=yes]) ++if test "x$have_poppler_0_6_0" = "xyes"; then + AC_DEFINE([HAVE_POPPLER_0_6_0], [1], [Define to 1 if you have Poppler version 0.6.0 or higher.]) + fi +-PKG_CHECK_EXISTS([poppler-glib >= 0.8], [have_poppler_080=yes]) +-if test "x$have_poppler_080" = "xyes"; then ++PKG_CHECK_EXISTS([poppler-glib >= 0.8], [have_poppler_0_8_0=yes]) ++if test "x$have_poppler_0_8_0" = "xyes"; then + AC_DEFINE([HAVE_POPPLER_0_8_0], [1], [Define to 1 if you have Poppler version 0.8.0 or higher.]) + fi ++PKG_CHECK_EXISTS([poppler-glib >= 0.15], [have_poppler_0_15_0=yes]) ++if test "x$have_poppler_0_15_0" = "xyes"; then ++ AC_DEFINE([HAVE_POPPLER_0_15_0], [1], [Define to 1 if you have Poppler version 0.15.0 or higher.]) ++fi + + EPDFVIEW_PATH_CUPS([CUPS], [have_cups=yes]) + AM_CONDITIONAL(cups_printing, test "x$have_cups" = "xyes") +Index: epdfview-0.1.7/src/PDFDocument.cxx +=================================================================== +--- epdfview-0.1.7.orig/src/PDFDocument.cxx 2011-02-12 08:01:48.186799989 +0100 ++++ epdfview-0.1.7/src/PDFDocument.cxx 2011-02-12 08:02:00.266800007 +0100 +@@ -653,14 +653,24 @@ + gdouble pageWidth, pageHeight; + poppler_page_get_size(page, &pageWidth, &pageHeight); + ++#if defined (HAVE_POPPLER_0_15_0) ++ PopplerRectangle textRect = { rect->getX1() / getZoom(), ++ rect->getY1() / getZoom(), ++ rect->getX2() / getZoom(), ++ rect->getY2() / getZoom()}; ++#else // !HAVE_POPPLER_0_15_0 + //for get text we must exchange y coordinate, don't ask me where logic here. + PopplerRectangle textRect = { rect->getX1() / getZoom(), + (pageHeight - rect->getY2() / getZoom()), + rect->getX2() * getZoom() / getZoom(), + (pageHeight - rect->getY1() / getZoom())}; ++#endif // HAVE_POPPLER_0_15_0 + repairEmpty(textRect); + +-#if defined (HAVE_POPPLER_0_6_0) ++#if defined (HAVE_POPPLER_0_15_0) ++ gchar *text = poppler_page_get_selected_text(page, POPPLER_SELECTION_GLYPH, ++ &textRect); ++#elif defined (HAVE_POPPLER_0_6_0) + gchar *text = poppler_page_get_text(page, POPPLER_SELECTION_GLYPH, + &textRect); + #else // !HAVE_POPPLER_0_6_0 +Index: epdfview-0.1.7/ChangeLog +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ epdfview-0.1.7/ChangeLog 2011-02-12 08:02:35.436800003 +0100 +@@ -0,0 +1 @@ ++ diff -Nru epdfview-0.1.7/debian/rules epdfview-0.1.7/debian/rules --- epdfview-0.1.7/debian/rules 2010-10-20 16:46:22.000000000 +0000 +++ epdfview-0.1.7/debian/rules 2011-02-18 03:28:48.000000000 +0000 @@ -9,4 +9,4 @@ LDFLAGS+=-Wl,-z,defs -Wl,--as-needed -Wl,-O1 %: - dh $@ + dh --with autoreconf $@