diff -pruN 2.116.3/debian/changelog 2.116.3ubuntu1/debian/changelog
--- 2.116.3/debian/changelog	2023-02-05 08:10:20.000000000 +0000
+++ 2.116.3ubuntu1/debian/changelog	2023-02-10 00:39:23.000000000 +0000
@@ -1,3 +1,22 @@
+lintian (2.116.3ubuntu1) lunar; urgency=medium
+
+  * Merge from Debian Unstable, remaining changes:
+    - Fix building udebs, now that in Ubuntu noudebs is implied profile
+      (LP: #1918120).
+    - Add zst as allowed compression for .deb & .udeb although we don't
+      actually ship udeb packages that support zst (LP: #1923845).
+    - Add AC_INIT in
+      macro-not-cross-compilation-safe/build-spec/orig/src/configure.ac
+      (LP: #1950989).
+    - Add -fPIC ld flags to
+      checks/binaries/prerequisites/numpy/binaries-missing-depends-on-numpy-abi
+    - macro-not-cross-compilation-safe is expecting line one, we added AC_INIT
+      so it should now match line three.
+    - Ubuntu enables LTO by default, so without-fat-lto-objects is expected to
+      fail.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 09 Feb 2023 18:39:23 -0600
+
 lintian (2.116.3) unstable; urgency=medium
 
   The "FFP3 (Fixing False Positives, Three Small Changes)" Release.
@@ -15,6 +34,25 @@ lintian (2.116.3) unstable; urgency=medi
 
  -- Axel Beckert <abe@debian.org>  Sun, 05 Feb 2023 09:10:20 +0100
 
+lintian (2.116.2ubuntu1) lunar; urgency=medium
+
+  * Merge from Debian Unstable, remaining changes:
+    - Fix building udebs, now that in Ubuntu noudebs is implied profile
+      (LP: #1918120).
+    - Add zst as allowed compression for .deb & .udeb although we don't
+      actually ship udeb packages that support zst (LP: #1923845).
+    - Add AC_INIT in
+      macro-not-cross-compilation-safe/build-spec/orig/src/configure.ac
+      (LP: #1950989).
+    - Add -fPIC ld flags to
+      checks/binaries/prerequisites/numpy/binaries-missing-depends-on-numpy-abi
+    - macro-not-cross-compilation-safe is expecting line one, we added AC_INIT
+      so it should now match line three.
+    - Ubuntu enables LTO by default, so without-fat-lto-objects is expected to
+      fail.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sun, 29 Jan 2023 14:00:59 -0600
+
 lintian (2.116.2) unstable; urgency=medium
 
   The "FFP2 (Fixing False Positives, too)" Release.
@@ -74,6 +112,31 @@ lintian (2.116.2) unstable; urgency=medi
 
  -- Axel Beckert <abe@debian.org>  Sun, 29 Jan 2023 09:32:16 +0100
 
+lintian (2.116.1ubuntu3) lunar; urgency=medium
+
+  * Fix test failures:
+    - macro-not-cross-compilation-safe is expecting line one, we added AC_INIT
+      so it should now match line three.
+    - Ubuntu enables LTO by default, so without-fat-lto-objects is expected to
+      fail.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 23 Jan 2023 13:33:27 -0600
+
+lintian (2.116.1ubuntu1) lunar; urgency=medium
+
+  * Merge from Debian Unstable, remaining changes:
+    - Fix building udebs, now that in Ubuntu noudebs is implied profile
+      (LP: #1918120).
+    - Add zst as allowed compression for .deb & .udeb although we don't
+      actually ship udeb packages that support zst (LP: #1923845).
+    - Add AC_INIT in
+      macro-not-cross-compilation-safe/build-spec/orig/src/configure.ac
+      (LP: #1950989).
+    - Add -fPIC ld flags to
+      checks/binaries/prerequisites/numpy/binaries-missing-depends-on-numpy-abi
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 23 Jan 2023 10:55:33 -0600
+
 lintian (2.116.1) unstable; urgency=medium
 
   The "No More Neglected Autopkgtest Architectures" Release.
@@ -107,6 +170,21 @@ lintian (2.116.1) unstable; urgency=medi
 
  -- Axel Beckert <abe@debian.org>  Mon, 23 Jan 2023 03:32:04 +0100
 
+lintian (2.116.0ubuntu1) lunar; urgency=medium
+
+  * Merge from Debian unstable, remaining changes:
+    - Fix building udebs, now that in Ubuntu noudebs is implied profile
+      (LP: #1918120).
+    - Add zst as allowed compression for .deb & .udeb although we don't
+      actually ship udeb packages that support zst (LP: #1923845).
+    - Add AC_INIT in
+      macro-not-cross-compilation-safe/build-spec/orig/src/configure.ac
+      (LP: #1950989).
+    - Add -fPIC ld flags to
+      checks/binaries/prerequisites/numpy/binaries-missing-depends-on-numpy-abi
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 19 Jan 2023 18:27:11 -0600
+
 lintian (2.116.0) unstable; urgency=medium
 
   The "Crowd Merging" Release.
@@ -285,6 +363,39 @@ lintian (2.116.0) unstable; urgency=medi
 
  -- Axel Beckert <abe@debian.org>  Tue, 17 Jan 2023 01:37:56 +0100
 
+lintian (2.115.3ubuntu3) lunar; urgency=medium
+
+  * Welcome to the Lunar Lobster!
+    - Merge request: https://salsa.debian.org/lintian/lintian/-/merge_requests/421
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 28 Oct 2022 13:35:20 -0500
+
+lintian (2.115.3ubuntu2) kinetic; urgency=medium
+
+  * Explicitly prefer lzip in Ubuntu, not plzip
+
+ -- Steve Langasek <vorlon@debian.org>  Fri, 23 Sep 2022 22:20:36 +0000
+
+lintian (2.115.3ubuntu1) kinetic; urgency=medium
+
+  * Merge from Debian unstable, remaining changes:
+    - Fix building udebs, now that in Ubuntu noudebs is implied profile
+      (LP: #1918120)
+    - Add zst as allowed compression for .deb & .udeb although we don't
+      actually ship udeb package that supports zst. (LP: #1923845)
+    - Add AC_INIT in
+      macro-not-cross-compilation-safe/build-spec/orig/src/configure.ac
+      (LP: #1950989)
+    - Add -fPIC ld flags to
+      checks/binaries/prerequisites/numpy/binaries-missing-depends-on-numpy-abi
+  * Dropped changes, included in Debian:
+    - Remove the libio-prompt-tiny-perl dependency as it isn't
+      used in any Perl file in the final package (LP: #1959004)
+    - Add libio-prompt-tiny-perl dependency to test, otherwise autopkgtests
+      fails.
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Thu, 01 Sep 2022 06:20:15 +0000
+
 lintian (2.115.3) unstable; urgency=medium
 
   The "RPB (Restore Previous Behavior)" Release.
@@ -352,6 +463,27 @@ lintian (2.115.2) unstable; urgency=medi
 
  -- Axel Beckert <abe@debian.org>  Wed, 29 Jun 2022 02:56:42 +0200
 
+lintian (2.115.1ubuntu1) kinetic; urgency=medium
+
+  * Merge from Debian Sid. Remaining changes:
+    - Fix building udebs, now that in Ubuntu noudebs is implied profile
+      (LP: #1918120)
+    - Add zst as allowed compression for .deb & .udeb although we don't
+      actually ship udeb package that supports zst. (LP: #1923845)
+    - Add AC_INIT in
+      macro-not-cross-compilation-safe/build-spec/orig/src/configure.ac
+      (LP: #1950989)
+    - Remove the libio-prompt-tiny-perl dependency as it isn't
+      used in any Perl file in the final package (LP: #1959004)
+    - Add libio-prompt-tiny-perl dependency to test, otherwise autopkgtests
+      fails.
+    - Add -fPIC ld flags to
+      checks/binaries/prerequisites/numpy/binaries-missing-depends-on-numpy-abi
+    - Dropped changes:
+      + Add "kinetic" as a known Ubuntu distribution.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sun, 26 Jun 2022 22:38:12 -0500
+
 lintian (2.115.1) unstable; urgency=medium
 
   The "Things we never tested" Release.
@@ -570,6 +702,31 @@ lintian (2.115.0) unstable; urgency=medi
 
  -- Axel Beckert <abe@debian.org>  Mon, 20 Jun 2022 13:23:02 +0200
 
+lintian (2.114.0ubuntu2) kinetic; urgency=medium
+
+  * Add "kinetic" as a known Ubuntu distribution.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 29 Apr 2022 03:57:29 -0500
+
+lintian (2.114.0ubuntu1) jammy; urgency=medium
+
+  * Merge with Debian unstable (LP: #1957100). Remaining changes:
+    - Fix building udebs, now that in Ubuntu noudebs is implied profile
+      (LP: #1918120)
+    - Add zst as allowed compression for .deb & .udeb although we don't
+      actually ship udeb package that supports zst. (LP: #1923845)
+    - Add AC_INIT in
+      macro-not-cross-compilation-safe/build-spec/orig/src/configure.ac
+      (LP: #1950989)
+    - Remove the libio-prompt-tiny-perl dependency as it isn't
+      used in any Perl file in the final package (LP: #1959004)
+  * Add libio-prompt-tiny-perl dependency to test, otherwise autopkgtests
+    fails.
+  * Add -fPIC ld flags to
+    checks/binaries/prerequisites/numpy/binaries-missing-depends-on-numpy-abi/
+
+ -- Alexandre Ghiti <alexandre.ghiti@canonical.com>  Tue, 22 Feb 2022 13:44:59 +0100
+
 lintian (2.114.0) unstable; urgency=medium
 
   [ Felix Lechner ]
@@ -699,6 +856,31 @@ lintian (2.112.0) unstable; urgency=medi
 
  -- Chris Lamb <lamby@debian.org>  Sat, 13 Nov 2021 15:25:15 +0000
 
+lintian (2.111.0ubuntu3) jammy; urgency=medium
+
+  * Remove the libio-prompt-tiny-perl dependency as it isn't
+    used in any Perl file in the final package (LP: #1959004)
+
+ -- Simon Chopin <simon.chopin@canonical.com>  Tue, 25 Jan 2022 15:25:15 +0100
+
+lintian (2.111.0ubuntu2) jammy; urgency=medium
+
+  * Add AC_INIT in
+    macro-not-cross-compilation-safe/build-spec/orig/src/configure.ac
+    (LP: #1950989)
+
+ -- Heinrich Schuchardt <heinrich.schuchardt@canonical.com>  Mon, 15 Nov 2021 13:09:34 +0100
+
+lintian (2.111.0ubuntu1) jammy; urgency=medium
+
+  * Merge from Debian Sid. Remaining changes:
+    - Fix building udebs, now that in Ubuntu noudebs is implied profile
+      (LP: #1918120).
+    - Add zst as allowed compression for .deb & .udeb. Although we don't
+      actually ship udeb package that supports zst. (LP: #1923845)
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 11 Nov 2021 05:26:06 -0600
+
 lintian (2.111.0) unstable; urgency=medium
 
   * Summary of tag changes:
@@ -720,6 +902,17 @@ lintian (2.111.0) unstable; urgency=medi
 
  -- Chris Lamb <lamby@debian.org>  Sat, 30 Oct 2021 09:03:59 +0000
 
+lintian (2.110.0ubuntu1) jammy; urgency=medium
+
+  * Merge from Debian Sid. Remaining changes:
+    - Fix building udebs, now that in Ubuntu noudebs is implied profile
+      (LP: #1918120).
+    - Add zst as allowed compression for .deb & .udeb. Although we don't
+      actually ship udeb package that supports zst. (LP: #1923845)
+  * Add "jammy" as a known Ubuntu distribution.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 27 Oct 2021 04:01:49 -0500
+
 lintian (2.110.0) unstable; urgency=medium
 
   * Summary of tag changes:
@@ -1087,6 +1280,26 @@ lintian (2.105.0) unstable; urgency=medi
 
  -- Chris Lamb <lamby@debian.org>  Tue, 07 Sep 2021 09:43:56 +0000
 
+lintian (2.104.0ubuntu3) impish; urgency=medium
+
+  * Add zst as allowed compression for .deb & .udeb. Although we don't
+    actually ship udeb package that supports zst. LP: #1923845
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 15 Jun 2021 10:42:12 +0100
+
+lintian (2.104.0ubuntu2) hirsute; urgency=medium
+
+  * Teach lintian that impish is a valid Ubuntu release. (LP: #1928392)
+
+ -- Brian Murray <brian@ubuntu.com>  Thu, 13 May 2021 14:51:42 -0700
+
+lintian (2.104.0ubuntu1) hirsute; urgency=medium
+
+  * Fix building udebs, now that in Ubuntu noudebs is implied profile. LP:
+    #1918120
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 18 Mar 2021 14:09:46 +0000
+
 lintian (2.104.0) unstable; urgency=medium
 
   [ Baptiste Beauplat ]
diff -pruN 2.116.3/debian/control 2.116.3ubuntu1/debian/control
--- 2.116.3/debian/control	2023-01-28 20:31:11.000000000 +0000
+++ 2.116.3ubuntu1/debian/control	2023-02-05 15:45:58.000000000 +0000
@@ -1,7 +1,8 @@
 Source: lintian
 Section: devel
 Priority: optional
-Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
 Uploaders:
  Axel Beckert <abe@debian.org>,
  Bastien Roucariès <rouca@debian.org>
@@ -135,7 +136,7 @@ Depends:
  libwww-perl,
  libxml-libxml-perl,
  libyaml-libyaml-perl,
- plzip | lzip-decompressor,
+ lzip | lzip-decompressor,
  lzop,
  man-db,
  patchutils,
diff -pruN 2.116.3/lib/Lintian/Check/DebFormat.pm 2.116.3ubuntu1/lib/Lintian/Check/DebFormat.pm
--- 2.116.3/lib/Lintian/Check/DebFormat.pm	2022-07-02 13:47:11.000000000 +0000
+++ 2.116.3ubuntu1/lib/Lintian/Check/DebFormat.pm	2023-02-05 15:48:29.000000000 +0000
@@ -133,13 +133,13 @@ sub installable {
         } else {
             if (
                 $ctrl_member !~ m{\A
-                     control\.tar(?:\.(?:gz|xz))?  \Z}xsm
+                     control\.tar(?:\.(?:gz|xz|zst))?  \Z}xsm
             ) {
                 $self->hint(
                     'malformed-deb-archive',
                     join($SPACE,
                         "second (official) member $ctrl_member",
-                        'not control.tar.(gz|xz)')
+                        'not control.tar.(gz|xz|zst)')
                 );
                 $failed = 1;
             } elsif ($ctrl_member eq 'control.tar') {
@@ -158,14 +158,14 @@ sub installable {
         } else {
             if (
                 $data_member !~ m{\A
-                     data\.tar(?:\.(?:gz|bz2|xz|lzma))?  \Z}xsm
+                     data\.tar(?:\.(?:gz|bz2|xz|lzma|zst))?  \Z}xsm
             ) {
                 # wasn't okay after all
                 $self->hint(
                     'malformed-deb-archive',
                     join($SPACE,
                         "third (official) member $data_member",
-                        'not data.tar.(gz|xz|bz2|lzma)')
+                        'not data.tar.(gz|xz|bz2|lzma|zst)')
                 );
                 $failed = 1;
             } elsif ($self->processable->type eq 'udeb'
diff -pruN 2.116.3/t/recipes/checks/binaries/prerequisites/numpy/binaries-missing-depends-on-numpy-abi/build-spec/debian/rules 2.116.3ubuntu1/t/recipes/checks/binaries/prerequisites/numpy/binaries-missing-depends-on-numpy-abi/build-spec/debian/rules
--- 2.116.3/t/recipes/checks/binaries/prerequisites/numpy/binaries-missing-depends-on-numpy-abi/build-spec/debian/rules	2021-12-29 12:24:44.000000000 +0000
+++ 2.116.3ubuntu1/t/recipes/checks/binaries/prerequisites/numpy/binaries-missing-depends-on-numpy-abi/build-spec/debian/rules	2023-02-05 15:46:04.000000000 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
-export DEB_LDFLAGS_MAINT_APPEND=-Wl,--no-as-needed
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,--no-as-needed -fPIC
 
 %:
 	dh $@ --buildsystem pybuild
diff -pruN 2.116.3/t/recipes/checks/build-systems/autotools/macro-not-cross-compilation-safe/build-spec/orig/src/configure.ac 2.116.3ubuntu1/t/recipes/checks/build-systems/autotools/macro-not-cross-compilation-safe/build-spec/orig/src/configure.ac
--- 2.116.3/t/recipes/checks/build-systems/autotools/macro-not-cross-compilation-safe/build-spec/orig/src/configure.ac	2021-09-28 15:52:27.000000000 +0000
+++ 2.116.3ubuntu1/t/recipes/checks/build-systems/autotools/macro-not-cross-compilation-safe/build-spec/orig/src/configure.ac	2023-02-05 15:46:22.000000000 +0000
@@ -1 +1,3 @@
+AC_INIT
+
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
diff -pruN 2.116.3/t/recipes/checks/build-systems/autotools/macro-not-cross-compilation-safe/eval/hints 2.116.3ubuntu1/t/recipes/checks/build-systems/autotools/macro-not-cross-compilation-safe/eval/hints
--- 2.116.3/t/recipes/checks/build-systems/autotools/macro-not-cross-compilation-safe/eval/hints	2022-07-02 13:47:11.000000000 +0000
+++ 2.116.3ubuntu1/t/recipes/checks/build-systems/autotools/macro-not-cross-compilation-safe/eval/hints	2023-02-05 15:46:22.000000000 +0000
@@ -1,2 +1,2 @@
-macro-not-cross-compilation-safe (source): autotools-pkg-config-macro-not-cross-compilation-safe AC_PATH_PROG [src/configure.ac:1]
+macro-not-cross-compilation-safe (source): autotools-pkg-config-macro-not-cross-compilation-safe AC_PATH_PROG [src/configure.ac:3]
 macro-not-cross-compilation-safe (source): autotools-pkg-config-macro-not-cross-compilation-safe AC_PATH_PROG [configure.ac:3]
diff -pruN 2.116.3/t/recipes/checks/debian/shlibs/shared-libs-non-pic-i386/build-spec/Makefile.in 2.116.3ubuntu1/t/recipes/checks/debian/shlibs/shared-libs-non-pic-i386/build-spec/Makefile.in
--- 2.116.3/t/recipes/checks/debian/shlibs/shared-libs-non-pic-i386/build-spec/Makefile.in	2021-12-29 12:24:44.000000000 +0000
+++ 2.116.3ubuntu1/t/recipes/checks/debian/shlibs/shared-libs-non-pic-i386/build-spec/Makefile.in	2023-02-05 15:47:34.000000000 +0000
@@ -39,9 +39,9 @@ product = [% $build_product %]
 upload_type = [% $upload_type %]
 
 ifeq ($(upload_type),source)
-extraflags = -S
+extraflags = -S --build-profiles='!noudeb'
 else
-extraflags =
+extraflags = --build-profiles='!noudeb'
 endif
 
 .DEFAULT_GOAL := $(product)
diff -pruN 2.116.3/t/recipes/checks/libraries/shared/relocation/shared-libs-non-pic-i386/build-spec/Makefile.in 2.116.3ubuntu1/t/recipes/checks/libraries/shared/relocation/shared-libs-non-pic-i386/build-spec/Makefile.in
--- 2.116.3/t/recipes/checks/libraries/shared/relocation/shared-libs-non-pic-i386/build-spec/Makefile.in	2021-12-29 12:24:44.000000000 +0000
+++ 2.116.3ubuntu1/t/recipes/checks/libraries/shared/relocation/shared-libs-non-pic-i386/build-spec/Makefile.in	2023-02-05 15:48:19.000000000 +0000
@@ -39,9 +39,9 @@ product = [% $build_product %]
 upload_type = [% $upload_type %]
 
 ifeq ($(upload_type),source)
-extraflags = -S
+extraflags = -S --build-profiles='!noudeb'
 else
-extraflags =
+extraflags = --build-profiles='!noudeb'
 endif
 
 .DEFAULT_GOAL := $(product)
diff -pruN 2.116.3/t/recipes/checks/libraries/static/no-code/without-fat-lto-objects/build-spec/debian/control.in 2.116.3ubuntu1/t/recipes/checks/libraries/static/no-code/without-fat-lto-objects/build-spec/debian/control.in
--- 2.116.3/t/recipes/checks/libraries/static/no-code/without-fat-lto-objects/build-spec/debian/control.in	2022-07-02 13:47:11.000000000 +0000
+++ 2.116.3ubuntu1/t/recipes/checks/libraries/static/no-code/without-fat-lto-objects/build-spec/debian/control.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-Source: [% $source %]
-Priority: optional
-Section: libs
-Maintainer: [% $author %]
-Standards-Version: [% $standards_version %]
-Build-Depends: [% $build_depends %]
-Rules-Requires-Root: no
-
-Package: libfoo-dev
-Architecture: [% $package_architecture %]
-Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: [% $description %]
- This is a test package designed to exercise some feature or tag of
- Lintian.  It is part of the Lintian test suite and may do very odd
- things.  It should not be installed like a regular package.
diff -pruN 2.116.3/t/recipes/checks/libraries/static/no-code/without-fat-lto-objects/build-spec/debian/rules 2.116.3ubuntu1/t/recipes/checks/libraries/static/no-code/without-fat-lto-objects/build-spec/debian/rules
--- 2.116.3/t/recipes/checks/libraries/static/no-code/without-fat-lto-objects/build-spec/debian/rules	2022-07-02 13:47:11.000000000 +0000
+++ 2.116.3ubuntu1/t/recipes/checks/libraries/static/no-code/without-fat-lto-objects/build-spec/debian/rules	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-#!/usr/bin/make -f
-
-%:
-	dh $@
-
-override_dh_strip:
-	# Don't strip :)
diff -pruN 2.116.3/t/recipes/checks/libraries/static/no-code/without-fat-lto-objects/build-spec/fill-values 2.116.3ubuntu1/t/recipes/checks/libraries/static/no-code/without-fat-lto-objects/build-spec/fill-values
--- 2.116.3/t/recipes/checks/libraries/static/no-code/without-fat-lto-objects/build-spec/fill-values	2022-07-02 13:47:11.000000000 +0000
+++ 2.116.3ubuntu1/t/recipes/checks/libraries/static/no-code/without-fat-lto-objects/build-spec/fill-values	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-Testname: without-fat-lto-objects
-Package-Architecture: any
-Skeleton: upload-non-native
-Description: Static library built with -flto=auto, but without -ffat-lto-objects
diff -pruN 2.116.3/t/recipes/checks/libraries/static/no-code/without-fat-lto-objects/build-spec/orig/Makefile 2.116.3ubuntu1/t/recipes/checks/libraries/static/no-code/without-fat-lto-objects/build-spec/orig/Makefile
--- 2.116.3/t/recipes/checks/libraries/static/no-code/without-fat-lto-objects/build-spec/orig/Makefile	2022-07-02 13:47:11.000000000 +0000
+++ 2.116.3ubuntu1/t/recipes/checks/libraries/static/no-code/without-fat-lto-objects/build-spec/orig/Makefile	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-CC=gcc
-CFLAGS+= -g -flto=auto
-LIBFILES:= libcodeless.a
-
-all: $(LIBFILES)
-
-libcodeless.a: code.o
-	ar rcs -o $@ $^
-
-clean:
-	rm -f *.a *.o
-
-install: all
-	install -m 0755 -d $(DESTDIR)/usr/lib
-	install -m 0644 *.a $(DESTDIR)/usr/lib
-
-.PHONY: install clean
diff -pruN 2.116.3/t/recipes/checks/libraries/static/no-code/without-fat-lto-objects/build-spec/orig/code.c 2.116.3ubuntu1/t/recipes/checks/libraries/static/no-code/without-fat-lto-objects/build-spec/orig/code.c
--- 2.116.3/t/recipes/checks/libraries/static/no-code/without-fat-lto-objects/build-spec/orig/code.c	2022-07-02 13:47:11.000000000 +0000
+++ 2.116.3ubuntu1/t/recipes/checks/libraries/static/no-code/without-fat-lto-objects/build-spec/orig/code.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-#include <stdlib.h>
-#include <math.h>
-#include "code.h"
-
-double e(void (*f)(char *)){
-  char tmp[10];
-  double x;
-  f(tmp);
-  x = atof(tmp);
-  return exp(x);
-}
-
-
diff -pruN 2.116.3/t/recipes/checks/libraries/static/no-code/without-fat-lto-objects/build-spec/orig/code.h 2.116.3ubuntu1/t/recipes/checks/libraries/static/no-code/without-fat-lto-objects/build-spec/orig/code.h
--- 2.116.3/t/recipes/checks/libraries/static/no-code/without-fat-lto-objects/build-spec/orig/code.h	2022-07-02 13:47:11.000000000 +0000
+++ 2.116.3ubuntu1/t/recipes/checks/libraries/static/no-code/without-fat-lto-objects/build-spec/orig/code.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-#ifndef CODE_H_
-#define CODE_H_
-
-double e(void (*f)(char *));
-
-double energy(double mass);
-
-#endif
diff -pruN 2.116.3/t/recipes/checks/libraries/static/no-code/without-fat-lto-objects/eval/desc 2.116.3ubuntu1/t/recipes/checks/libraries/static/no-code/without-fat-lto-objects/eval/desc
--- 2.116.3/t/recipes/checks/libraries/static/no-code/without-fat-lto-objects/eval/desc	2022-07-02 13:47:11.000000000 +0000
+++ 2.116.3ubuntu1/t/recipes/checks/libraries/static/no-code/without-fat-lto-objects/eval/desc	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-Testname: without-fat-lto-objects
-Check: libraries/static/no-code
-See-Also:
- Bug#977596
diff -pruN 2.116.3/t/recipes/checks/libraries/static/no-code/without-fat-lto-objects/eval/hints 2.116.3ubuntu1/t/recipes/checks/libraries/static/no-code/without-fat-lto-objects/eval/hints
--- 2.116.3/t/recipes/checks/libraries/static/no-code/without-fat-lto-objects/eval/hints	2022-07-02 13:47:11.000000000 +0000
+++ 2.116.3ubuntu1/t/recipes/checks/libraries/static/no-code/without-fat-lto-objects/eval/hints	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-libfoo-dev (binary): no-code-sections [usr/lib/libcodeless.a]
diff -pruN 2.116.3/t/scripts/harness/tag-coverage.t 2.116.3ubuntu1/t/scripts/harness/tag-coverage.t
--- 2.116.3/t/scripts/harness/tag-coverage.t	2022-07-02 13:47:11.000000000 +0000
+++ 2.116.3ubuntu1/t/scripts/harness/tag-coverage.t	2023-02-05 15:45:59.000000000 +0000
@@ -58,6 +58,7 @@ my @known_missing = (
       invalid-version-number-for-derivative
       manual-page-in-udeb
       no-tests
+      no-code-sections
       old-python-version-field
       old-source-override-location
       patch-modifying-debian-files
diff -pruN 2.116.3/t/templates/upload-make-builder/Makefile.in 2.116.3ubuntu1/t/templates/upload-make-builder/Makefile.in
--- 2.116.3/t/templates/upload-make-builder/Makefile.in	2020-03-28 08:57:36.000000000 +0000
+++ 2.116.3ubuntu1/t/templates/upload-make-builder/Makefile.in	2023-02-05 15:45:59.000000000 +0000
@@ -24,9 +24,9 @@ product = [% $build_product %]
 upload_type = [% $upload_type %]
 
 ifeq ($(upload_type),source)
-extraflags = -S
+extraflags = -S --build-profiles='!noudeb'
 else
-extraflags =
+extraflags = --build-profiles='!noudeb'
 endif
 
 .DEFAULT_GOAL := $(product)
