diff -Nru gnome-commander-1.2.8.15/debian/changelog gnome-commander-1.2.8.15/debian/changelog --- gnome-commander-1.2.8.15/debian/changelog 2012-05-13 23:38:13.000000000 +0100 +++ gnome-commander-1.2.8.15/debian/changelog 2012-06-13 16:26:14.000000000 +0100 @@ -1,3 +1,9 @@ +gnome-commander (1.2.8.15-3ubuntu1) quantal; urgency=low + + * Track changes to libpoppler25 API. + + -- Andy Whitcroft Wed, 13 Jun 2012 16:24:27 +0100 + gnome-commander (1.2.8.15-3) unstable; urgency=low [ Alessio Treglia ] diff -Nru gnome-commander-1.2.8.15/debian/control gnome-commander-1.2.8.15/debian/control --- gnome-commander-1.2.8.15/debian/control 2012-05-13 23:37:09.000000000 +0100 +++ gnome-commander-1.2.8.15/debian/control 2012-06-13 16:02:39.000000000 +0100 @@ -1,7 +1,8 @@ Source: gnome-commander Section: gnome Priority: optional -Maintainer: Michael Vogt +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Michael Vogt Uploaders: Alessio Treglia Build-Depends: autotools-dev (>= 20100122.1~), diff -Nru gnome-commander-1.2.8.15/debian/patches/series gnome-commander-1.2.8.15/debian/patches/series --- gnome-commander-1.2.8.15/debian/patches/series 2012-05-13 23:26:36.000000000 +0100 +++ gnome-commander-1.2.8.15/debian/patches/series 2012-06-13 16:01:51.000000000 +0100 @@ -3,3 +3,4 @@ 0002-strrchr_instead_of_g_strrstr.patch 0003-g_ascii_strcasecmp_instead_of_g_strcasecmp.patch werror-format-security.diff +track_libpoppler25_abi_changes diff -Nru gnome-commander-1.2.8.15/debian/patches/track_libpoppler25_abi_changes gnome-commander-1.2.8.15/debian/patches/track_libpoppler25_abi_changes --- gnome-commander-1.2.8.15/debian/patches/track_libpoppler25_abi_changes 1970-01-01 01:00:00.000000000 +0100 +++ gnome-commander-1.2.8.15/debian/patches/track_libpoppler25_abi_changes 2012-06-13 16:01:51.000000000 +0100 @@ -0,0 +1,28 @@ +Description: track libpoppler25 API changes + Track changes to the libpoppler25 API. + . + setErrorFunction -> setErrorCallback -- interface replaced +Author: Andy Whitcroft +Last-Update: 2012-06-13 +Index: gnome-commander-1.2.8.15/src/tags/gnome-cmd-tags-poppler.cc +=================================================================== +--- gnome-commander-1.2.8.15.orig/src/tags/gnome-cmd-tags-poppler.cc 2011-12-06 19:10:29.000000000 +0000 ++++ gnome-commander-1.2.8.15/src/tags/gnome-cmd-tags-poppler.cc 2012-06-13 15:43:29.648428595 +0100 +@@ -41,7 +41,7 @@ + static regex_t rxDate; + static gboolean rxDate_OK; + +-static void noErrorReporting(int pos, char *msg, va_list args) ++static void noErrorReporting(void *data, ErrorCategory category, int pos, char *msg) + { + } + #endif +@@ -52,7 +52,7 @@ + #ifdef HAVE_PDF + rxDate_OK = regcomp (&rxDate, "^(D:)?([12][019][0-9][0-9]([01][0-9]([0-3][0-9]([012][0-9]([0-5][0-9]([0-5][0-9])?)?)?)?)?)", REG_EXTENDED)==0; + +- setErrorFunction(noErrorReporting); ++ setErrorCallback(noErrorReporting, NULL); + #endif + } +