--- Begin Message ---
Package: gambas2
Version: 2.23.1-1
Tags: patch
User: [email protected]
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.
Martin
--
Martin Pitt | http://www.piware.de
Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org)
diff -Nru gambas2-2.23.1/debian/changelog gambas2-2.23.1/debian/changelog
--- gambas2-2.23.1/debian/changelog 2011-11-24 08:31:18.000000000 +0100
+++ gambas2-2.23.1/debian/changelog 2011-12-06 11:14:44.000000000 +0100
@@ -1,3 +1,10 @@
+gambas2 (2.23.1-1ubuntu3) precise; urgency=low
+
+ * Add debian/patches/poppler-0.18.patch: Port to poppler-0.18 API.
+ * debian/control: Bump libpoppler-dev build dependency.
+
+ -- Martin Pitt <[email protected]> Tue, 06 Dec 2011 10:55:24 +0100
+
gambas2 (2.23.1-1ubuntu2) precise; urgency=low
* Rebuild for libmysqlclient transition
diff -Nru gambas2-2.23.1/debian/control gambas2-2.23.1/debian/control
--- gambas2-2.23.1/debian/control 2011-10-28 12:36:40.000000000 +0200
+++ gambas2-2.23.1/debian/control 2011-12-06 11:14:35.000000000 +0100
@@ -4,7 +4,7 @@
Homepage: http://gambas.sourceforge.net
Maintainer: Ubuntu Developers <[email protected]>
XSBC-Original-Maintainer: José L. Redrejo RodrÃguez <[email protected]>
-Build-Depends: debhelper (>= 5.0.42), libpq-dev, libmysqlclient-dev,
libbz2-dev, libqt3-mt-dev, libcurl4-gnutls-dev, libsdl-mixer1.2-dev,
libsqlite0-dev, libxml2-dev, libxslt1-dev, zlib1g-dev, unixodbc-dev,
libsqlite3-dev, libgtk2.0-dev, libxt-dev, pkg-config, mesa-common-dev,
libsdl-sound1.2-dev, libsdl-image1.2-dev, libsdl-gfx1.2-dev, libsdl-ttf2.0-dev,
libpcre3-dev, libsdl1.2-dev, libjpeg-dev, libpng12-dev, libpoppler-dev (>=
0.5), firebird2.1-dev, librsvg2-dev, bzip2, gettext, libxtst-dev, libffi-dev,
quilt
+Build-Depends: debhelper (>= 5.0.42), libpq-dev, libmysqlclient-dev,
libbz2-dev, libqt3-mt-dev, libcurl4-gnutls-dev, libsdl-mixer1.2-dev,
libsqlite0-dev, libxml2-dev, libxslt1-dev, zlib1g-dev, unixodbc-dev,
libsqlite3-dev, libgtk2.0-dev, libxt-dev, pkg-config, mesa-common-dev,
libsdl-sound1.2-dev, libsdl-image1.2-dev, libsdl-gfx1.2-dev, libsdl-ttf2.0-dev,
libpcre3-dev, libsdl1.2-dev, libjpeg-dev, libpng12-dev, libpoppler-dev (>=
0.18), firebird2.1-dev, librsvg2-dev, bzip2, gettext, libxtst-dev, libffi-dev,
quilt
Standards-Version: 3.9.2
Package: gambas2
diff -Nru gambas2-2.23.1/debian/patches/poppler-0.18.patch
gambas2-2.23.1/debian/patches/poppler-0.18.patch
--- gambas2-2.23.1/debian/patches/poppler-0.18.patch 1970-01-01
01:00:00.000000000 +0100
+++ gambas2-2.23.1/debian/patches/poppler-0.18.patch 2011-12-06
11:13:52.000000000 +0100
@@ -0,0 +1,16 @@
+Description: Port to poppler-0.18 API.
+Author: Martin Pitt <[email protected]>
+
+Index: gambas2-2.23.1/gb.pdf/src/CPdfDocument.cpp
+===================================================================
+--- gambas2-2.23.1.orig/gb.pdf/src/CPdfDocument.cpp 2011-05-27
02:01:38.000000000 +0200
++++ gambas2-2.23.1/gb.pdf/src/CPdfDocument.cpp 2011-12-06 11:13:17.745316865
+0100
+@@ -961,7 +961,7 @@
+ {
+ Object obj;
+
+- THIS->links = new Links (THIS->page->getAnnots
(&obj),THIS->doc->getCatalog()->getBaseURI ());
++ THIS->links = new Links (THIS->page->getAnnots
(THIS->doc->getCatalog()));
+ obj.free();
+ }
+
diff -Nru gambas2-2.23.1/debian/patches/series
gambas2-2.23.1/debian/patches/series
--- gambas2-2.23.1/debian/patches/series 2011-05-28 16:57:18.000000000
+0200
+++ gambas2-2.23.1/debian/patches/series 2011-12-06 11:12:46.000000000
+0100
@@ -3,3 +3,4 @@
detect_browser_debian.patch
fixFTBS_kfreeBSD
remove_harcoded_kde.patch
+poppler-0.18.patch
signature.asc
Description: Digital signature
--- End Message ---