diff -pruN 2.9.1-1/debian/changelog 2.9.1-0ubuntu3/debian/changelog
--- 2.9.1-1/debian/changelog	2021-10-03 19:20:23.000000000 +0000
+++ 2.9.1-0ubuntu3/debian/changelog	2022-03-23 13:55:55.000000000 +0000
@@ -1,11 +1,35 @@
-google-perftools (2.9.1-1) unstable; urgency=medium
+google-perftools (2.9.1-0ubuntu3) jammy; urgency=medium
 
-  * New upstream release.
-  * Update watch file.
-  * Update debhelper level to 13 .
-  * Update Standards-Version to 4.6.0 .
+  * No-change rebuild for ppc64el baseline bump.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Wed, 23 Mar 2022 14:55:55 +0100
+
+google-perftools (2.9.1-0ubuntu2) impish; urgency=medium
+
+  * No-change rebuild to build packages with zstd compression.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 07 Oct 2021 12:12:18 +0200
+
+google-perftools (2.9.1-0ubuntu1) hirsute; urgency=medium
+
+  * New upstream version. LP: #1922048.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 31 Mar 2021 10:57:59 +0100
 
- -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Sun, 03 Oct 2021 21:20:23 +0200
+google-perftools (2.8.1-1ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/control: Use multiline syntax for Build-* fields.
+    - Build using -fno-strict-aliasing.
+    - Enable testing for all architectures by default.
+    - Build-depend on libunwind-dev on architectures where available.
+    - Disable libunwind on arm64 due to hangs.
+    - Ignore test results on arm64 and armhf.
+    - Fix wrong execute bit on .install file in packaging.
+  * Dropped changes, included upstream:
+    - debian/patches/riscv64-porting.patch: Enable building for riscv64.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 06 Jan 2021 17:55:16 -0800
 
 google-perftools (2.8.1-1) unstable; urgency=medium
 
@@ -13,6 +37,24 @@ google-perftools (2.8.1-1) unstable; urg
 
  -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Sat, 26 Dec 2020 11:41:19 +0100
 
+google-perftools (2.8-1ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/control: Use multiline syntax for Build-* fields.
+    - Build using -fno-strict-aliasing.
+    - Enable testing for all architectures by default.
+    - Build-depend on libunwind-dev on architectures where available.
+    - Disable libunwind on arm64 due to hangs.
+    - Ignore test results on arm64 and armhf.
+    - Fix wrong execute bit on .install file in packaging.
+    - debian/patches/riscv64-porting.patch: Enable building for riscv64.
+  * Dropped changes, included upstream:
+    - d/p/0001-liberate-gperftools-tests-from-relying-on-fno-builti.patch:
+      cherry-pick from upstream to fix build failures with current toolchain
+      related to -fno-builtin-XXX.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sat, 24 Oct 2020 17:03:09 -0700
+
 google-perftools (2.8-1) unstable; urgency=medium
 
   * New major upstream release:
@@ -31,6 +73,66 @@ google-perftools (2.7.90-1) experimental
 
  -- Laszlo Boszormenyi (GCS) <gcs@debian.org>  Thu, 26 Mar 2020 14:03:42 +0000
 
+google-perftools (2.7-1ubuntu6) groovy; urgency=medium
+
+  * Update debian/patches/riscv64-porting.patch for riscv64-specific syscall
+    constants and marshalling, and ucontext handling.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 08 Oct 2020 08:53:16 -0700
+
+google-perftools (2.7-1ubuntu5) groovy; urgency=medium
+
+  * debian/patches/riscv64-porting.patch: Enable building for riscv64.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 08 Oct 2020 07:40:55 -0700
+
+google-perftools (2.7-1ubuntu4) groovy; urgency=medium
+
+  * d/p/0001-liberate-gperftools-tests-from-relying-on-fno-builti.patch:
+    cherry-pick from upstream to fix build failures with current toolchain
+    related to -fno-builtin-XXX.  Thanks to Aliaksey Kandratsenka
+    <alkondratenko@gmail.com>.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 08 Oct 2020 06:26:23 -0700
+
+google-perftools (2.7-1ubuntu3) groovy; urgency=medium
+
+  * Omit libunwind on risvc64.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 06 Oct 2020 12:06:42 -0700
+
+google-perftools (2.7-1ubuntu2) focal; urgency=medium
+
+  * Fix wrong execute bit on .install file in packaging.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 19 Feb 2020 13:25:31 -0800
+
+google-perftools (2.7-1ubuntu1) focal; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/control: Use multiline syntax for Build-* fields.
+    - Build using -fno-strict-aliasing.
+    - Enable testing for all architectures by default.
+    - Build-depend on libunwind-dev on architectures where available.
+    - Disable libunwind on arm64 due to hangs.
+    - Ignore test results on arm64 and armhf.
+  * Dropped changes, included in Debian:
+    - Build-depend on libunwind-dev instead of libunwind8-dev, which is
+      now a transitional package.
+    - Build for s390x.
+    - Use 3.0 (quilt) format instead of cdbs' deprecated simple-patchsys.
+    - Rewrite packaging using debhelper sequencer.
+    - Build using recent autotools.
+  * Dropped changes, superseded in Debian:
+    - Don't try to install the profiler libraries on ppc64el.
+  * Dropped changes, included upstream:
+    - debian/patches/Use-initial-exec-tls-for-libunwind-s-recursion-flag.patch:
+      Use initial-exec tls for libunwind's recursion flag.
+    - Disable -fno-exceptions to fix test hangs on arm64.
+    - Fix ftbfs with glibc-2.27 on ppc64el.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 18 Feb 2020 12:16:55 -0800
+
 google-perftools (2.7-1) unstable; urgency=medium
 
   * New upstream release.
@@ -69,6 +171,39 @@ google-perftools (2.6.90-0.1~exp) experi
 
  -- YunQiang Su <syq@debian.org>  Wed, 21 Mar 2018 13:06:54 +0800
 
+google-perftools (2.5-2.2ubuntu3) bionic; urgency=medium
+
+  * Don't try to install the profiler libraries on ppc64el.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 25 Apr 2018 10:13:39 +0200
+
+google-perftools (2.5-2.2ubuntu2) bionic; urgency=medium
+
+  * Fix ftbfs with glibc-2.27 on ppc64el.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 23 Apr 2018 11:41:38 +0200
+
+google-perftools (2.5-2.2ubuntu1) artful; urgency=medium
+
+  * Merge from Debian. Remaining changes:
+    - debian/control: Use multiline syntax for Build-* fields.
+    - Use 3.0 (quilt) format instead of cdbs' deprecated simple-patchsys.
+    - Rewrite packaging using debhelper sequencer.
+    - Build using -fno-strict-aliasing.
+    - Build using recent autotools.
+    - Build for s390x.
+    - debian/patches/Use-initial-exec-tls-for-libunwind-s-recursion-flag.patch:
+      Use initial-exec tls for libunwind's recursion flag.
+  * Enable testing for all architectures by default.
+  * Build-depend on libunwind-dev instead of libunwind8-dev, which is
+    now a transitional package.
+  * Build-depend on libunwind-dev on architectures where available.
+  * Disable libunwind on arm64 due to hangs. (LP: #1595242)
+  * Disable -fno-exceptions to fix test hangs on arm64.
+  * Ignore test results on arm64 and armhf.
+
+ -- dann frazier <dannf@ubuntu.com>  Fri, 18 Aug 2017 16:36:56 -0600
+
 google-perftools (2.5-2.2) unstable; urgency=medium
 
   * Non-maintainer upload
@@ -104,6 +239,59 @@ google-perftools (2.5-1) unstable; urgen
 
  -- Daigo Moriwaki <daigo@debian.org>  Sun, 27 Nov 2016 14:28:33 +0900
 
+google-perftools (2.5-0ubuntu4) zesty; urgency=medium
+
+  * debian/patches/Use-initial-exec-tls-for-libunwind-s-recursion-flag.patch:
+    Use initial-exec tls for libunwind's recursion flag. (LP: #1647864) 
+
+ -- Chuck Short <zulcss@ubuntu.com>  Thu, 02 Feb 2017 13:17:47 -0500
+
+google-perftools (2.5-0ubuntu3) zesty; urgency=medium
+
+  * Don't run the tests on arm64, hanging the buildds.
+  * Ignore test results on armhf for a first build.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 13 Nov 2016 14:21:23 +0100
+
+google-perftools (2.5-0ubuntu2) zesty; urgency=medium
+
+  * New upstream version.
+  * Build for s390x.
+  * Build using recent autotools.
+  * Build-depend on libunwind-dev everywhere.
+  * Build using -fno-strict-aliasing.
+  * Bump standards version.
+  * Rewrite packaging using debhelper sequencer.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 30 Sep 2016 01:54:44 +0200
+
+google-perftools (2.4-0ubuntu5) xenial; urgency=medium
+
+  * Pass --add-missing to automake to fix build failure.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 06 Apr 2016 12:45:32 +0200
+
+google-perftools (2.4-0ubuntu4) wily; urgency=medium
+
+  * Build using GCC 5.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 08 Jul 2015 23:17:29 +0200
+
+google-perftools (2.4-0ubuntu2) wily; urgency=medium
+
+  * Re-enable the build on Aarch64.
+  * Disable the tests again on armhf and arm64.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 08 Jul 2015 23:14:30 +0200
+
+google-perftools (2.4-0ubuntu1) wily; urgency=medium
+
+  * New upstream version.
+  * Enable futexes on ARM32 (taken from Fedora).
+  * Enable tests everywhere for a first upload.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 08 Jul 2015 15:18:35 +0200
+
 google-perftools (2.2.1-0.3) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -278,7 +466,7 @@ google-perftools (0.98-1) unstable; urge
 google-perftools (0.91-1) unstable; urgency=low
 
   * New upstream release
-  * The hosting site of the upstream has been changed.
+  * The hosting site of the upstream has been changed. 
 
  -- Daigo Moriwaki <daigo@debian.org>  Sat, 12 May 2007 15:56:25 +0900
 
@@ -294,14 +482,14 @@ google-perftools (0.8-4) unstable; urgen
 
   * Fixed FTBFS (alpha) again. debian/patches/01_configure.ac_alpha.diff is no
     longer provided. Instead, configure.ac and configure are directly updated
-    to be correctly built. (Closes: #387401)
+    to be correctly built. (Closes: #387401)  
 
  -- Daigo Moriwaki <daigo@debian.org>  Thu, 14 Sep 2006 01:18:10 +0900
 
 google-perftools (0.8-3) unstable; urgency=low
 
   * Use DEB_AUTO_UPDATE_AUTOCONF to rebuild configure from patched
-    configure.ac.
+    configure.ac. 
   * Fixed debian/watch file.
 
  -- Daigo Moriwaki <daigo@debian.org>  Thu, 14 Sep 2006 00:09:39 +0900
@@ -344,3 +532,4 @@ google-perftools (0.1-1) unstable; urgen
   * Initial release.
 
  -- Google Inc. <opensource@google.com>  Fri, 11 Mar 2005 08:07:33 -0800
+
diff -pruN 2.9.1-1/debian/control 2.9.1-0ubuntu3/debian/control
--- 2.9.1-1/debian/control	2021-10-03 19:20:23.000000000 +0000
+++ 2.9.1-0ubuntu3/debian/control	2020-12-26 21:58:31.000000000 +0000
@@ -1,10 +1,14 @@
 Source: google-perftools
 Section: libs
 Priority: optional
-Maintainer: Laszlo Boszormenyi (GCS) <gcs@debian.org>
-Build-Depends: debhelper-compat (= 13), libunwind-dev [amd64]
-Build-Conflicts: autoconf2.13, automake1.4
-Standards-Version: 4.6.0
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Laszlo Boszormenyi (GCS) <gcs@debian.org>
+Build-Depends: debhelper-compat (= 11),
+  libunwind-dev [!arm64 !s390x !riscv64],
+Build-Conflicts: autoconf2.13,
+  automake1.4,
+  libunwind-dev [arm64],
+Standards-Version: 4.5.0
 Homepage: https://github.com/gperftools/gperftools
 Vcs-Git: https://salsa.debian.org/debian/google-perftools.git
 Vcs-Browser: https://salsa.debian.org/debian/google-perftools
diff -pruN 2.9.1-1/debian/rules 2.9.1-0ubuntu3/debian/rules
--- 2.9.1-1/debian/rules	2021-10-03 19:20:23.000000000 +0000
+++ 2.9.1-0ubuntu3/debian/rules	2021-03-31 09:40:59.000000000 +0000
@@ -6,7 +6,13 @@
 
 include /usr/share/dpkg/architecture.mk
 
-TEST_ARCHS = i386 amd64
+TEST_SKIP_ARCHS=
+TEST_IGNORE_ARCHS=arm64 armhf
+
+export DEB_BUILD_MAINT_OPTIONS = optimize=-lto
+
+export DEB_CFLAGS_MAINT_APPEND = -fno-strict-aliasing
+export DEB_CXXFLAGS_MAINT_APPEND = -fno-strict-aliasing
 
 DESTDIR = $(CURDIR)/debian/tmp
 
@@ -29,13 +35,17 @@ override_dh_auto_install:
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
-# List of architectures for which test execution is enabled
-ifneq (,$(findstring $(DEB_HOST_ARCH), $(TEST_ARCHS)))
-	$(MAKE) check
-endif # TEST_ARCHS
+    ifneq (,$(findstring $(DEB_HOST_ARCH), $(TEST_SKIP_ARCHS)))
+	@echo Skip running the tests on $(DEB_HOST_ARCH), hanging the buildds
+    else ifneq (,$(findstring $(DEB_HOST_ARCH), $(TEST_IGNORE_ARCHS)))
+	-dh_auto_test --no-parallel
+	@echo Ignoring test results on $(DEB_HOST_ARCH)
+    else
+	dh_auto_test --no-parallel
+    endif
 endif # nocheck
 
 %:
-	dh $@
+	dh $@ --list-missing
 
 .PHONY: override_dh_auto_install override_dh_auto_test
diff -pruN 2.9.1-1/debian/watch 2.9.1-0ubuntu3/debian/watch
--- 2.9.1-1/debian/watch	2021-10-03 19:20:23.000000000 +0000
+++ 2.9.1-0ubuntu3/debian/watch	2020-12-26 21:58:31.000000000 +0000
@@ -1,5 +1,2 @@
-version=4
-opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/,\
-dversionmangle=s/\+(debian|dfsg|ds|deb)(\.?\d+)?$// \
-https://github.com/gperftools/gperftools/tags \
-(?:|.*/)gperftools-v?(\d\S*)@ARCHIVE_EXT@
+version=3
+https://github.com/gperftools/gperftools/tags .*/gperftools-(.+)\.tar\.gz
