diff -ruN poppler-0.24.3/debian/changelog poppler-0.24.4/debian/changelog --- poppler-0.24.3/debian/changelog 2013-11-05 16:49:57.000000000 +0400 +++ poppler-0.24.4/debian/changelog 2013-12-02 20:03:09.837267006 +0400 @@ -1,3 +1,22 @@ +poppler (0.24.4-0ubuntu1) trusty; urgency=low + + * Merge with Debian experimental (LP: #1256627), remaining changes: + - Drop libopenjpeg-dev build depends, it's in universe. + - Lower poppler-data to Suggests, it is too big for CD images, + handled by language-selector. + - Have libpoppler-dev Depend on libpoppler-private-dev, to help with + the transition after the split of the two packages. + - Build Qt 5 packages. + - Add simple compile/link/run autopkgtest. + - Differences in symbols file. + * New upstream bugfix release. + * Update soname version to 44. + * Add libpoppler-glib-doc Breaks/Replaces on libpoppler-glib-dev + (<= 0.24.4). + * Update debian/copyright (taken from unreleased Debian Git). + + -- Dmitry Shachnev Sun, 01 Dec 2013 14:13:23 +0400 + poppler (0.24.3-0ubuntu1) trusty; urgency=low * New upstream version @@ -19,6 +38,46 @@ -- Sebastien Bacher Tue, 30 Jul 2013 14:23:19 +0200 +poppler (0.22.5-2) experimental; urgency=low + + * Merge changes from 0.18.4-7 and 0.18.4-8: + - CVE-2012-2142.diff: drop, fixed upstream + - upstream_pdfseparate.1-Syntax-fixes.patch: drop, backported + + -- Pino Toscano Wed, 21 Aug 2013 14:25:35 +0200 + +poppler (0.22.5-1) experimental; urgency=low + + * New upstream release: + - fixes case sensitive search in poppler-glib. (Closes: #299657) + - poppler passes correct UTF-8 strings to cairo. (Closes: #697766) + * Rename packages according to the new SONAMEs: + - libpoppler28 -> libpoppler37 + * debian/patches: + - qt4-visibility.diff: refresh + - upstream_fix-GooString-insert.diff: drop, applied upstream + - upstream_Fix-another-invalid-memory-access-in-1091.pdf.asan.7.patch: drop, + backported + - upstream_Fix-invalid-memory-access-in-2030.pdf.asan.69.463.patch: drop, + backported + - upstream_Fix-invalid-memory-access-in-1150.pdf.asan.8.69.patch: drop, + backported + - upstream_Initialize-refLine-totally.patch: drop, backported + - upstream_cairo-support-parameterized-Gouraud-shading.patch: drop, + applied upstream + * Update copyright. + * Update symbols files. + * Update configure arguments: + - Add: --enable-libpng, --enable-libtiff, --enable-cms=lcms2 + (no actual changes, just enforce their usage) + * Update recommends and suggests: + - libpoppler-private-dev: drop the libpng-dev, libtiff-dev suggests. + - poppler-utils: drop the ghostscript recommend. + * Split the API documentation from libpoppler-glib-dev to an own + libpoppler-glib-doc. + + -- Pino Toscano Wed, 07 Aug 2013 13:21:35 +0200 + poppler (0.22.4-0ubuntu1) saucy; urgency=low * New upstream release 0.22.4 (LP: #1135995). @@ -31,6 +90,31 @@ -- Dmitry Shachnev Fri, 17 May 2013 17:07:14 +0400 +poppler (0.20.5-3) experimental; urgency=low + + * Merge changes from 0.18.4-6: + - upstream_Fix-another-invalid-memory-access-in-1091.pdf.asan.7.patch: + update from upstream repository + - upstream_Fix-invalid-memory-access-in-2030.pdf.asan.69.463.patch: + update from upstream repository + - upstream_Fix-invalid-memory-access-in-1150.pdf.asan.8.69.patch: + update from upstream repository + - upstream_Initialize-refLine-totally.patch: + update from upstream repository + + -- Pino Toscano Tue, 26 Mar 2013 00:52:48 +0100 + +poppler (0.20.5-2) experimental; urgency=low + + * Merge changes from 0.18.4-4 and 0.18.4-5: + - psoutputdev-initialize-vars.diff: drop, obsolete + * Backport upstream commit ae8fc0cbfc6123189e17b3cf1286e0540f181646 to + support parameterized Gouraud shading in CairoOutputDev; patch + upstream_cairo-support-parameterized-Gouraud-shading.patch. + (Closes: #699467) + + -- Pino Toscano Thu, 31 Jan 2013 19:41:24 +0100 + poppler (0.20.5-1ubuntu3) raring; urgency=low * SECURITY UPDATE: invalid memory access issues @@ -273,6 +357,60 @@ -- Robert Ancell Thu, 07 Jun 2012 17:13:58 +1200 +poppler (0.18.4-8) unstable; urgency=low + + * Remove the .la files from debian/tmp, to shorten the --list-missing output. + * Workaround issues of old libtool on Hurd, by removing with chrpath the + extra RPATH added; add the hurd-only chrpath build dependency for that. + * Backport upstream commit 8e504bf2543621973fdaddbd29055ce435540146 to fix + small syntax issues in pdfseparate.1. + + -- Pino Toscano Tue, 20 Aug 2013 19:12:31 +0200 + +poppler (0.18.4-7) unstable; urgency=low + + * Filter stuff that might end up in the shell; patch CVE-2012-2142.diff + by Marek Kasik to fix CVE-2012-2142. + * Fix Vcs-* headers. + * Bump Standards-Version to 3.9.4, no changes required. + * Adjust watch file to allow both gz and xz extensions. + * Mark poppler-dbg as Multi-Arch: same. + + -- Pino Toscano Fri, 09 Aug 2013 12:50:40 +0200 + +poppler (0.18.4-6) unstable; urgency=low + + * Backport upstream commits 0388837f01bc467045164f9ddaff787000a8caaa (patch + upstream_Fix-another-invalid-memory-access-in-1091.pdf.asan.7.patch), + 8b6dc55e530b2f5ede6b9dfb64aafdd1d5836492 (adapted patch + upstream_Fix-invalid-memory-access-in-1150.pdf.asan.8.69.patch), and + e14b6e9c13d35c9bd1e0c50906ace8e707816888 (adapted patch + upstream_Fix-invalid-memory-access-in-2030.pdf.asan.69.463.patch) to fix + CVE-2013-1788. + * Backport upstream commit b1026b5978c385328f2a15a2185c599a563edf91 to fix + CVE-2013-1790 (patch upstream_Initialize-refLine-totally.patch). + * With the changes above, this upload closes: #702071. + + -- Pino Toscano Mon, 25 Mar 2013 21:43:07 +0100 + +poppler (0.18.4-5) unstable; urgency=low + + * Correctly initialize PSOutputDev::fontFileNameLen and + PSOutputDev::psFileNames; patch psoutputdev-initialize-vars.diff. + (Closes: #699421) + + -- Pino Toscano Thu, 31 Jan 2013 15:20:33 +0100 + +poppler (0.18.4-4) unstable; urgency=low + + * Backport upstream commits 7ba15d11e56175601104d125d5e4a47619c224bf and + 55940e989701eb9118015e30f4f48eb654fa34c4 to fix GooString::insert; + patch upstream_fix-GooString-insert.diff. (Closes: #693817) + * Add a libcairo2-doc build dependency to fix cross-references to cairo + methods in the poppler-glib apidox. + + -- Pino Toscano Tue, 27 Nov 2012 16:24:17 +0100 + poppler (0.18.4-3) unstable; urgency=low * Finally drop the libfontconfig1-dev dependency from libpoppler-dev, diff -ruN poppler-0.24.3/debian/control poppler-0.24.4/debian/control --- poppler-0.24.3/debian/control 2013-11-05 15:41:34.000000000 +0400 +++ poppler-0.24.4/debian/control 2013-12-02 19:39:02.322486106 +0400 @@ -2,8 +2,8 @@ Section: devel Priority: optional Maintainer: Ubuntu Developers -XS-Testsuite: autopkgtest XSBC-Original-Maintainer: Loic Minier +XS-Testsuite: autopkgtest Uploaders: Josselin Mouette , Dave Beckett , Ross Burton , @@ -26,13 +26,15 @@ pkg-config (>= 0.18), libgirepository1.0-dev (>= 1.31.0-2~), gobject-introspection (>= 1.31.0-2~), - libglib2.0-doc -Standards-Version: 3.9.3 + chrpath [hurd-any], + libglib2.0-doc, + libcairo2-doc +Standards-Version: 3.9.4 Homepage: http://poppler.freedesktop.org/ -Vcs-Git: git://git.debian.org/pkg-freedesktop/poppler.git -Vcs-Browser: http://git.debian.org/?p=pkg-freedesktop/poppler.git +Vcs-Git: git://anonscm.debian.org/pkg-freedesktop/poppler.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-freedesktop/poppler.git -Package: libpoppler43 +Package: libpoppler44 Architecture: any Section: libs Multi-Arch: same @@ -48,7 +50,7 @@ Package: libpoppler-dev Architecture: any Section: libdevel -Depends: libpoppler43 (= ${binary:Version}), +Depends: libpoppler44 (= ${binary:Version}), libpoppler-private-dev, ${shlibs:Depends}, ${misc:Depends} @@ -64,8 +66,6 @@ Depends: libpoppler-dev (= ${binary:Version}), ${misc:Depends} Suggests: libfreetype6-dev, - libpng-dev, - libtiff-dev Breaks: libpoppler-dev (<< 0.20.2) Replaces: libpoppler-dev (<< 0.20.2) Description: PDF rendering library -- private development files @@ -97,12 +97,27 @@ libcairo2-dev (>= 1.10.0), ${shlibs:Depends}, ${misc:Depends} +Suggests: libpoppler-glib-doc Description: PDF rendering library -- development files (GLib interface) Poppler is a PDF rendering library based on Xpdf PDF viewer. . This package contains the headers and development libraries needed to build applications using the GLib-based Poppler interface. +Package: libpoppler-glib-doc +Architecture: all +Section: doc +Depends: libglib2.0-doc, + libcairo2-doc, + ${misc:Depends} +Breaks: libpoppler-glib-dev (<< 0.24.4) +Replaces: libpoppler-glib-dev (<< 0.24.4) +Description: PDF rendering library -- documentation for the GLib interface + Poppler is a PDF rendering library based on Xpdf PDF viewer. + . + This package contains the API documentation of the GLib-based Poppler + interface. + Package: gir1.2-poppler-0.18 Architecture: any Section: introspection @@ -233,7 +248,7 @@ Section: debug Priority: extra Depends: ${misc:Depends}, - libpoppler43 (= ${binary:Version}) + libpoppler44 (= ${binary:Version}) Description: PDF rendering library -- debugging symbols Poppler is a PDF rendering library based on Xpdf PDF viewer. . diff -ruN poppler-0.24.3/debian/copyright poppler-0.24.4/debian/copyright --- poppler-0.24.3/debian/copyright 2013-11-05 15:41:34.000000000 +0400 +++ poppler-0.24.4/debian/copyright 2013-12-02 19:38:04.349877640 +0400 @@ -12,7 +12,7 @@ Copyright © 2008 Adam Batkin Copyright © Adobe Systems Inc. - Copyright © 2012 Adam Reichold + Copyright © 2012-2013 Adam Reichold Copyright © 2007-2013 Adrian Johnson Copyright © 2008 Adrian Page Copyright © 2004-2013 Albert Astals Cid @@ -33,23 +33,25 @@ Copyright © 2010 Christian Feuersänger Copyright © 2009 Christian Persch Copyright © 2008-2009 Chris Wilson + Copyright © 2013 Christoph Duelli Copyright © 1998-2003 Daniel Veillard Copyright © 2011 Daiki Ueno Copyright © 2005 Dan Sheridan Copyright © 2011 Daniel Glöckner + Copyright © 2011 Daniel Richard G. Copyright © 2009 Darren Kenny Copyright © 2009-2010 David Benjamin Copyright © 2006 David Faure Copyright © 1997, Derek B. Noonburg Copyright © 2006-2007 Dominic Lachowicz Copyright © 2008 Ed Avis - Copyright © 2006-2007 Ed Catmur + Copyright © 2006-2007, 2013 Ed Catmur Copyright © 2011 Edward Jiang Copyright © 2004 Enrico Ros Copyright © 2009 Eric Toombs Copyright © 2012 Even Rouault - Copyright © 2012 Fabio D'Urso - Copyright © 1989, 1991, 1994-2011 Free Software Foundation, Inc. + Copyright © 2012-2013 Fabio D'Urso + Copyright © 1989, 1991, 1994-2013 Free Software Foundation, Inc. Copyright © 2012 Gerald Schmidt Copyright © 2011 Glad Deschrijver Copyright © 1996-2011 Glyph & Cog, LLC. @@ -76,11 +78,13 @@ Copyright © 2005-2008 Jeff Muizelaar Copyright © Jerry Epplin Copyright © 2011 Jim Meyering + Copyright © 2013 Johannes Brandstätter Copyright © 2005 Jonathan Blandford Copyright © 2007-2009 Jonathan Kew Copyright © 2010 Jonathan Liu Copyright © 2011, 2013 José Aliste Copyright © 2011 Joshua Richardson + Copyright © 2013 Julien Nabet Copyright © 2006-2008 Julien Rebetez Copyright © 2010 Jürg Billeter Copyright © 2009 KDAB via Guillermo Amaral @@ -95,7 +99,8 @@ Copyright © 2005-2007 Kristian Høgsberg Copyright © 2006-2007 Krzysztof Kowalczyk Copyright © 2006-2007 Laurent Montel - Copyright © 2012 Lu Wang + Copyright © 2013 Li Junling + Copyright © 2012-2013 Lu Wang Copyright © 2012 Luis Parravicini Copyright © 2005 Marco Pesenti Gritti Copyright © 2010, 2012 Marek Kasik @@ -128,7 +133,7 @@ Copyright © 2009 Peter Kerzum Copyright © 2009 Petr Gajdos Copyright © 2010 Philip Lorenz - Copyright © 2006-2012 Pino Toscano + Copyright © 2006-2013 Pino Toscano Copyright © Rainer Dorsch Copyright © 2006 Rainer Keller Copyright © 2006 Raj Kumar @@ -149,7 +154,7 @@ Copyright © 2006 Stefan Schweizer Copyright © 2009 Stefan Thomas Copyright © 2011 Stephen Reichling - Copyright © 2006 Steven G. Johnson + Copyright © 2008 Steven G. Johnson Copyright © 2011 Steven Murdoc Copyright © 2010, 2012 Suzuki Toshiya Copyright © 2005-2006 Takashi Iwai @@ -168,9 +173,10 @@ Copyright © 2008 Vasile Gaburici Copyright © 2011 Vittal Aithal Copyright © 2012 Yi Yang + Copyright © 2013 Yury G. Kudryashov Copyright © 2008-2009 Warren Toomey Copyright © 2006 Wilfried Huss - Copyright © 2009-2012 William Bader + Copyright © 2009-2013 William Bader Copyright © 2007 Will Stephenson Copyright © 1994 X Consortium diff -ruN poppler-0.24.3/debian/libpoppler43.docs poppler-0.24.4/debian/libpoppler43.docs --- poppler-0.24.3/debian/libpoppler43.docs 2013-11-05 15:41:34.000000000 +0400 +++ poppler-0.24.4/debian/libpoppler43.docs 1970-01-01 03:00:00.000000000 +0300 @@ -1,5 +0,0 @@ -AUTHORS -NEWS -README -README-XPDF -TODO diff -ruN poppler-0.24.3/debian/libpoppler43.install poppler-0.24.4/debian/libpoppler43.install --- poppler-0.24.3/debian/libpoppler43.install 2013-11-05 15:41:34.000000000 +0400 +++ poppler-0.24.4/debian/libpoppler43.install 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -usr/lib/*/libpoppler.so.43* diff -ruN poppler-0.24.3/debian/libpoppler44.docs poppler-0.24.4/debian/libpoppler44.docs --- poppler-0.24.3/debian/libpoppler44.docs 1970-01-01 03:00:00.000000000 +0300 +++ poppler-0.24.4/debian/libpoppler44.docs 2013-12-02 19:37:38.897606148 +0400 @@ -0,0 +1,5 @@ +AUTHORS +NEWS +README +README-XPDF +TODO diff -ruN poppler-0.24.3/debian/libpoppler44.install poppler-0.24.4/debian/libpoppler44.install --- poppler-0.24.3/debian/libpoppler44.install 1970-01-01 03:00:00.000000000 +0300 +++ poppler-0.24.4/debian/libpoppler44.install 2013-12-02 20:01:39.652311836 +0400 @@ -0,0 +1 @@ +usr/lib/*/libpoppler.so.44* diff -ruN poppler-0.24.3/debian/libpoppler-glib-dev.install poppler-0.24.4/debian/libpoppler-glib-dev.install --- poppler-0.24.3/debian/libpoppler-glib-dev.install 2013-11-05 15:41:34.000000000 +0400 +++ poppler-0.24.4/debian/libpoppler-glib-dev.install 2013-12-02 19:38:04.349877640 +0400 @@ -1,4 +1,3 @@ -usr/share/gtk-doc/html/poppler/ usr/share/doc/libpoppler-glib-dev/html/ usr/include/poppler/glib/ usr/lib/*/libpoppler-glib.a usr/lib/*/libpoppler-glib.so diff -ruN poppler-0.24.3/debian/libpoppler-glib-dev.links poppler-0.24.4/debian/libpoppler-glib-dev.links --- poppler-0.24.3/debian/libpoppler-glib-dev.links 2013-11-05 15:41:34.000000000 +0400 +++ poppler-0.24.4/debian/libpoppler-glib-dev.links 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -usr/share/doc/libpoppler-glib-dev/html/poppler usr/share/gtk-doc/html/poppler diff -ruN poppler-0.24.3/debian/libpoppler-glib-doc.install poppler-0.24.4/debian/libpoppler-glib-doc.install --- poppler-0.24.3/debian/libpoppler-glib-doc.install 1970-01-01 03:00:00.000000000 +0300 +++ poppler-0.24.4/debian/libpoppler-glib-doc.install 2013-12-02 19:38:04.353877592 +0400 @@ -0,0 +1 @@ +usr/share/gtk-doc/html/poppler diff -ruN poppler-0.24.3/debian/libpoppler-glib-doc.links poppler-0.24.4/debian/libpoppler-glib-doc.links --- poppler-0.24.3/debian/libpoppler-glib-doc.links 1970-01-01 03:00:00.000000000 +0300 +++ poppler-0.24.4/debian/libpoppler-glib-doc.links 2013-12-02 19:38:04.353877592 +0400 @@ -0,0 +1 @@ +usr/share/gtk-doc/html/poppler usr/share/doc/libpoppler-glib-dev/html/poppler diff -ruN poppler-0.24.3/debian/patches/qt4-visibility.diff poppler-0.24.4/debian/patches/qt4-visibility.diff --- poppler-0.24.3/debian/patches/qt4-visibility.diff 2013-11-05 15:41:34.000000000 +0400 +++ poppler-0.24.4/debian/patches/qt4-visibility.diff 2013-12-02 19:38:04.353877592 +0400 @@ -8,11 +8,9 @@ Forwarded: no Last-Update: 2012-08-11 -Index: poppler-0.24.0/qt4/src/Makefile.am -=================================================================== ---- poppler-0.24.0.orig/qt4/src/Makefile.am 2013-07-30 14:25:43.910970463 +0200 -+++ poppler-0.24.0/qt4/src/Makefile.am 2013-07-30 14:25:43.902970463 +0200 -@@ -56,6 +56,7 @@ +--- a/qt4/src/Makefile.am ++++ b/qt4/src/Makefile.am +@@ -56,6 +56,7 @@ libpoppler_qt4_la_SOURCES = \ ArthurOutputDev.cc libpoppler_qt4_la_CXXFLAGS = \ @@ -20,11 +18,9 @@ -Dpoppler_qt4_EXPORTS libpoppler_qt4_la_LIBADD = \ -Index: poppler-0.24.0/qt4/src/Makefile.in -=================================================================== ---- poppler-0.24.0.orig/qt4/src/Makefile.in 2013-07-30 14:25:43.910970463 +0200 -+++ poppler-0.24.0/qt4/src/Makefile.in 2013-07-30 14:25:43.902970463 +0200 -@@ -502,6 +502,7 @@ +--- a/qt4/src/Makefile.in ++++ b/qt4/src/Makefile.in +@@ -502,6 +502,7 @@ libpoppler_qt4_la_SOURCES = \ ArthurOutputDev.cc libpoppler_qt4_la_CXXFLAGS = \ @@ -32,10 +28,8 @@ -Dpoppler_qt4_EXPORTS libpoppler_qt4_la_LIBADD = \ -Index: poppler-0.24.0/qt4/src/poppler-export.h -=================================================================== ---- poppler-0.24.0.orig/qt4/src/poppler-export.h 2013-07-30 14:25:43.910970463 +0200 -+++ poppler-0.24.0/qt4/src/poppler-export.h 2013-07-30 14:25:43.902970463 +0200 +--- a/qt4/src/poppler-export.h ++++ b/qt4/src/poppler-export.h @@ -5,6 +5,9 @@ #if defined(_WIN32) # define LIB_EXPORT __declspec(dllexport) diff -ruN poppler-0.24.3/debian/rules poppler-0.24.4/debian/rules --- poppler-0.24.3/debian/rules 2013-11-05 15:41:34.000000000 +0400 +++ poppler-0.24.4/debian/rules 2013-12-02 19:39:45.746934892 +0400 @@ -19,9 +19,15 @@ # enable all the hardening options export DEB_BUILD_MAINT_OPTIONS = hardening=+all +# DEB_* variables +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + # disable gtk stuff to minimize Build-Depends CONFIGURE_ARGS := \ --enable-libjpeg \ + --enable-libpng \ + --enable-libtiff \ --enable-splash-output \ --enable-cairo-output \ --enable-poppler-glib \ @@ -31,6 +37,7 @@ --enable-gtk-doc \ --enable-xpdf-headers \ --enable-introspection=yes \ + --enable-cms=lcms2 \ --disable-gtk-test %: @@ -44,18 +51,27 @@ override_dh_auto_configure: dh_auto_configure -- $(CONFIGURE_ARGS) +override_dh_auto_install: + dh_auto_install +ifeq ($(DEB_HOST_ARCH_OS),hurd) + # workaround old libtool issues on Hurd, manually removing extra RPATH + chrpath -d $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.so.* +endif + # remove libtool .la files + rm -f -v $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la + override_dh_install: dh_install --list-missing override_dh_installchangelogs: - dh_installchangelogs -plibpoppler43 + dh_installchangelogs -plibpoppler44 dh_installchangelogs --remaining-packages -XChangeLog override_dh_strip: dh_strip --dbg-package=poppler-dbg override_dh_makeshlibs: $(SYMBOLS_generated) - dh_makeshlibs -plibpoppler43 -V + dh_makeshlibs -plibpoppler44 -V dh_makeshlibs -plibpoppler-cpp0 -V"libpoppler-cpp0 (>= 0.16)" dh_makeshlibs --remaining-packages diff -ruN poppler-0.24.3/debian/watch poppler-0.24.4/debian/watch --- poppler-0.24.3/debian/watch 2013-11-05 15:41:34.000000000 +0400 +++ poppler-0.24.4/debian/watch 2013-12-02 19:42:58.488864525 +0400 @@ -1,2 +1,2 @@ version=3 -http://poppler.freedesktop.org/ poppler-([0-9.]*)\.tar\.gz debian uupdate +http://poppler.freedesktop.org/ poppler-([0-9.]*)\.tar\.(?:gz|xz) debian uupdate