diff -ruN poppler-debian/debian/changelog poppler-0.24.4/debian/changelog --- poppler-debian/debian/changelog 2013-12-02 19:40:38.727474807 +0400 +++ poppler-0.24.4/debian/changelog 2013-12-02 20:03:09.837267006 +0400 @@ -1,16 +1,42 @@ -poppler (0.24.3-0r1) UNRELEASED; urgency=low +poppler (0.24.4-0ubuntu1) trusty; urgency=low - * New upstream release: - - poppler can handle documents bigger than 2GB. (Closes: #642530) - - fixes a typo in an error message. (Closes: #708972) - * Rename packages according to the new SONAMEs: - - libpoppler37 -> libpoppler43 - * debian/patches: - - qt4-visibility.diff: refresh - * Update copyright. - * Update symbols files. + * 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 - -- Pino Toscano Thu, 08 Aug 2013 10:26:19 +0200 + * New upstream version + + -- Sebastien Bacher Tue, 05 Nov 2013 12:41:48 +0100 + +poppler (0.24.1-0ubuntu1) saucy; urgency=low + + * New upstream version + + -- Sebastien Bacher Tue, 27 Aug 2013 16:35:09 +0200 + +poppler (0.24.0-0ubuntu1) saucy; urgency=low + + * New upstream version, new soname version (37 -> 43) + * debian/debian/libpoppler-qt4-4.symbols.in: + - updated for the new version + * Build qt5 packages + + -- Sebastien Bacher Tue, 30 Jul 2013 14:23:19 +0200 poppler (0.22.5-2) experimental; urgency=low @@ -52,6 +78,18 @@ -- 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). + - Should fix the text selection problems (LP: #39890). + - Should fix issues with PDF forms (LP: #1153517). + * Drop all upstream patches and refresh other patches. + * Change the soname version in package name: libpoppler28 -> libpoppler37. + * Update symbols files. + * Update debian/copyright (taken from Debian packaging Git). + + -- 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: @@ -77,6 +115,52 @@ -- Pino Toscano Thu, 31 Jan 2013 19:41:24 +0100 +poppler (0.20.5-1ubuntu3) raring; urgency=low + + * SECURITY UPDATE: invalid memory access issues + - debian/patches/CVE-2013-1788.patch: add checks in poppler/Function.cc, + poppler/Stream.cc, splash/Splash.cc. + - CVE-2013-1788 + * SECURITY UPDATE: denial of service via malformed documents + - debian/patches/CVE-2013-1789.patch: validate data in splash/Splash.cc. + - CVE-2013-1789 + * SECURITY UPDATE: uninitialized memory read + - debian/patches/CVE-2013-1790.patch: properly handle refLine in + poppler/Stream.cc. + - CVE-2013-1790 + + -- Marc Deslauriers Fri, 08 Mar 2013 12:59:26 -0500 + +poppler (0.20.5-1ubuntu2) raring; urgency=low + + * debian/tests/build: Don't call deprecated g_type_init() when building with + glib >= 2.35. + + -- Martin Pitt Wed, 16 Jan 2013 16:14:28 +0100 + +poppler (0.20.5-1ubuntu1) raring; urgency=low + + * Merge from Debian experimental. Remaining changes: + - Drop libopenjpeg-dev build depends, it's in universe. + - Lower poppler-data to Suggests, it's 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 (inherited from + Debian). + - Add one more optional symbol to libpoppler-qt4-4 symbols file to + account for armel toolchain differences between Debian and Ubuntu. + - debian/patches/git_gouraud_shading_support.patch: Evince crashes after + opening certain PDF file because parameterized Gouraud shading is not + supported. + - debian/patches/git_mask_segfault.patch: don't segfault in + setSoftMaskFromImageMask. + - debian/patches/git_no_buggy_check.patch: "Don't do a check for sanity + that then we don't use." + - Add simple compile/link/run autopkgtest. + * Refresh Ubuntu patches. + + -- Logan Rosen Fri, 21 Dec 2012 16:54:30 -0500 + poppler (0.20.5-1) experimental; urgency=low * New upstream release. @@ -84,6 +168,27 @@ -- Pino Toscano Wed, 10 Oct 2012 21:02:25 +0200 +poppler (0.20.5-0ubuntu3) raring; urgency=low + + * Add simple compile/link/run autopkgtest. + + -- Daniel Kessel Thu, 13 Dec 2012 17:11:45 +0100 + +poppler (0.20.5-0ubuntu2) raring; urgency=low + + * debian/patches/git_mask_segfault.patch: + - don't segfault in setSoftMaskFromImageMask (lp: #1034229) + * debian/patches/git_no_buggy_check.patch: + "Don't do a check for sanity that then we don't use" (lp: #1020162) + + -- Sebastien Bacher Mon, 03 Dec 2012 18:47:40 +0100 + +poppler (0.20.5-0ubuntu1) raring; urgency=low + + * New upstream release + + -- Robert Ancell Wed, 14 Nov 2012 14:50:48 +1300 + poppler (0.20.4-1) experimental; urgency=low * New upstream release. @@ -95,6 +200,38 @@ -- Pino Toscano Sun, 23 Sep 2012 17:03:39 +0200 +poppler (0.20.4-0ubuntu2) raring; urgency=low + + * debian/patches/git_gouraud_shading_support.patch: (LP: #1072129) + - Evince crashes after opening certain PDF file because parameterized + Gouraud shading is not supported. + + -- Matthieu Baerts (matttbe) Sat, 10 Nov 2012 16:51:12 +0100 + +poppler (0.20.4-0ubuntu1) quantal; urgency=low + + * New upstream bugfix release + * debian/control: + * debian/rules: + * debian/libpoppler28.install: + - libpoppler27 -> libpoppler28 + + -- Robert Ancell Wed, 12 Sep 2012 10:53:15 +1200 + +poppler (0.20.3-2ubuntu1) quantal; urgency=low + + * Merge with Debian to resolve armel FTBFS, remaining changes: + - Drop libopenjpeg-dev build depends, it's in universe. + - Lower poppler-data to Suggests, it's 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 (inherited from + Debian). + * Add one more optional symbol to libpoppler-qt4-4 symbols file to + account for armel toolchain differences between Debian and Ubuntu. + + -- Adam Conrad Thu, 16 Aug 2012 04:20:31 -0600 + poppler (0.20.3-2) experimental; urgency=low * Adapt the libpoppler-qt4-4 symbols file to the internal symbols exported @@ -102,6 +239,19 @@ -- Pino Toscano Tue, 14 Aug 2012 01:08:12 +0200 +poppler (0.20.3-1ubuntu1) quantal; urgency=low + + * Merge with Debian, remaining Ubuntu changes: + * debian/control: + - Drop libopenjpeg-dev build depends, it's in universe. + - Lower poppler-data to Suggests, it's 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 (inherited from + Debian). + + -- Robert Ancell Tue, 14 Aug 2012 13:11:05 +1200 + poppler (0.20.3-1) experimental; urgency=low * New upstream release. @@ -128,6 +278,25 @@ -- Pino Toscano Sat, 11 Aug 2012 12:13:20 +0200 +poppler (0.20.2-2ubuntu2) quantal; urgency=low + + * debian/control: + - Have libpoppler-dev Depend on libpoppler-private-dev, to help with + the transition after the split of the two packages (inherited from + Debian). + + -- Michael Terry Wed, 18 Jul 2012 12:38:24 -0400 + +poppler (0.20.2-2ubuntu1) quantal; urgency=low + + * Merge with Debian, remaining Ubuntu changes: + * debian/control: + - Drop libopenjpeg-dev build depends, it's in universe. + - Lower poppler-data to Suggests, it's too big for CD images, + handled by language-selector. + + -- Iain Lane Mon, 16 Jul 2012 15:25:44 +0100 + poppler (0.20.2-2) experimental; urgency=low * Raise the version of the libpoppler-private-dev breaks/replaces against @@ -146,6 +315,23 @@ -- Pino Toscano Wed, 11 Jul 2012 23:51:35 +0200 +poppler (0.20.1-1ubuntu2) quantal; urgency=low + + * debian/control: + - Build-Depend on libtiff5-dev + + -- Michael Terry Tue, 10 Jul 2012 09:27:55 -0400 + +poppler (0.20.1-1ubuntu1) quantal; urgency=low + + * Merge with Debian, remaining Ubuntu changes: + * debian/control: + - Drop libopenjpeg-dev build depends, it's in universe. + - Lower poppler-data to Suggests, it's too big for CD images, + handled by language-selector. + + -- Robert Ancell Fri, 22 Jun 2012 14:50:04 +1200 + poppler (0.20.1-1) experimental; urgency=low * New upstream release. @@ -165,6 +351,12 @@ -- Pino Toscano Mon, 11 Jun 2012 15:14:29 +0200 +poppler (0.20.0-0ubuntu1) quantal-proposed; urgency=low + + * New upstream release + + -- 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. @@ -253,6 +445,30 @@ -- Pino Toscano Thu, 31 May 2012 15:24:07 +0200 +poppler (0.18.4-1ubuntu2) precise; urgency=low + + * debian/control: Add back libfontconfig1-dev dependency to libpoppler-dev + for the time being, to avoid introducing FTBFS at this point. This will be + dropped again later on when all reverse dependencies have their build deps + fixed. Thanks Pino Toscano for pointing this out! + + -- Martin Pitt Mon, 27 Feb 2012 08:56:28 +0100 + +poppler (0.18.4-1ubuntu1) precise; urgency=low + + * Merge with Debian experimental to get in sync with current Debian + packaging. Remaining Ubuntu changes: + - debian/control: Lower poppler-data to Suggests:. Too big for CD images, + handled by language-selector. + - debian/control: Drop libopenjpeg-dev build depends, it's in universe. + - 10_fix-a4-page-shift-on-brother-ps-printers.patch, + git_test_rotation.patch: See patch headers. + - Use LCMS 2 instead of deprecated 1: (LP #885324) + o Add poppler-lcm2.patch + o debian/control: Build-depend on liblcms2-dev instead. + + -- Martin Pitt Tue, 21 Feb 2012 15:04:08 +0100 + poppler (0.18.4-1) experimental; urgency=low * New upstream release. diff -ruN poppler-debian/debian/control poppler-0.24.4/debian/control --- poppler-debian/debian/control 2013-12-02 19:40:38.767475211 +0400 +++ poppler-0.24.4/debian/control 2013-12-02 19:39:02.322486106 +0400 @@ -1,7 +1,9 @@ Source: poppler Section: devel Priority: optional -Maintainer: Loic Minier +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Loic Minier +XS-Testsuite: autopkgtest Uploaders: Josselin Mouette , Dave Beckett , Ross Burton , @@ -13,8 +15,8 @@ libgtk2.0-dev (>= 2.12), libfontconfig1-dev, libqt4-dev (>= 4.4.0), + qtbase5-dev, libcairo2-dev (>= 1.10.0), - libopenjpeg-dev, libjpeg-dev, libpng-dev, libtiff-dev, @@ -32,14 +34,14 @@ 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 Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: poppler-data +Suggests: poppler-data Description: PDF rendering library Poppler is a PDF rendering library based on Xpdf PDF viewer. . @@ -48,7 +50,8 @@ Package: libpoppler-dev Architecture: any Section: libdevel -Depends: libpoppler43 (= ${binary:Version}), +Depends: libpoppler44 (= ${binary:Version}), + libpoppler-private-dev, ${shlibs:Depends}, ${misc:Depends} Description: PDF rendering library -- development files @@ -107,8 +110,8 @@ Depends: libglib2.0-doc, libcairo2-doc, ${misc:Depends} -Breaks: libpoppler-glib-dev (<< 0.22.5) -Replaces: libpoppler-glib-dev (<< 0.22.5) +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. . @@ -156,6 +159,32 @@ This package contains the headers and development libraries needed to build applications using the Qt 4-based Poppler interface. +Package: libpoppler-qt5-1 +Architecture: any +Section: libs +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: PDF rendering library (Qt 5 based shared library) + Poppler is a PDF rendering library based on Xpdf PDF viewer. + . + This package provides the Qt 5 based shared library for applications + using the Qt 5 interface to Poppler. + +Package: libpoppler-qt5-dev +Architecture: any +Section: libdevel +Depends: libpoppler-qt5-1 (= ${binary:Version}), + libpoppler-dev (= ${binary:Version}), + ${shlibs:Depends}, + ${misc:Depends} +Description: PDF rendering library -- development files (Qt 5 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 Qt 5-based Poppler interface. + Package: libpoppler-cpp0 Architecture: any Section: libs @@ -188,6 +217,7 @@ Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: ghostscript Breaks: xpdf-utils (<< 3.02-2~) Conflicts: pdftohtml Replaces: xpdf-utils (<< 3.02-2~), @@ -217,9 +247,8 @@ Architecture: any Section: debug Priority: extra -Multi-Arch: same 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-debian/debian/.gitattributes poppler-0.24.4/debian/.gitattributes --- poppler-debian/debian/.gitattributes 2013-12-02 19:40:38.731474846 +0400 +++ poppler-0.24.4/debian/.gitattributes 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -changelog merge=dpkg-mergechangelogs diff -ruN poppler-debian/debian/libpoppler43.docs poppler-0.24.4/debian/libpoppler43.docs --- poppler-debian/debian/libpoppler43.docs 2013-12-02 19:40:38.723474766 +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-debian/debian/libpoppler43.install poppler-0.24.4/debian/libpoppler43.install --- poppler-debian/debian/libpoppler43.install 2013-12-02 19:40:38.731474846 +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-debian/debian/libpoppler44.docs poppler-0.24.4/debian/libpoppler44.docs --- poppler-debian/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-debian/debian/libpoppler44.install poppler-0.24.4/debian/libpoppler44.install --- poppler-debian/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-debian/debian/libpoppler-qt4-4.symbols.in poppler-0.24.4/debian/libpoppler-qt4-4.symbols.in --- poppler-debian/debian/libpoppler-qt4-4.symbols.in 2013-12-02 19:40:38.719474725 +0400 +++ poppler-0.24.4/debian/libpoppler-qt4-4.symbols.in 2013-12-02 19:37:38.897606148 +0400 @@ -28,8 +28,8 @@ _ZN7Poppler10Annotation5Style12setLineStyleENS0_9LineStyleE@Base 0.20.1 _ZN7Poppler10Annotation5Style13setLineEffectENS0_10LineEffectE@Base 0.20.1 _ZN7Poppler10Annotation5Style18setEffectIntensityEd@Base 0.20.1 - (optional=gccinternal)_ZN7Poppler10Annotation5Style7PrivateC1ERKS2_@Base 0.20.1 - (optional=gccinternal)_ZN7Poppler10Annotation5Style7PrivateC2ERKS2_@Base 0.20.1 + (optional=gccinternal|arch=!amd64)_ZN7Poppler10Annotation5Style7PrivateC1ERKS2_@Base 0.20.1 + (optional=gccinternal|arch=!amd64)_ZN7Poppler10Annotation5Style7PrivateC2ERKS2_@Base 0.20.1 _ZN7Poppler10Annotation5Style8setColorERK6QColor@Base 0.20.1 _ZN7Poppler10Annotation5Style8setWidthEd@Base 0.20.1 _ZN7Poppler10Annotation5StyleC1ERKS1_@Base 0.20.1 @@ -396,7 +396,6 @@ _ZN7Poppler9LinkSoundD0Ev@Base 0.20.1 _ZN7Poppler9LinkSoundD1Ev@Base 0.20.1 _ZN7Poppler9LinkSoundD2Ev@Base 0.20.1 - (optional=templinst)_ZN7QVectorIfE7reallocEii@Base 0.20.1 _ZNK7Poppler10Annotation10uniqueNameEv@Base 0.20.1 _ZNK7Poppler10Annotation12creationDateEv@Base 0.20.1 _ZNK7Poppler10Annotation12revisionTypeEv@Base 0.20.1 diff -ruN poppler-debian/debian/libpoppler-qt5-1.install poppler-0.24.4/debian/libpoppler-qt5-1.install --- poppler-debian/debian/libpoppler-qt5-1.install 1970-01-01 03:00:00.000000000 +0300 +++ poppler-0.24.4/debian/libpoppler-qt5-1.install 2013-12-02 19:37:38.929606491 +0400 @@ -0,0 +1 @@ +usr/lib/*/libpoppler-qt5.so.1* diff -ruN poppler-debian/debian/libpoppler-qt5-dev.install poppler-0.24.4/debian/libpoppler-qt5-dev.install --- poppler-debian/debian/libpoppler-qt5-dev.install 1970-01-01 03:00:00.000000000 +0300 +++ poppler-0.24.4/debian/libpoppler-qt5-dev.install 2013-12-02 19:37:38.905606234 +0400 @@ -0,0 +1,4 @@ +usr/include/poppler/qt5 +usr/lib/*/libpoppler-qt5.a +usr/lib/*/libpoppler-qt5.so +usr/lib/*/pkgconfig/poppler-qt5.pc diff -ruN poppler-debian/debian/rules poppler-0.24.4/debian/rules --- poppler-debian/debian/rules 2013-12-02 19:40:38.727474807 +0400 +++ poppler-0.24.4/debian/rules 2013-12-02 19:39:45.746934892 +0400 @@ -32,6 +32,7 @@ --enable-cairo-output \ --enable-poppler-glib \ --enable-poppler-qt4 \ + --enable-poppler-qt5 \ --enable-poppler-cpp \ --enable-gtk-doc \ --enable-xpdf-headers \ @@ -63,14 +64,14 @@ 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-debian/debian/tests/build poppler-0.24.4/debian/tests/build --- poppler-debian/debian/tests/build 1970-01-01 03:00:00.000000000 +0300 +++ poppler-0.24.4/debian/tests/build 2013-12-02 19:37:38.921606405 +0400 @@ -0,0 +1,34 @@ +#!/bin/sh +# autopkgtest check: Build and run a program against libpoppler, to verify that the +# headers and pkg-config file are installed correctly +# (C) 2012 Canonical Ltd. +# Author: Daniel Kessel + +set -e + +WORKDIR=$(mktemp -d) +trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM +cd $WORKDIR +cat < libpopplertest.c +#include + +int main() +{ +#if !defined(GLIB_VERSION_2_36) + g_type_init(); +#endif + PopplerDocument* doc = poppler_document_new_from_file("file:///usr/share/cups/data/default-testpage.pdf", NULL, NULL); + g_assert(doc != NULL); + + int n_pages = poppler_document_get_n_pages(doc); + g_assert_cmpint(n_pages, == , 1); + + return 0; +} +EOF + +gcc -o libpopplertest libpopplertest.c `pkg-config --cflags --libs poppler-glib` -Wall -Werror +echo "build: OK" +[ -x libpopplertest ] +./libpopplertest +echo "run: OK" diff -ruN poppler-debian/debian/tests/control poppler-0.24.4/debian/tests/control --- poppler-debian/debian/tests/control 1970-01-01 03:00:00.000000000 +0300 +++ poppler-0.24.4/debian/tests/control 2013-12-02 19:37:38.921606405 +0400 @@ -0,0 +1,2 @@ +Tests: build +Depends: libpoppler-glib-dev, cups-filters, build-essential