Ubuntu
simplestreams package

Merge ~michal-maloszewski99/ubuntu/+source/simplestreams:lp-2013081-gpg-keys-jammyr into ubuntu/+source/simplestreams:ubuntu/jammy-devel

  1. Git
  2. lp:~michal-maloszewski99/ubuntu/+source/simplestreams
  3. lp-2013081-gpg-keys-jammyr
  4. Merge into ubuntu/jammy-devel
Proposed by Michał Małoszewski
Status: Merged
Approved by: git-ubuntu bot
Approved revision: not available
Merged at revision: e6e295e88ec0bf6fb247cd7f2a96132324f67ebb
Proposed branch: ~michal-maloszewski99/ubuntu/+source/simplestreams:lp-2013081-gpg-keys-jammyr
Merge into: ubuntu/+source/simplestreams:ubuntu/jammy-devel
Diff against target: 112 lines (+92/-0)
3 files modified
debian/changelog (+9/-0)
debian/patches/lp2013081-build-fails-gpg-key-expired-jammy.patch (+82/-0)
debian/patches/series (+1/-0)
Reviewer Review Type Date Requested Status
git-ubuntu bot Approve
Lucas Kanashiro (community) Approve
Canonical Server Reporter Pending
Review via email: mp+443475@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michał Małoszewski (michal-maloszewski99) wrote :

No autopkgtests there

Revision history for this message
Michał Małoszewski (michal-maloszewski99) wrote :

Made a mistake but quickly changed into ..0ubuntu1.1 (changelog).
The PPA was based on ubuntu2.1 but anyway it was the higher version and it worked.

Revision history for this message
Lucas Kanashiro (lucaskanashiro) wrote :

I think it is a good idea in general to also add a review slot for canonical-server.

I added an inline comment regarding your changelog entry, same for your commit message. It also applies to the MPs targeting the other releases.

Regarding the SRU bug description, the error message you added to Test Plan is kind of useless:

dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2

This is a generic error, it does not show what is the real issue. Please fix that.

review: Needs Fixing
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

We have switched to canonical-server-reporter as the review slot quite a while ago.
That was to avoid being auto-consumed whenever we do a vote.
IMHO - no need to add canonical-server slot.

Everything else is right and Michal will clean it up for you to reconsider and sponsor.

Revision history for this message
Lucas Kanashiro (lucaskanashiro) wrote :

I know we moved to canonical-server-reporter for that reason, but I still like to receive emails about updates and canonical-server-reporter does not provide that AFAIK. Anyway, not mandatory but still useful IMHO. I usually add slots for both.

Revision history for this message
Michał Małoszewski (michal-maloszewski99) wrote :

Made single changes on each branch and it's ready to be re-reviewed (and sponsored if applicable).

Revision history for this message
Lucas Kanashiro (lucaskanashiro) wrote :

I small comment regarding the changelog. Just a nitpick, I wouldn't add the LP bug reference to the changelog commit, you usually add the bug reference to the commit fixing it, and in this case it is the previous one.

review: Needs Fixing
Revision history for this message
Michał Małoszewski (michal-maloszewski99) wrote :

Thanks for a comment. Fixed on all branches.

Revision history for this message
Lucas Kanashiro (lucaskanashiro) wrote :

Thanks! The package changes LGTM now. I have a comment about your Test Plan in the bug description, if I blindly follow the steps there the package will not build because there will be no upstream tarball in the parent directory, could you update that? You could use pull-lp-source for that and not use git-ubuntu for instance.

review: Needs Fixing
Revision history for this message
Michał Małoszewski (michal-maloszewski99) wrote :

Thanks for the hint! Changes applied, can be re-considered.

Revision history for this message
Lucas Kanashiro (lucaskanashiro) wrote :

Thanks for updating it Michal. It is a bit more than what I was expecting but I think it works :) I'll be sponsoring the uploads.

