Merge ~paelzer/ubuntu/+source/libaio:merge-0.3.112-11-JAMMY into ubuntu/+source/libaio:debian/sid

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4696/+packages

Rather trivial merge (only delta is LTO, which nothing changed about from upstream or Debian)

[Sergio Durigan Junior (sergiodj)]

I'll review this one.

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Christian.

It built fine locally. Debian added autopkgtests to the package (great!). At least locally, I see one pass and one flaky test here, which also happens on Debian:

https://ci.debian.net/data/autopkgtest/testing/amd64/liba/libaio/16063796/log.gz

So I'm not concerned.

You haven't pushed the other branches related to the merge (old/debian, old/ubuntu, etc), nor the tags (split, logical, etc). I understand this is a simple and trivial merge, but I'd still have liked to be able to inspect these other artifacts.

Either way, I'm approving the MP because I'm satisfied with the resulting package.

LGTM, +1.

review: Approve

[Christian Ehrhardt  (paelzer)]

Thanks for the hint Sergio, they are here and look as you'd expect.
But that was a good reminder for the coming potentially more complex merges.

To ssh://git.launchpad.net/~paelzer/ubuntu/+source/libaio
 * [new tag] lp1946864/logical/0.3.112-9ubuntu1 -> lp1946864/logical/0.3.112-9ubuntu1
 * [new tag] lp1946864/new/debian -> lp1946864/new/debian
 * [new tag] lp1946864/old/debian -> lp1946864/old/debian
 * [new tag] lp1946864/old/ubuntu -> lp1946864/old/ubuntu
 * [new tag] lp1946864/reconstruct/0.3.112-9ubuntu2 -> lp1946864/reconstruct/0.3.112-9ubuntu2
 * [new tag] lp1946864/split/0.3.112-9ubuntu1 -> lp1946864/split/0.3.112-9ubuntu1

[Christian Ehrhardt  (paelzer)]

Uploaded

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading libaio_0.3.112-11ubuntu1.dsc: done.
  Uploading libaio_0.3.112-11ubuntu1.debian.tar.xz: done.
  Uploading libaio_0.3.112-11ubuntu1_source.buildinfo: done.
  Uploading libaio_0.3.112-11ubuntu1_source.changes: done.
Successfully uploaded packages.

[Christian Ehrhardt  (paelzer)]

FYI remaining delta submitted here
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=998309

[Christian Ehrhardt  (paelzer)]

FYI full LTO builds with
https://git.hadrons.org/cgit/debian/pkgs/libaio.git/diff/?id=b17f8e5

in 0.3.112-12, since this was the only Delta left -> sync it now.

And another evidence that these non-LTO changes should be upstreamed to Debian and Projects.

Thanks to Guillem Jover for the quick and great response!

[Christian Ehrhardt  (paelzer)]

This is in proposed, even though we immediately sync it over now => merged

diff --git a/debian/changelog b/debian/changelog
index 0e5a8ab..461240d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libaio (0.3.112-11ubuntu1) jammy; urgency=medium
+
+  * Merge with Debian unstable (LP: #1946864). Remaining changes:
+    - d/rules: Disable building with lto.
+
+ -- Christian Ehrhardt <[e-mail]>  Fri, 29 Oct 2021 09:23:58 +0200
+
 libaio (0.3.112-11) unstable; urgency=medium
 
   * Use CC as a shell variable instead of a make one in autopkgtests.
@@ -19,6 +26,24 @@ libaio (0.3.112-10) unstable; urgency=medium
 
  -- Guillem Jover <[e-mail]>  Sat, 09 Oct 2021 17:31:09 +0200
 
+libaio (0.3.112-9ubuntu2) impish; urgency=medium
+
+  * No-change rebuild to build packages with zstd compression.
+
+ -- Matthias Klose <[e-mail]>  Thu, 07 Oct 2021 12:13:56 +0200
+
+libaio (0.3.112-9ubuntu1) hirsute; urgency=medium
+
+  * Disable building with lto.
+
+ -- Matthias Klose <[e-mail]>  Mon, 22 Mar 2021 22:13:01 +0100
+
+libaio (0.3.112-9build1) hirsute; urgency=medium
+
+  * No-change rebuild to drop the udeb package.
+
+ -- Matthias Klose <[e-mail]>  Mon, 22 Feb 2021 10:34:21 +0100
+
 libaio (0.3.112-9) unstable; urgency=medium
 
   * Remove Build-Depends on dpkg-dev, satisfied in stable.
diff --git a/debian/control b/debian/control
index 868be44..798fefe 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: libaio
-Maintainer: Guillem Jover <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Guillem Jover <[e-mail]>
 Priority: optional
 Section: libs
 Vcs-Browser: https://git.hadrons.org/cgit/debian/pkgs/libaio.git
diff --git a/debian/rules b/debian/rules
index 9010218..d2d7db8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
+DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow optimize=-lto
 DEB_CFLAGS_MAINT_PREPEND = -Wall
 
 include /usr/share/dpkg/default.mk