Merge ~sergiodj/ubuntu/+source/targetcli-fb:dont-hardcode-python-version into ubuntu/+source/targetcli-fb:ubuntu/devel

Proposed by Sergio Durigan Junior
Status: Merged
Approved by: Sergio Durigan Junior
Approved revision: 2935880cd1ce9e90f515d00a46cc328b0c835605
Merged at revision: 2935880cd1ce9e90f515d00a46cc328b0c835605
Proposed branch: ~sergiodj/ubuntu/+source/targetcli-fb:dont-hardcode-python-version
Merge into: ubuntu/+source/targetcli-fb:ubuntu/devel
Diff against target: 26 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
debian/targetcli-fb.install (+1/-1)
Reviewer Review Type Date Requested Status
Bryce Harrington (community) Approve
Canonical Server Pending
Review via email: mp+396959@code.launchpad.net

Description of the change

This is the "merge" of targetcli-fb from Debian.

As discussed during standup, there was a mistake when uploading the previous version of targetcli-fb to Ubuntu. That version (1:2.1.53-1ubuntu1) should have had the "-0ubuntu1" suffix, because it was ahead of Debian at the time.

Meanwhile, Debian accepted our changes and caught up with us. For this reason, I'm proposing this simple patch which will bring Ubuntu's targetcli-fb in sync with Debian's. Next time Debian releases an update, it is highly likely that we will be able to just syncpackage targetcli-fb and be done with it.

The specific change that I'm proposing to bring here is a one-liner that avoids hard-coding the Python minor version in the d/targetcli-fb.install file. It makes sense, and is very simple.

There's a PPA with the proposed package here:

https://launchpad.net/~sergiodj/+archive/ubuntu/targetcli-fb-merge

autopkgtest is still happy:

autopkgtest [16:30:39]: @@@@@@@@@@@@@@@@@@@@ summary
ramdiskluns.sh PASS
saveconfig.sh PASS

To post a comment you must log in.
Revision history for this message
Bryce Harrington (bryce) wrote :

LGTM, +1

The tests require isolation-machine so I could not test the PPA in lxc but verified build and install/uninstall.

The debian changes look fine, they'll probably be disappearing as a sync shortly anyway.

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

Thanks for the review, Bryce.

I chose not to add the whitespace because I don't want the change to diverge from Debian, since we will likely soon be sync'ing from them and this whitespace will end up being reintroduced.

I went ahead and uploaded the package.

$ git push pkg upload/1%2.1.53-1ubuntu2
Enumerating objects: 13, done.
Counting objects: 100% (13/13), done.
Delta compression using up to 8 threads
Compressing objects: 100% (9/9), done.
Writing objects: 100% (9/9), 1.10 KiB | 564.00 KiB/s, done.
Total 9 (delta 6), reused 0 (delta 0)
To ssh://git.launchpad.net/ubuntu/+source/targetcli-fb
 * [new tag] upload/1%2.1.53-1ubuntu2 -> upload/1%2.1.53-1ubuntu2

$ dput targetcli-fb_2.1.53-1ubuntu2_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/targetcli-fb/targetcli-fb_2.1.53-1ubuntu2_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/targetcli-fb/targetcli-fb_2.1.53-1ubuntu2.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading targetcli-fb_2.1.53-1ubuntu2.dsc: done.
  Uploading targetcli-fb_2.1.53-1ubuntu2.debian.tar.xz: done.
  Uploading targetcli-fb_2.1.53-1ubuntu2_source.buildinfo: done.
  Uploading targetcli-fb_2.1.53-1ubuntu2_source.changes: done.
Successfully uploaded packages.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index d865164..afa097f 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+targetcli-fb (1:2.1.53-1ubuntu2) hirsute; urgency=medium
7+
8+ * Don't hardcode the python minor version
9+ Thanks Ritesh Raj Sarraf <rrs@debian.org>
10+
11+ -- Sergio Durigan Junior <sergio.durigan@canonical.com> Tue, 26 Jan 2021 16:13:06 -0500
12+
13 targetcli-fb (1:2.1.53-1ubuntu1) groovy; urgency=medium
14
15 * New upstream version 2.1.53
16diff --git a/debian/targetcli-fb.install b/debian/targetcli-fb.install
17index a318a8c..3420bcc 100644
18--- a/debian/targetcli-fb.install
19+++ b/debian/targetcli-fb.install
20@@ -1,5 +1,5 @@
21 usr/bin/targetclid /usr/bin
22 usr/bin/targetcli /usr/bin
23-usr/lib/python3.8/dist-packages/targetcli /usr/lib/python3/dist-packages
24+usr/lib/python3*/dist-packages/targetcli /usr/lib/python3/dist-packages
25 systemd/targetclid.service /lib/systemd/system
26 systemd/targetclid.socket /lib/systemd/system

Subscribers

People subscribed via source and target branches