Merge ~athos-ribeiro/ubuntu/+source/thin-provisioning-tools:merge-lp1946908-jammy into ubuntu/+source/thin-provisioning-tools:debian/sid

Proposed by Athos Ribeiro
Status: Merged
Merge reported by: Athos Ribeiro
Merged at revision: 7156cb71e40ba82ea7cece477d52b55826e60f13
Proposed branch: ~athos-ribeiro/ubuntu/+source/thin-provisioning-tools:merge-lp1946908-jammy
Merge into: ubuntu/+source/thin-provisioning-tools:debian/sid
Diff against target: 83 lines (+33/-7)
4 files modified
debian/changelog (+29/-0)
debian/control (+2/-1)
debian/rules (+2/-0)
dev/null (+0/-6)
Reviewer Review Type Date Requested Status
Sergio Durigan Junior (community) Approve
Canonical Server Pending
git-ubuntu import Pending
Review via email: mp+417096@code.launchpad.net

Description of the change

This is the merge for thin-provisioning-tools in jammy. The only change is the one to support jammy's gcc, which allows us to drop one of the patches in our delta. The change dropping lto is still needed here (otherwise, this could have been a sync).

Since this merge is a fix for the package build, no FFe should be needed here.

A PPA with the merge proposal is available at https://launchpad.net/~athos-ribeiro/+archive/ubuntu/lp1946908-merge-thin-provisioning-tools-jammy/+packages

Unfortunately, there are not autopkgtest tests for this package yet.

To post a comment you must log in.
Revision history for this message
Athos Ribeiro (athos-ribeiro) wrote :

The delta dropping lto also dropped d/.gitignore; I kept the change to avoid disruption in any review processes. Let me know if I should keep or drop that bit of the change :)

Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

I will take a look at this one.

Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

Thanks for the MP, Athos.

The armhf/arm64 builds are still pending on the PPA, but the other builds passed. I'm not expecting any breakages on arm*, so:

LGTM, +1.

review: Approve
Revision history for this message
Athos Ribeiro (athos-ribeiro) wrote :

Thanks for the review, Sergio.

As this package is not in the server packageset in https://people.canonical.com/~ubuntu-archive/packagesets/jammy/ubuntu-server, I am afraid I will need sponsorship for this one :)

Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

On Friday, March 18 2022, Athos Ribeiro wrote:

> Thanks for the review, Sergio.
>
> As this package is not in the server packageset in https://people.canonical.com/~ubuntu-archive/packagesets/jammy/ubuntu-server, I am afraid I will need sponsorship for this one :)

Oh, certainly! :-)

Uploaded:

$ dput thin-provisioning-tools_0.9.0-2ubuntu1_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/thin-provisioning-tools/thin-provisioning-tools_0.9.0-2ubuntu1_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/thin-provisioning-tools/thin-provisioning-tools_0.9.0-2ubuntu1.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading thin-provisioning-tools_0.9.0-2ubuntu1.dsc: done.
  Uploading thin-provisioning-tools_0.9.0.orig.tar.xz: done.
  Uploading thin-provisioning-tools_0.9.0-2ubuntu1.debian.tar.xz: done.
  Uploading thin-provisioning-tools_0.9.0-2ubuntu1_source.buildinfo: done.
  Uploading thin-provisioning-tools_0.9.0-2ubuntu1_source.changes: done.
Successfully uploaded packages.

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/.gitignore b/debian/.gitignore
2deleted file mode 100644
3index e3f88b6..0000000
4--- a/debian/.gitignore
5+++ /dev/null
6@@ -1,6 +0,0 @@
7-autoreconf.*
8-*.debhelper*
9-*.substvars
10-files
11-/unit-tests/*.so
12-thin-provisioning-tools
13diff --git a/debian/changelog b/debian/changelog
14index 1190568..e55c6b6 100644
15--- a/debian/changelog
16+++ b/debian/changelog
17@@ -1,3 +1,13 @@
18+thin-provisioning-tools (0.9.0-2ubuntu1) jammy; urgency=medium
19+
20+ * Merge with Debian unstable (LP: #1946908). Remaining changes:
21+ - Disable lto for now, testsuite failures.
22+ * Dropped changes:
23+ - d/control, d/rules: force gcc-10 to avoid a gcc-11 FTBFS for now
24+ (LP #1950028)
25+
26+ -- Athos Ribeiro <athos.ribeiro@canonical.com> Fri, 18 Mar 2022 09:36:33 -0300
27+
28 thin-provisioning-tools (0.9.0-2) unstable; urgency=medium
29
30 * Don't require root for building.
31@@ -5,6 +15,25 @@ thin-provisioning-tools (0.9.0-2) unstable; urgency=medium
32
33 -- Bastian Blank <waldi@debian.org> Fri, 18 Feb 2022 17:51:09 +0100
34
35+thin-provisioning-tools (0.9.0-1ubuntu3) jammy; urgency=medium
36+
37+ * d/control, d/rules: force gcc-10 to avoid a gcc-11 FTBFS
38+ for now (LP: #1950028)
39+
40+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Thu, 16 Dec 2021 11:30:28 +0100
41+
42+thin-provisioning-tools (0.9.0-1ubuntu2) impish; urgency=medium
43+
44+ * No-change rebuild to build packages with zstd compression.
45+
46+ -- Matthias Klose <doko@ubuntu.com> Thu, 07 Oct 2021 12:25:37 +0200
47+
48+thin-provisioning-tools (0.9.0-1ubuntu1) hirsute; urgency=medium
49+
50+ * Disable lto for now, testsuite failures.
51+
52+ -- Matthias Klose <doko@ubuntu.com> Mon, 29 Mar 2021 12:01:24 +0200
53+
54 thin-provisioning-tools (0.9.0-1) unstable; urgency=medium
55
56 * New upstream release.
57diff --git a/debian/control b/debian/control
58index b9994cc..349ec41 100644
59--- a/debian/control
60+++ b/debian/control
61@@ -1,7 +1,8 @@
62 Source: thin-provisioning-tools
63 Section: admin
64 Priority: optional
65-Maintainer: Debian LVM Team <team+lvm@tracker.debian.org>
66+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
67+XSBC-Original-Maintainer: Debian LVM Team <team+lvm@tracker.debian.org>
68 Uploaders: Bastian Blank <waldi@debian.org>
69 Build-Depends:
70 debhelper-compat (= 12),
71diff --git a/debian/rules b/debian/rules
72index 69148cc..c927709 100755
73--- a/debian/rules
74+++ b/debian/rules
75@@ -4,6 +4,8 @@
76 # Uncomment this to turn on verbose mode.
77 #export DH_VERBOSE=1
78
79+export DEB_BUILD_MAINT_OPTIONS = optimize=-lto
80+
81 include /usr/share/dpkg/default.mk
82
83 %:

Subscribers

People subscribed via source and target branches