diff -upr ../deb/debian/changelog debian/changelog --- ../deb/debian/changelog 2016-06-09 17:14:51.000000000 -0400 +++ debian/changelog 2016-06-11 18:37:37.946459366 -0400 @@ -1,3 +1,21 @@ +poppler (0.44.0-3ubuntu1) UNRELEASED; urgency=medium + + * Merge with Debian. (LP: #1591528) Remaining changes: + - debian/control: + + Don't build-depend on libopenjp2-7-dev since it's in universe + - 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 + poppler (0.44.0-3) unstable; urgency=medium * Switch from OpenJPEG 1.x to 2.x: (Closes: #826825) diff -upr ../deb/debian/control debian/control --- ../deb/debian/control 2016-06-09 16:57:40.000000000 -0400 +++ debian/control 2016-06-11 11:42:50.429778791 -0400 @@ -1,7 +1,8 @@ Source: poppler Section: devel Priority: optional -Maintainer: Loic Minier +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Loic Minier Uploaders: Josselin Mouette , Pino Toscano Build-Depends: debhelper (>= 9), @@ -11,7 +12,7 @@ Build-Depends: debhelper (>= 9), 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, diff -upr ../deb/debian/rules debian/rules --- ../deb/debian/rules 2016-06-09 17:03:32.000000000 -0400 +++ debian/rules 2016-06-11 11:41:06.016514594 -0400 @@ -38,7 +38,7 @@ CONFIGURE_ARGS := \ --enable-xpdf-headers \ --enable-introspection=yes \ --enable-cms=lcms2 \ - --enable-libopenjpeg=openjpeg2 \ + --disable-libopenjpeg \ --disable-gtk-test %: