diff -pruN 4.8.0-1/debian/changelog 4.8.0-1ubuntu3/debian/changelog
--- 4.8.0-1/debian/changelog	2021-01-09 17:36:56.000000000 +0000
+++ 4.8.0-1ubuntu3/debian/changelog	2022-03-23 13:52:12.000000000 +0000
@@ -1,3 +1,26 @@
+findutils (4.8.0-1ubuntu3) jammy; urgency=medium
+
+  * No-change rebuild for ppc64el baseline bump.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Wed, 23 Mar 2022 14:52:12 +0100
+
+findutils (4.8.0-1ubuntu2) impish; urgency=medium
+
+  * No-change upload to build with binutils 2.37.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 14 Jul 2021 07:48:32 +0200
+
+findutils (4.8.0-1ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/control: add locate to XB-Cnf-Ignore-Commands so it is ignored
+      by command-not-found.
+
+  * Removed obsolete patches/merged by upstream:
+    - Cherrypick upstream gnulib testsuite fix for FTBFS with new glibc.
+
+ -- Dave Jones <dave.jones@canonical.com>  Sat, 09 Jan 2021 22:25:59 +0000
+
 findutils (4.8.0-1) unstable; urgency=medium
 
   * New upstream release.
@@ -39,6 +62,20 @@ findutils (4.7.0+git20201010-1) experime
 
  -- Andreas Metzler <ametzler@debian.org>  Sat, 24 Oct 2020 14:25:42 +0200
 
+findutils (4.7.0-1ubuntu2) groovy; urgency=medium
+
+  * Cherrypick upstream gnulib testsuite fix for FTBFS with new glibc.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 30 Sep 2020 00:31:44 +0100
+
+findutils (4.7.0-1ubuntu1) focal; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/control: add locate to XB-Cnf-Ignore-Commands so it is ignored
+      by command-not-found.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 17 Feb 2020 17:05:59 -0800
+
 findutils (4.7.0-1) unstable; urgency=low
 
   * Add A5189DB69C1164D33002936646502EF796917195 (Bernhard Voelker) to
@@ -67,6 +104,14 @@ findutils (4.6.0+git+20190505-1) experim
 
  -- Andreas Metzler <ametzler@debian.org>  Sat, 11 May 2019 18:41:48 +0200
 
+findutils (4.6.0+git+20190209-2ubuntu1) eoan; urgency=medium
+
+  * debian/control: add locate to XB-Cnf-Ignore-Commands so it is ignored by
+    command-not-found as mlocate provides the preferred locate command for
+    most users.
+
+ -- Brian Murray <brian@ubuntu.com>  Mon, 08 Jul 2019 12:00:27 -0700
+
 findutils (4.6.0+git+20190209-2) unstable; urgency=medium
 
   * Upload to unstable.
@@ -676,7 +721,6 @@ findutils (4.3.13-1) experimental; urgen
 
  -- Andreas Metzler <ametzler@debian.org>  Sat, 01 Mar 2008 12:34:04 +0100
 
-
 findutils (4.3.12-1) experimental; urgency=low
 
   * New upstream version
@@ -789,7 +833,6 @@ findutils (4.3.5-1) experimental; urgenc
 
  -- Andreas Metzler <ametzler@debian.org>  Sun, 13 May 2007 14:40:44 +0200
 
-
 findutils (4.2.33-1) unstable; urgency=low
 
   * New upstream version. (Translation updates and additions only.)
@@ -1548,51 +1591,31 @@ findutils (4.1-12) unstable; urgency=low
  -- Kevin Dalley <kevin@aimnet.com>  Wed, 23 Oct 1996 21:06:15 -0700
 
 Mon May 27 01:07:52 1996  Kevin Dalley  <kevin@aplysia.iway.aimnet.com (Kevin Dalley)>
-
 	* updatedb.sh: when NETPATHS is used, only su to NETUSER if whoami
 	is root
-
 	* debian.rules: now creates *.architecture.deb
 		 upgraded to Debian release 11
 	stopped rm of find.info*
-
 Sat Apr 27 12:29:06 1996  Kevin Dalley  <kevin@aplysia.iway.aimnet.com (Kevin Dalley)>
-
 	* find.info, find.info-1, find.info-2: updated to match find.texi
-
 	* debian.rules (debian): update debian revision to 10
-
 	* getline.c (getstr): verify that nchars_avail is *really* greater
 	than 0; set *n to a large enough number, stops some core dumping
-
 Mon Apr 15 05:06:15 1996  Kevin Dalley  <kevin@aplysia.iway.aimnet.com (Kevin Dalley)>
-
         * debian.rules: change to findutils-4.1-9
-
 	* configure: restore configure from autoconf version 2.1, which
 	was modified in findutils-4.1-7
-
 Sun Apr 14 00:09:13 1996  Kevin Dalley  <kevin@aplysia.iway.aimnet.com (Kevin Dalley)>
-
 * debian.control, debian.rules:
 	added architecture field, updated debian.rules, bumped version
-
 * find.texi, updatedb.sh:
 	added /amd, /net, /alex to list of files to be ignored
-
 Sun Feb 25 13:23:21 1996  Kevin Dalley  <kevin@aplysia.iway.aimnet.com (Kevin Dalley)>
-
 * debian.rules: finish variable changing of v, d, and p
-
 * updatedb.sh: ignore file type proc, remove proc from PRUNEPATHS
 	(this should *really* be changed in upstream package)
-
 * debian.rules: changed variables v and d to complete words version and debian
-
 * debian.control: deleted PACKAGE_REVISION field, modified version field
-
 * cron.find: cd to / before running updatedb
-
 Sun Jan 12 15:24:31 1997  Kevin Dalley  <kevin@aimnet.com>
-
 * debian/postinst: corrected permission for /var/lib/locate in postinst again.
diff -pruN 4.8.0-1/debian/control 4.8.0-1ubuntu3/debian/control
--- 4.8.0-1/debian/control	2021-01-07 17:21:05.000000000 +0000
+++ 4.8.0-1ubuntu3/debian/control	2021-01-09 22:25:59.000000000 +0000
@@ -1,7 +1,8 @@
 Source: findutils
 Section: utils
 Priority: required
-Maintainer: Andreas Metzler <ametzler@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Andreas Metzler <ametzler@debian.org>
 Uploaders: Chuan-kai Lin <cklin@debian.org>
 Build-Depends:
  bison,
@@ -47,3 +48,4 @@ Replaces: findutils (<< 4.2.31-2)
 Description: maintain and query an index of a directory tree
  updatedb generates an index of files and directories. GNU locate can be used
  to quickly query this index.
+XB-Cnf-Ignore-Commands: locate