review: Approve
Revision history for this message
Michał Małoszewski (michal-maloszewski99) wrote :

Thank you :)

Revision history for this message
git-ubuntu bot (git-ubuntu-bot) wrote :

Approvers: lucaskanashiro, michal-maloszewski99
Uploaders: lucaskanashiro
MP auto-approved

review: Approve
Revision history for this message
Lucas Kanashiro (lucaskanashiro) wrote :

Package uploaded:

Uploading simplestreams_0.1.0-48-gb936edd4-0ubuntu1.1.dsc
Uploading simplestreams_0.1.0-48-gb936edd4.orig.tar.gz
Uploading simplestreams_0.1.0-48-gb936edd4-0ubuntu1.1.debian.tar.xz
Uploading simplestreams_0.1.0-48-gb936edd4-0ubuntu1.1_source.buildinfo
Uploading simplestreams_0.1.0-48-gb936edd4-0ubuntu1.1_source.changes

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index 7963d90..8677d59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
1simplestreams (0.1.0-48-gb936edd4-0ubuntu1.1) jammy; urgency=medium
2
3 * d/p/lp2013081-build-fails-gpg-key-expired-jammy.patch: dh_auto_test
4 failed. The test gpg key expired. The patch is to replace the
5 expired gpg key with a new one to get rid of that problem.
6 (LP: #2013081)
7
8 -- Michal Maloszewski <michal.maloszewski@canonical.com> Wed, 24 May 2023 10:32:43 +0200
9
1simplestreams (0.1.0-48-gb936edd4-0ubuntu1) jammy; urgency=medium10simplestreams (0.1.0-48-gb936edd4-0ubuntu1) jammy; urgency=medium
211
3 * New upstream snapshot.12 * New upstream snapshot.
diff --git a/debian/patches/lp2013081-build-fails-gpg-key-expired-jammy.patch b/debian/patches/lp2013081-build-fails-gpg-key-expired-jammy.patch
4new file mode 10064413new file mode 100644
index 0000000..ff88098
--- /dev/null
+++ b/debian/patches/lp2013081-build-fails-gpg-key-expired-jammy.patch
@@ -0,0 +1,82 @@
1From 68414193c3fe27538cec757bafbfe3ce83f0ce80 Mon Sep 17 00:00:00 2001
2From: Dominik <dominik.viererbe@canonical.com>
3Date: Tue, 28 Mar 2023 17:47:46 +0300
4Subject: [PATCH] test: rotate example gpg keys
5
6Origin: upstream, https://git.launchpad.net/simplestreams/commit/?id=68414193c3fe27538cec757bafbfe3ce83f0ce80
7Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/simplestreams/+bug/2013081
8Last-Update: 2023-05-24
9---
10 examples/keys/example.pub | 20 ++++++++++----------
11 examples/keys/example.sec | 36 ++++++++++++++++++------------------
12 2 files changed, 28 insertions(+), 28 deletions(-)
13
14--- a/examples/keys/example.pub
15+++ b/examples/keys/example.pub
16@@ -1,14 +1,14 @@
17 -----BEGIN PGP PUBLIC KEY BLOCK-----
18-Version: GnuPG v1.4.11 (GNU/Linux)
19
20-mI0EUSw66gEEAM6AjeB/KtvuLbkbn6F0Whew2sYx5O2j2smSgwJ0oevnlRzneyXh
21-kUIR+wH5KBDIz5Ikp35ZrZFYoP++7VMALDTp9l+OOlrbz4rQzwI8HvXumkhT+BgE
22-lfN10eu0rBkVNxqt9lXuMNYwgJJtfBPzXVBQju6QDYx5Uodxk9C9TXapABEBAAG0
23+mI0EZCL9pgEEALjMscvUXnyoFeP9McF+0yW4SFQsl8WwpXosSae3DSInIJSoEOG7
24+HBewSS3dOK0lHIYnDZLtA0kSuC/a43mzgRLnY2paGKRL/cC/M2z66Dib83kZgOG8
25+phVZH2HEMJxhb9XLibfTeIUvSgYLSnE4a00xLmlUjI11mCk36RYh4xhhABEBAAG0
26 XFNpbXBsZSBTdHJlYW1zIFRlc3QgVXNlciAoVGVzdCBVc2FnZSBPbmx5LiBEbyBO
27-b3QgSW1wb3J0LikgPHNpbXBsZXN0cmVhbXNAYm9ndXMuZXhhbXBsZS5jb20+iL4E
28-EwECACgFAlEsOuoCGy8FCRLMAwAGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJ
29-EKlxSiA5Z1NuK0ID/R8iBwVt/9tqFy7eeJzCDK0O7QcpmhvKyjPLLmsUhysx8kC7
30-S89yuWyr6iQcjAoAMK6EkOZgRoFfOIA+hZkFC0blFHLCrdSghSQQm6hL/XJuWtkf
31-HBdu7yKudGzGyYmpGYYG69zz+he5EZUtY1fR9PSGSM+ZwCLznHdCJix7bNi0
32-=HEJL
33+b3QgSW1wb3J0LikgPHNpbXBsZXN0cmVhbXNAYm9ndXMuZXhhbXBsZS5jb20+iM4E
34+EwEKADgWIQQkk5C2cpQTdyB9ZpY4cK3qoW5CfAUCZCL9pgIbLwULCQgHAgYVCgkI
35+CwIEFgIDAQIeAQIXgAAKCRA4cK3qoW5CfP9KBACxeVNSRzLHOLvthMxvqoqB/775
36+AmJOPH2OiEfQOAr9C04zcW4FseBDXTS+6vydk5WsG3M7QA7p+zPiKy1atXhUOHY1
37+VySd2AAB0u2RWUAWgg2DaQfbzfuxztqGBqlxPsGXgpobvumXf2pNehoBH9J9T4W4
38+8NH75blul5zZaFvkmA==
39+=C/S4
40 -----END PGP PUBLIC KEY BLOCK-----
41--- a/examples/keys/example.sec
42+++ b/examples/keys/example.sec
43@@ -1,21 +1,21 @@
44 -----BEGIN PGP PRIVATE KEY BLOCK-----
45-Version: GnuPG v1.4.11 (GNU/Linux)
46
47-lQHXBFEsOuoBBADOgI3gfyrb7i25G5+hdFoXsNrGMeTto9rJkoMCdKHr55Uc53sl
48-4ZFCEfsB+SgQyM+SJKd+Wa2RWKD/vu1TACw06fZfjjpa28+K0M8CPB717ppIU/gY
49-BJXzddHrtKwZFTcarfZV7jDWMICSbXwT811QUI7ukA2MeVKHcZPQvU12qQARAQAB
50-AAP2KSNzIEY1Q5svgLEAHCoRyKZy7wkBklYSQBXwA404tMZt7lQvNFy7k24Bk2MP
51-mEhpEbQ7qfAzo8EEUe63WNGv/H6yl37pcS2rKxGdar9/dFV2t/TbJaehKotIvG9D
52-x1CvuT/7DQRj9rGWrDrhx2XIz8hpD21bxrDb2TEF5WjfAQIA05tN+7zxTXSKq7Wt
53-215ba4kBhKKuvrYMN5m871O/cNJfVh9ABea4xRFOOTkcpXsHAl1JPV52wRlHpBoe
54-b36goQIA+dMapApF9zYflJ5rp3RLCwH0YwmY55+MBL5OTN7PM6DFs61rQG1ZO3x8
55-VJ1GNvpVhEuIBUmsD2O4BVYekDsxCQIAuqMgVMVDfj7P2MeMKZ888XphQuYeJdIq
56-IckpdKnZSKSU0oXKiB9y0AyptB1Aih8IhF00EIURWjMI//19JkBXuJNetFxTaW1w
57-bGUgU3RyZWFtcyBUZXN0IFVzZXIgKFRlc3QgVXNhZ2UgT25seS4gRG8gTm90IElt
58-cG9ydC4pIDxzaW1wbGVzdHJlYW1zQGJvZ3VzLmV4YW1wbGUuY29tPoi+BBMBAgAo
59-BQJRLDrqAhsvBQkSzAMABgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRCpcUog
60-OWdTbitCA/0fIgcFbf/bahcu3nicwgytDu0HKZobysozyy5rFIcrMfJAu0vPcrls
61-q+okHIwKADCuhJDmYEaBXziAPoWZBQtG5RRywq3UoIUkEJuoS/1yblrZHxwXbu8i
62-rnRsxsmJqRmGBuvc8/oXuRGVLWNX0fT0hkjPmcAi85x3QiYse2zYtA==
63-=svaP
64+lQHYBGQi/aYBBAC4zLHL1F58qBXj/THBftMluEhULJfFsKV6LEmntw0iJyCUqBDh
65+uxwXsEkt3TitJRyGJw2S7QNJErgv2uN5s4ES52NqWhikS/3AvzNs+ug4m/N5GYDh
66+vKYVWR9hxDCcYW/Vy4m303iFL0oGC0pxOGtNMS5pVIyNdZgpN+kWIeMYYQARAQAB
67+AAP9HOQzr9BF7WtB8OD21G+Fh1ImTLKkD84sMMuXwFbIANzpJRSZfxEHtVRkPH1n
68+jPpOWVLltmDDsLryfNjV04MS3KOtCHnfM9poK+CdlLcrH6pg5QyATgktAQZdR6qA
69+fWZY7aKoO43bWkpj7iKg1F/eGNA//WJehZLRyZzZSQ/cvyECANFfzcJ/BlFOVrho
70+9s92JjGQDLVjYjrgSyGhqQr1NZptpBWbCXyaSPqCJJ+ulRz/W7/JKF1RBHdaw0Ug
71++sjcB3UCAOHz6sYUs60hSlNPQCH0hk9j4y/DFm51O2qNtiFqxrNDDn3eVdbFPwLN
72+9r5vqR6bpe2z3eoxSuVe0V6Ylj8/W70CAI4ecsC4cBJkT83yiqWuNwndGZ1zt8+q
73+12THqYUZ6KSBRHrCYOt8LT5QKFzvAzAJ6oNwYk+DMbMX24mpYo+0eQ6gxbRcU2lt
74+cGxlIFN0cmVhbXMgVGVzdCBVc2VyIChUZXN0IFVzYWdlIE9ubHkuIERvIE5vdCBJ
75+bXBvcnQuKSA8c2ltcGxlc3RyZWFtc0Bib2d1cy5leGFtcGxlLmNvbT6IzgQTAQoA
76+OBYhBCSTkLZylBN3IH1mljhwreqhbkJ8BQJkIv2mAhsvBQsJCAcCBhUKCQgLAgQW
77+AgMBAh4BAheAAAoJEDhwreqhbkJ8/0oEALF5U1JHMsc4u+2EzG+qioH/vvkCYk48
78+fY6IR9A4Cv0LTjNxbgWx4ENdNL7q/J2TlawbcztADun7M+IrLVq1eFQ4djVXJJ3Y
79+AAHS7ZFZQBaCDYNpB9vN+7HO2oYGqXE+wZeCmhu+6Zd/ak16GgEf0n1Phbjw0fvl
80+uW6XnNloW+SY
81+=uILn
82 -----END PGP PRIVATE KEY BLOCK-----
diff --git a/debian/patches/series b/debian/patches/series
0new file mode 10064483new file mode 100644
index 0000000..3dab588
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
1lp2013081-build-fails-gpg-key-expired-jammy.patch

Subscribers

People subscribed via source and target branches