diff -pruN 0.7.0-10/debian/changelog 0.7.0-10ubuntu2/debian/changelog
--- 0.7.0-10/debian/changelog	2023-01-29 12:01:36.000000000 +0000
+++ 0.7.0-10ubuntu2/debian/changelog	2023-03-14 13:29:29.000000000 +0000
@@ -1,9 +1,29 @@
+jpeg-xl (0.7.0-10ubuntu2) lunar; urgency=medium
+
+  * Disable tcmalloc on i386 since google-perftools isn't available there.
+    See bug 2011582
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Tue, 14 Mar 2023 09:29:29 -0400
+
+jpeg-xl (0.7.0-10ubuntu1) lunar; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Export O2 on ppc64el to fix a build failure
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 30 Jan 2023 09:29:31 +0100
+
 jpeg-xl (0.7.0-10) unstable; urgency=medium
 
   * d/patches: Improve cjxl/djxl manpages. Closes: #1023641
 
  -- Mathieu Malaterre <malat@debian.org>  Sun, 29 Jan 2023 13:01:36 +0100
 
+jpeg-xl (0.7.0-9ubuntu1) lunar; urgency=medium
+
+  * Export O2 on ppc64el to fix a build failure
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 18 Jan 2023 00:27:11 +0100
+
 jpeg-xl (0.7.0-9) unstable; urgency=medium
 
   * d/tests: Adapt test to latest change
diff -pruN 0.7.0-10/debian/control 0.7.0-10ubuntu2/debian/control
--- 0.7.0-10/debian/control	2023-01-29 11:59:42.000000000 +0000
+++ 0.7.0-10ubuntu2/debian/control	2023-03-14 13:29:29.000000000 +0000
@@ -1,5 +1,6 @@
 Source: jpeg-xl
-Maintainer: Debian PhotoTools Maintainers <pkg-phototools-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian PhotoTools Maintainers <pkg-phototools-devel@lists.alioth.debian.org>
 Uploaders: Mathieu Malaterre <malat@debian.org>
 Section: graphics
 Priority: optional
@@ -15,7 +16,7 @@ Build-Depends: asciidoc-base,
                libgflags-dev,
                libgif-dev (>= 5.1),
                libgmock-dev <!nocheck>,
-               libgoogle-perftools-dev [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 riscv64],
+               libgoogle-perftools-dev [amd64 arm64 armel armhf mips64el mipsel ppc64el s390x kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 riscv64],
                libgtest-dev <!nocheck>,
                libhwy-dev (>= 1.0.2),
                libjpeg-dev,
diff -pruN 0.7.0-10/debian/control.in 0.7.0-10ubuntu2/debian/control.in
--- 0.7.0-10/debian/control.in	2023-01-29 11:59:42.000000000 +0000
+++ 0.7.0-10ubuntu2/debian/control.in	2023-03-14 13:29:29.000000000 +0000
@@ -1,5 +1,6 @@
 Source: jpeg-xl
-Maintainer: Debian PhotoTools Maintainers <pkg-phototools-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian PhotoTools Maintainers <pkg-phototools-devel@lists.alioth.debian.org>
 Uploaders: Mathieu Malaterre <malat@debian.org>
 Section: graphics
 Priority: optional
diff -pruN 0.7.0-10/debian/rules 0.7.0-10ubuntu2/debian/rules
--- 0.7.0-10/debian/rules	2023-01-29 11:59:42.000000000 +0000
+++ 0.7.0-10ubuntu2/debian/rules	2023-03-14 13:27:53.000000000 +0000
@@ -3,7 +3,7 @@
 include /usr/share/dpkg/default.mk
 
 # keep same order as https://buildd.debian.org/status/package.php?p=google-perftools&suite=sid
-TCMALLOC_ARCHS=amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 riscv64
+TCMALLOC_ARCHS=amd64 arm64 armel armhf mips64el mipsel ppc64el s390x kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 riscv64
 ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),$(TCMALLOC_ARCHS)))
   ENABLE_TCMALLOC=ON
 else
@@ -23,6 +23,10 @@ ifneq (,$(filter $(DEB_HOST_ARCH), armhf
   DEB_CXXFLAGS_MAINT_APPEND += -fno-tree-vectorize
 endif
 
+ifeq (ppc64el, $(DEB_HOST_ARCH))
+  DEB_CXXFLAGS_MAINT_APPEND += -O2
+endif
+
 ifneq (,$(filter $(DEB_HOST_ARCH), arm64 armel armhf ppc64el))
   # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77728
   DEB_CXXFLAGS_MAINT_APPEND += -Wno-psabi