=== modified file 'debian/changelog'
--- debian/changelog	2016-11-05 16:54:45 +0000
+++ debian/changelog	2016-11-05 17:41:31 +0000
@@ -1,3 +1,11 @@
+poppler (0.48.0-2ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge with Debian. (LP: #1639478) Remaining change:
+    - debian/rules:
+      + Use --disable-libopenjpeg since openjpeg2 is in universe
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Sat, 05 Nov 2016 12:56:03 -0400
+
 poppler (0.48.0-2) unstable; urgency=medium
 
   * Upload to unstable. (See #839869)

=== modified file 'debian/control'
--- debian/control	2016-11-05 16:54:45 +0000
+++ debian/control	2016-11-05 17:41:31 +0000
@@ -1,7 +1,8 @@
 Source: poppler
 Section: devel
 Priority: optional
-Maintainer: Loic Minier <lool@dooz.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Loic Minier <lool@dooz.org>
 Uploaders: Josselin Mouette <joss@debian.org>,
            Pino Toscano <pino@debian.org>
 Build-Depends: debhelper (>= 9),

=== modified file 'debian/rules'
--- debian/rules	2016-11-05 16:54:45 +0000
+++ debian/rules	2016-11-05 17:41:31 +0000
@@ -38,7 +38,7 @@
 	--enable-xpdf-headers			\
 	--enable-introspection=yes		\
 	--enable-cms=lcms2			\
-	--enable-libopenjpeg=openjpeg2		\
+	--disable-libopenjpeg			\
 	--disable-gtk-test
 
 %: