diff -Nru poppler-23.08.0/debian/changelog poppler-23.08.0/debian/changelog
--- poppler-23.08.0/debian/changelog	2023-08-16 10:20:27.000000000 -0400
+++ poppler-23.08.0/debian/changelog	2023-08-16 18:31:57.000000000 -0400
@@ -1,3 +1,12 @@
+poppler (23.08.0-2ubuntu1) mantic; urgency=medium
+
+  * Merge from Debian experimental (LP: #2031572).  Remaining change:
+    - Don't build qt6 library on i386 since qt6 isn't available on
+      Ubuntu there
+  * Drop debian/patches/CVE-2023-34872.patch, fixed upstream.
+
+ -- Amin Bandali <bandali@ubuntu.com>  Wed, 16 Aug 2023 18:31:57 -0400
+
 poppler (23.08.0-2) experimental; urgency=medium
 
   * Team upload
@@ -30,6 +39,21 @@
 
  -- Amin Bandali <bandali@ubuntu.com>  Thu, 10 Aug 2023 17:27:57 -0400
 
+poppler (22.12.0-2ubuntu2) mantic; urgency=medium
+
+  * SECURITY UPDATE: DoS via crafted PDF file
+    - debian/patches/CVE-2023-34872.patch: fix crash in poppler/Outline.cc.
+    - CVE-2023-34872
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Wed, 02 Aug 2023 14:49:30 -0400
+
+poppler (22.12.0-2ubuntu1) lunar; urgency=medium
+
+  * Merge with Debian. Remaining change:
+  * Don't build qt6 library on i386 since qt6 isn't available on Ubuntu there
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Sat, 04 Feb 2023 19:24:11 -0500
+
 poppler (22.12.0-2) unstable; urgency=medium
 
   * Team upload
@@ -37,6 +61,18 @@
 
  -- Jeremy Bicha <jbicha@ubuntu.com>  Tue, 10 Jan 2023 16:36:05 -0500
 
+poppler (22.12.0-1ubuntu2) lunar; urgency=medium
+
+  * Rebuild
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Fri, 16 Dec 2022 16:50:58 -0500
+
+poppler (22.12.0-1ubuntu1) lunar; urgency=medium
+
+  * Don't build QT6 library on i386 since QT6 isn't available on Ubuntu there
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Fri, 16 Dec 2022 10:28:11 -0500
+
 poppler (22.12.0-1) experimental; urgency=medium
 
   * Team upload
diff -Nru poppler-23.08.0/debian/control poppler-23.08.0/debian/control
--- poppler-23.08.0/debian/control	2023-08-16 10:20:27.000000000 -0400
+++ poppler-23.08.0/debian/control	2023-08-16 17:43:51.000000000 -0400
@@ -1,7 +1,8 @@
 Source: poppler
 Section: devel
 Priority: optional
-Maintainer: Debian freedesktop.org maintainers <pkg-freedesktop-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian freedesktop.org maintainers <pkg-freedesktop-maintainers@lists.alioth.debian.org>
 Uploaders: Loic Minier <lool@dooz.org>,
            Pino Toscano <pino@debian.org>,
            Emilio Pozuelo Monfort <pochu@debian.org>,
@@ -25,7 +26,7 @@
                python3:any,
                libgirepository1.0-dev (>= 1.64.0),
                qtbase5-dev,
-               qt6-base-dev,
+               qt6-base-dev [!i386],
                zlib1g-dev,
                libnss3-dev,
 Build-Depends-Indep: libglib2.0-doc,
@@ -161,7 +162,7 @@
  build applications using the Qt 5-based Poppler interface.
 
 Package: libpoppler-qt6-3
-Architecture: any
+Architecture: alpha amd64 arc arm64 armel armhf hppa hurd-i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mipsel mips64el powerpc ppc64 ppc64el riscv64 s390x sh4 sparc64 x32
 Section: libs
 Multi-Arch: same
 Depends: libpoppler130 (= ${binary:Version}),
@@ -174,7 +175,7 @@
  using the Qt 6 interface to Poppler.
 
 Package: libpoppler-qt6-dev
-Architecture: any
+Architecture: alpha amd64 arc arm64 armel armhf hppa hurd-i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mipsel mips64el powerpc ppc64 ppc64el riscv64 s390x sh4 sparc64 x32
 Section: libdevel
 Multi-Arch: same
 Depends: libpoppler-qt6-3 (= ${binary:Version}),
diff -Nru poppler-23.08.0/debian/rules poppler-23.08.0/debian/rules
--- poppler-23.08.0/debian/rules	2023-08-16 10:20:27.000000000 -0400
+++ poppler-23.08.0/debian/rules	2023-08-16 17:47:51.000000000 -0400
@@ -19,7 +19,6 @@
 	-DENABLE_GPGME=OFF			\
 	-DENABLE_GLIB=ON			\
 	-DENABLE_QT5=ON				\
-	-DENABLE_QT6=ON				\
 	-DENABLE_CPP=ON				\
 	-DENABLE_GTK_DOC=ON			\
 	-DENABLE_UNSTABLE_API_ABI_HEADERS=ON	\
diff -Nru poppler-23.08.0/debian/tests/control poppler-23.08.0/debian/tests/control
--- poppler-23.08.0/debian/tests/control	2023-08-16 10:20:27.000000000 -0400
+++ poppler-23.08.0/debian/tests/control	2023-08-16 17:48:29.000000000 -0400
@@ -8,4 +8,5 @@
 Depends: build-essential, pkg-config, libpoppler-qt5-dev, cups-filters:native
 
 Tests: qt6
+Architecture: alpha amd64 arc arm64 armel armhf hppa hurd-i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mipsel mips64el powerpc ppc64 ppc64el riscv64 s390x sh4 sparc64 x32
 Depends: build-essential, pkg-config, libpoppler-qt6-dev, cups-filters:native