=== modified file 'debian/changelog' --- debian/changelog 2016-11-05 16:53:58 +0000 +++ debian/changelog 2016-11-05 17:41:03 +0000 @@ -1,26 +1,41 @@ -poppler (0.44.0-3ubuntu2) yakkety; urgency=medium - - * Fix build with Qt 5.6. (LP: #1608476) - - -- Timo Jyrinki Mon, 01 Aug 2016 13:45:28 +0300 - -poppler (0.44.0-3ubuntu1) yakkety; urgency=medium - - * Merge with Debian. (LP: #1591528) Remaining changes: - - debian/control: - + Don't build-depend on libopenjp2-7-dev since it's in universe +poppler (0.48.0-2ubuntu1) UNRELEASED; urgency=medium + + * Merge with Debian. (LP: #1639478) Remaining change: - debian/rules: - + Use --disable-libopenjpeg - * Dropped changes: - - Only suggest poppler-data since it's too big for CDs and - language-selector automatically installs it after install - - debian/patches/revert_api_change.patch: - + revert upstream commit that removed an enum, they claim it's - not an abi change because it's unused, but other packages (bindings) - rely on it to build still, we can drop the patch later once the - rdepends have been updated - - -- Jeremy Bicha Sat, 11 Jun 2016 18:16:34 -0400 + + Use --disable-libopenjpeg since openjpeg2 is in universe + + -- Jeremy Bicha Sat, 05 Nov 2016 12:56:03 -0400 + +poppler (0.48.0-2) unstable; urgency=medium + + * Upload to unstable. (See #839869) + * autopkgtest: build the qt5 test with -std=c++11, required with Qt5 >= 5.6. + * Backport upstream commit 5d15a52aade68c618c356fe403ca500e74917ef7 to remove + an extra '%' in an error message of pdfseparate; patch + upstream_pdfseparate-remove-extra-in-error-message.patch. (Closes: #835202) + + -- Pino Toscano Sat, 05 Nov 2016 08:29:43 +0100 + +poppler (0.48.0-1) experimental; urgency=medium + + * New upstream release: + - fixes UTF-16 decoding of document outline title (Closes: #702082) + - fixes crashes in PDF documents (Closes: #830565) + * Rename packages according to the new SONAMEs: + - libpoppler61 -> libpoppler64 + * Update copyright. + * Bump the libglib2.0-dev (build-)dependency to 2.41, as noted in the + upstream build system. + * Update symbols files. + * Bump shlibs for libpoppler-cpp0v5 to >= 0.46.0, following the new APIs + added. + * Install the GObject introspection data in a multi-arch directory: + - bump the libgirepository1.0-dev, and gobject-introspection to + >= 1.42.0-2~, as providing a fixed dh_girepository + - update gir1.2-poppler-0.18.install + - mark gir1.2-poppler-0.18 as Multi-Arch: same + + -- Pino Toscano Sat, 08 Oct 2016 20:14:42 +0200 poppler (0.44.0-3) unstable; urgency=medium === modified file 'debian/control' --- debian/control 2016-11-05 16:53:58 +0000 +++ debian/control 2016-11-05 16:57:19 +0000 @@ -8,11 +8,11 @@ Build-Depends: debhelper (>= 9), dpkg (>= 1.16.1), dh-autoreconf, - libglib2.0-dev (>= 2.18), + libglib2.0-dev (>= 2.41), libfontconfig1-dev, libqt4-dev (>= 4:4.7.0), libcairo2-dev (>= 1.10.0), -# libopenjp2-7-dev, + libopenjp2-7-dev, libjpeg-dev, libpng-dev, libtiff-dev, @@ -20,8 +20,8 @@ libfreetype6-dev, gtk-doc-tools (>= 1.14), pkg-config (>= 0.18), - libgirepository1.0-dev (>= 1.31.0-2~), - gobject-introspection (>= 1.31.0-2~), + libgirepository1.0-dev (>= 1.42.0-2~), + gobject-introspection (>= 1.42.0-2~), qtbase5-dev, zlib1g-dev, libnss3-dev, @@ -33,7 +33,7 @@ Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-freedesktop/poppler.git Testsuite: autopkgtest -Package: libpoppler61 +Package: libpoppler64 Architecture: any Section: libs Multi-Arch: same @@ -50,7 +50,7 @@ Architecture: any Section: libdevel Multi-Arch: same -Depends: libpoppler61 (= ${binary:Version}), +Depends: libpoppler64 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: PDF rendering library -- development files @@ -79,7 +79,7 @@ Section: libs Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: libpoppler61 (= ${binary:Version}), +Depends: libpoppler64 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: PDF rendering library (GLib-based shared library) @@ -94,7 +94,7 @@ Depends: libpoppler-glib8 (= ${binary:Version}), libpoppler-dev (= ${binary:Version}), gir1.2-poppler-0.18 (= ${binary:Version}), - libglib2.0-dev (>= 2.18), + libglib2.0-dev (>= 2.41), libcairo2-dev (>= 1.10.0), ${shlibs:Depends}, ${misc:Depends} @@ -122,6 +122,7 @@ Package: gir1.2-poppler-0.18 Architecture: any Section: introspection +Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, ${gir:Depends} @@ -138,7 +139,7 @@ Section: libs Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: libpoppler61 (= ${binary:Version}), +Depends: libpoppler64 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: PDF rendering library (Qt 4 based shared library) @@ -166,7 +167,7 @@ Section: libs Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: libpoppler61 (= ${binary:Version}), +Depends: libpoppler64 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: PDF rendering library (Qt 5 based shared library) @@ -195,7 +196,7 @@ Section: libs Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: libpoppler61 (= ${binary:Version}), +Depends: libpoppler64 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Conflicts: libpoppler-cpp0 @@ -224,7 +225,7 @@ Architecture: any Section: utils Multi-Arch: foreign -Depends: libpoppler61 (= ${binary:Version}), +Depends: libpoppler64 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} # should really be just the following: @@ -262,7 +263,7 @@ Priority: extra Multi-Arch: same Depends: ${misc:Depends}, - libpoppler61 (= ${binary:Version}) + libpoppler64 (= ${binary:Version}) Description: PDF rendering library -- debugging symbols Poppler is a PDF rendering library based on Xpdf PDF viewer. . === modified file 'debian/copyright' --- debian/copyright 2016-11-05 16:53:58 +0000 +++ debian/copyright 2016-11-05 16:55:01 +0000 @@ -65,7 +65,7 @@ Copyright © 2009 Eric Toombs Copyright © 2012, 2015 Even Rouault Copyright © 2012-2014 Fabio D'Urso - Copyright © 1989, 1991-2015 Free Software Foundation, Inc. + Copyright © 1989, 1991-2016 Free Software Foundation, Inc. Copyright © 2012 Gerald Schmidt Copyright © 2013 German Poo-Caamano Copyright © 2011 Glad Deschrijver @@ -132,6 +132,7 @@ Copyright © 2015 Markus Kilås Copyright © 2012 Markus Trippelsdorf Copyright © 2005 Martin Kretzschmar + Copyright © 2016 Masamichi Hosoda Copyright © 2009 Matthias Drochner Copyright © 2010 Matthias Fauconneau Copyright © 2009 Matthias Franz @@ -202,6 +203,7 @@ Copyright © 2008 Tomas Are Haavet Copyright © 2010-2011 Tomas Hoger Copyright © 2008 Vasile Gaburici + Copyright © 2016 Vincent Le Garrec Copyright © 2011 Vittal Aithal Copyright © 2012 Yi Yang Copyright © 2013 Yury G. Kudryashov === modified file 'debian/gir1.2-poppler-0.18.install' --- debian/gir1.2-poppler-0.18.install 2016-06-11 15:21:18 +0000 +++ debian/gir1.2-poppler-0.18.install 2016-11-05 16:55:01 +0000 @@ -1,1 +1,1 @@ -usr/lib/*/girepository-1.0/Poppler-0.18.typelib usr/lib/girepository-1.0/ +usr/lib/*/girepository-1.0/Poppler-0.18.typelib === modified file 'debian/libpoppler-glib8.symbols.in' --- debian/libpoppler-glib8.symbols.in 2016-11-05 16:53:58 +0000 +++ debian/libpoppler-glib8.symbols.in 2016-11-05 16:55:01 +0000 @@ -129,6 +129,14 @@ poppler_document_new_from_stream@Base 0.22.1 poppler_document_save@Base 0.18.0 poppler_document_save_a_copy@Base 0.18.0 + poppler_document_set_author@Base 0.46.0 + poppler_document_set_creation_date@Base 0.46.0 + poppler_document_set_creator@Base 0.46.0 + poppler_document_set_keywords@Base 0.46.0 + poppler_document_set_modification_date@Base 0.46.0 + poppler_document_set_producer@Base 0.46.0 + poppler_document_set_subject@Base 0.46.0 + poppler_document_set_title@Base 0.46.0 poppler_error_get_type@Base 0.18.0 poppler_error_quark@Base 0.18.0 poppler_find_flags_get_type@Base 0.22.1 === modified file 'debian/libpoppler-qt4-4.symbols.in' --- debian/libpoppler-qt4-4.symbols.in 2016-11-05 16:53:58 +0000 +++ debian/libpoppler-qt4-4.symbols.in 2016-11-05 16:55:01 +0000 @@ -403,17 +403,28 @@ _ZN7Poppler7TextBoxC2ERK7QStringRK6QRectF@Base 0.20.1 _ZN7Poppler7TextBoxD1Ev@Base 0.20.1 _ZN7Poppler7TextBoxD2Ev@Base 0.20.1 + _ZN7Poppler8Document10removeInfoEv@Base 0.46.0 + _ZN7Poppler8Document10setCreatorERK7QString@Base 0.46.0 + _ZN7Poppler8Document10setSubjectERK7QString@Base 0.46.0 + _ZN7Poppler8Document11setKeywordsERK7QString@Base 0.46.0 + _ZN7Poppler8Document11setProducerERK7QString@Base 0.46.0 _ZN7Poppler8Document12loadFromDataERK10QByteArrayS3_S3_@Base 0.20.1 _ZN7Poppler8Document13setPaperColorERK6QColor@Base 0.20.1 _ZN7Poppler8Document13setRenderHintENS0_10RenderHintEb@Base 0.20.1 _ZN7Poppler8Document15linkDestinationERK7QString@Base 0.20.1 + _ZN7Poppler8Document15setCreationDateERK9QDateTime@Base 0.46.0 _ZN7Poppler8Document16setRenderBackendENS0_13RenderBackendE@Base 0.20.1 + _ZN7Poppler8Document19setModificationDateERK9QDateTime@Base 0.46.0 _ZN7Poppler8Document20optionalContentModelEv@Base 0.20.1 _ZN7Poppler8Document22setColorDisplayProfileEPv@Base 0.20.1 _ZN7Poppler8Document23availableRenderBackendsEv@Base 0.20.1 _ZN7Poppler8Document26setColorDisplayProfileNameERK7QString@Base 0.20.1 _ZN7Poppler8Document4loadERK7QStringRK10QByteArrayS6_@Base 0.20.1 _ZN7Poppler8Document6unlockERK10QByteArrayS3_@Base 0.20.1 + _ZN7Poppler8Document7setDateERK7QStringRK9QDateTime@Base 0.46.0 + _ZN7Poppler8Document7setInfoERK7QStringS3_@Base 0.46.0 + _ZN7Poppler8Document8setTitleERK7QString@Base 0.46.0 + _ZN7Poppler8Document9setAuthorERK7QString@Base 0.46.0 _ZN7Poppler8DocumentC1EPNS_12DocumentDataE@Base 0.20.1 _ZN7Poppler8DocumentC2EPNS_12DocumentDataE@Base 0.20.1 _ZN7Poppler8DocumentD1Ev@Base 0.20.1 @@ -692,6 +703,7 @@ _ZNK7Poppler8Document11isEncryptedEv@Base 0.20.1 _ZNK7Poppler8Document11psConverterEv@Base 0.20.1 _ZNK7Poppler8Document11renderHintsEv@Base 0.20.1 + _ZNK7Poppler8Document12creationDateEv@Base 0.46.0 _ZNK7Poppler8Document12isLinearizedEv@Base 0.20.1 _ZNK7Poppler8Document12okToAddNotesEv@Base 0.20.1 _ZNK7Poppler8Document12okToAssembleEv@Base 0.20.1 @@ -705,6 +717,7 @@ _ZNK7Poppler8Document15colorRgbProfileEv@Base 0.20.1 _ZNK7Poppler8Document15newFontIteratorEi@Base 0.20.1 _ZNK7Poppler8Document16hasEmbeddedFilesEv@Base 0.20.1 + _ZNK7Poppler8Document16modificationDateEv@Base 0.46.0 _ZNK7Poppler8Document16okToPrintHighResEv@Base 0.20.1 _ZNK7Poppler8Document18hasOptionalContentEv@Base 0.20.1 _ZNK7Poppler8Document19colorDisplayProfileEv@Base 0.20.1 @@ -716,16 +729,22 @@ _ZNK7Poppler8Document4pageERK7QString@Base 0.20.1 _ZNK7Poppler8Document4pageEi@Base 0.20.1 _ZNK7Poppler8Document5fontsEv@Base 0.20.1 + _ZNK7Poppler8Document5titleEv@Base 0.46.0 + _ZNK7Poppler8Document6authorEv@Base 0.46.0 + _ZNK7Poppler8Document7creatorEv@Base 0.46.0 _ZNK7Poppler8Document7scriptsEv@Base 0.20.1 + _ZNK7Poppler8Document7subjectEv@Base 0.46.0 _ZNK7Poppler8Document8fontDataERKNS_8FontInfoE@Base 0.20.1 _ZNK7Poppler8Document8formTypeEv@Base 0.22.1 _ZNK7Poppler8Document8getPdfIdEP10QByteArrayS2_@Base 0.20.1 _ZNK7Poppler8Document8infoKeysEv@Base 0.20.1 _ZNK7Poppler8Document8isLockedEv@Base 0.20.1 + _ZNK7Poppler8Document8keywordsEv@Base 0.46.0 _ZNK7Poppler8Document8metadataEv@Base 0.20.1 _ZNK7Poppler8Document8numPagesEv@Base 0.20.1 _ZNK7Poppler8Document8okToCopyEv@Base 0.20.1 _ZNK7Poppler8Document8pageModeEv@Base 0.20.1 + _ZNK7Poppler8Document8producerEv@Base 0.46.0 _ZNK7Poppler8Document9okToPrintEv@Base 0.20.1 _ZNK7Poppler8FontInfo10isEmbeddedEv@Base 0.20.1 _ZNK7Poppler8FontInfo4fileEv@Base 0.20.1 === modified file 'debian/libpoppler-qt5-1.symbols.in' --- debian/libpoppler-qt5-1.symbols.in 2016-11-05 16:53:58 +0000 +++ debian/libpoppler-qt5-1.symbols.in 2016-11-05 16:55:01 +0000 @@ -400,17 +400,28 @@ _ZN7Poppler7TextBoxC2ERK7QStringRK6QRectF@Base 0.24.5 _ZN7Poppler7TextBoxD1Ev@Base 0.24.5 _ZN7Poppler7TextBoxD2Ev@Base 0.24.5 + _ZN7Poppler8Document10removeInfoEv@Base 0.46.0 + _ZN7Poppler8Document10setCreatorERK7QString@Base 0.46.0 + _ZN7Poppler8Document10setSubjectERK7QString@Base 0.46.0 + _ZN7Poppler8Document11setKeywordsERK7QString@Base 0.46.0 + _ZN7Poppler8Document11setProducerERK7QString@Base 0.46.0 _ZN7Poppler8Document12loadFromDataERK10QByteArrayS3_S3_@Base 0.24.5 _ZN7Poppler8Document13setPaperColorERK6QColor@Base 0.24.5 _ZN7Poppler8Document13setRenderHintENS0_10RenderHintEb@Base 0.24.5 _ZN7Poppler8Document15linkDestinationERK7QString@Base 0.24.5 + _ZN7Poppler8Document15setCreationDateERK9QDateTime@Base 0.46.0 _ZN7Poppler8Document16setRenderBackendENS0_13RenderBackendE@Base 0.24.5 + _ZN7Poppler8Document19setModificationDateERK9QDateTime@Base 0.46.0 _ZN7Poppler8Document20optionalContentModelEv@Base 0.24.5 _ZN7Poppler8Document22setColorDisplayProfileEPv@Base 0.24.5 _ZN7Poppler8Document23availableRenderBackendsEv@Base 0.24.5 _ZN7Poppler8Document26setColorDisplayProfileNameERK7QString@Base 0.24.5 _ZN7Poppler8Document4loadERK7QStringRK10QByteArrayS6_@Base 0.24.5 _ZN7Poppler8Document6unlockERK10QByteArrayS3_@Base 0.24.5 + _ZN7Poppler8Document7setDateERK7QStringRK9QDateTime@Base 0.46.0 + _ZN7Poppler8Document7setInfoERK7QStringS3_@Base 0.46.0 + _ZN7Poppler8Document8setTitleERK7QString@Base 0.46.0 + _ZN7Poppler8Document9setAuthorERK7QString@Base 0.46.0 _ZN7Poppler8DocumentC1EPNS_12DocumentDataE@Base 0.24.5 _ZN7Poppler8DocumentC2EPNS_12DocumentDataE@Base 0.24.5 _ZN7Poppler8DocumentD1Ev@Base 0.24.5 @@ -686,6 +697,7 @@ _ZNK7Poppler8Document11isEncryptedEv@Base 0.24.5 _ZNK7Poppler8Document11psConverterEv@Base 0.24.5 _ZNK7Poppler8Document11renderHintsEv@Base 0.24.5 + _ZNK7Poppler8Document12creationDateEv@Base 0.46.0 _ZNK7Poppler8Document12isLinearizedEv@Base 0.24.5 _ZNK7Poppler8Document12okToAddNotesEv@Base 0.24.5 _ZNK7Poppler8Document12okToAssembleEv@Base 0.24.5 @@ -698,6 +710,7 @@ _ZNK7Poppler8Document15colorRgbProfileEv@Base 0.24.5 _ZNK7Poppler8Document15newFontIteratorEi@Base 0.24.5 _ZNK7Poppler8Document16hasEmbeddedFilesEv@Base 0.24.5 + _ZNK7Poppler8Document16modificationDateEv@Base 0.46.0 _ZNK7Poppler8Document16okToPrintHighResEv@Base 0.24.5 _ZNK7Poppler8Document18hasOptionalContentEv@Base 0.24.5 _ZNK7Poppler8Document19colorDisplayProfileEv@Base 0.24.5 @@ -709,16 +722,22 @@ _ZNK7Poppler8Document4pageERK7QString@Base 0.24.5 _ZNK7Poppler8Document4pageEi@Base 0.24.5 _ZNK7Poppler8Document5fontsEv@Base 0.24.5 + _ZNK7Poppler8Document5titleEv@Base 0.46.0 + _ZNK7Poppler8Document6authorEv@Base 0.46.0 + _ZNK7Poppler8Document7creatorEv@Base 0.46.0 _ZNK7Poppler8Document7scriptsEv@Base 0.24.5 + _ZNK7Poppler8Document7subjectEv@Base 0.46.0 _ZNK7Poppler8Document8fontDataERKNS_8FontInfoE@Base 0.24.5 _ZNK7Poppler8Document8formTypeEv@Base 0.24.5 _ZNK7Poppler8Document8getPdfIdEP10QByteArrayS2_@Base 0.24.5 _ZNK7Poppler8Document8infoKeysEv@Base 0.24.5 _ZNK7Poppler8Document8isLockedEv@Base 0.24.5 + _ZNK7Poppler8Document8keywordsEv@Base 0.46.0 _ZNK7Poppler8Document8metadataEv@Base 0.24.5 _ZNK7Poppler8Document8numPagesEv@Base 0.24.5 _ZNK7Poppler8Document8okToCopyEv@Base 0.24.5 _ZNK7Poppler8Document8pageModeEv@Base 0.24.5 + _ZNK7Poppler8Document8producerEv@Base 0.46.0 _ZNK7Poppler8Document9okToPrintEv@Base 0.24.5 _ZNK7Poppler8FontInfo10isEmbeddedEv@Base 0.24.5 _ZNK7Poppler8FontInfo4fileEv@Base 0.24.5 === renamed file 'debian/libpoppler61.docs' => 'debian/libpoppler64.docs' === renamed file 'debian/libpoppler61.install' => 'debian/libpoppler64.install' --- debian/libpoppler61.install 2016-11-05 16:53:58 +0000 +++ debian/libpoppler64.install 2016-11-05 16:55:01 +0000 @@ -1,1 +1,1 @@ -usr/lib/*/libpoppler.so.61* +usr/lib/*/libpoppler.so.64* === modified file 'debian/patches/series' --- debian/patches/series 2016-11-05 16:53:58 +0000 +++ debian/patches/series 2016-11-05 16:55:01 +0000 @@ -1,1 +1,2 @@ +upstream_pdfseparate-remove-extra-in-error-message.patch qt-visibility.diff === added file 'debian/patches/upstream_pdfseparate-remove-extra-in-error-message.patch' --- debian/patches/upstream_pdfseparate-remove-extra-in-error-message.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/upstream_pdfseparate-remove-extra-in-error-message.patch 2016-11-05 16:55:01 +0000 @@ -0,0 +1,25 @@ +From 5d15a52aade68c618c356fe403ca500e74917ef7 Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Sun, 9 Oct 2016 13:04:46 +0200 +Subject: [PATCH] pdfseparate: remove extra '%' in error message + +--- + utils/pdfseparate.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/utils/pdfseparate.cc b/utils/pdfseparate.cc +index 9fa7052..469f568 100644 +--- a/utils/pdfseparate.cc ++++ b/utils/pdfseparate.cc +@@ -97,7 +97,7 @@ bool extractPages (const char *srcFileName, const char *destFileName) { + } + } + if (!foundmatch && firstPage != lastPage) { +- error(errSyntaxError, -1, "'{0:s}' must contain '%%d' if more than one page should be extracted", destFileName); ++ error(errSyntaxError, -1, "'{0:s}' must contain '%d' if more than one page should be extracted", destFileName); + free(auxDestFileName); + delete doc; + return false; +-- +2.10.2 + === modified file 'debian/rules' --- debian/rules 2016-11-05 16:53:58 +0000 +++ debian/rules 2016-11-05 16:57:16 +0000 @@ -64,15 +64,15 @@ dh_install --list-missing override_dh_installchangelogs: - dh_installchangelogs -plibpoppler61 + dh_installchangelogs -plibpoppler64 dh_installchangelogs --remaining-packages -XChangeLog override_dh_strip: dh_strip --dbg-package=poppler-dbg override_dh_makeshlibs: $(SYMBOLS_generated) - dh_makeshlibs -plibpoppler61 -V - dh_makeshlibs -plibpoppler-cpp0v5 -V"libpoppler-cpp0v5 (>= 0.16)" + dh_makeshlibs -plibpoppler64 -V + dh_makeshlibs -plibpoppler-cpp0v5 -V"libpoppler-cpp0v5 (>= 0.46.0)" dh_makeshlibs --remaining-packages debian/%.symbols: debian/%.symbols.in