This should be a sync.
When I started this merge, I got the following error when starting a
regular git-ubuntu merge:
06/25/2024 10:33:16 - ERROR:Found an import tag for 1:2.1.53-1 (commit:
9ba0d50e2e62292dddfd202f247435e163963c73), but it is not an ancestor of
ubuntu/devel.
06/25/2024 10:33:16 - ERROR:Unable to find a common ancestor for debian/sid and
ubuntu/devel.
When we check the diff between 1:2.1.53-1 and 1:2.1.53-1ubuntu1, we see:
$ git diff -I'^(Maintainer|XSBC-Original-Maintainer):
.*(debian\.org|ubuntu\.com)>$'
pkg/import/1%2.1.53-1..pkg/import/1%2.1.53-1ubuntu1 -- ':!debian/changelog'
diff --git a/debian/targetcli-fb.install b/debian/targetcli-fb.install
index 3420bcc..a318a8c 100644
--- a/debian/targetcli-fb.install
+++ b/debian/targetcli-fb.install
@@ -1,5 +1,5 @@
usr/bin/targetclid /usr/bin
usr/bin/targetcli /usr/bin
-usr/lib/python3*/dist-packages/targetcli /usr/lib/python3/dist-packages
+usr/lib/python3.8/dist-packages/targetcli /usr/lib/python3/dist-packages
systemd/targetclid.service /lib/systemd/system
systemd/targetclid.socket /lib/systemd/system
Investigating further, we can see that this is a missing change from
1:2.1.53-1 not included in 1:2.1.53-1ubuntu1. This was later fixed in
1:2.1.53-1ubuntu2
$ git diff pkg/import/1%2.1.53-1ubuntu1..pkg/import/1%2.1.53-1ubuntu2 --
':!debian/changelog'
diff --git a/debian/targetcli-fb.install b/debian/targetcli-fb.install
index a318a8c..3420bcc 100644
--- a/debian/targetcli-fb.install
+++ b/debian/targetcli-fb.install
@@ -1,5 +1,5 @@
usr/bin/targetclid /usr/bin
usr/bin/targetcli /usr/bin
-usr/lib/python3.8/dist-packages/targetcli /usr/lib/python3/dist-packages
+usr/lib/python3*/dist-packages/targetcli /usr/lib/python3/dist-packages
systemd/targetclid.service /lib/systemd/system
systemd/targetclid.socket /lib/systemd/system
It seems that 1:2.1.53-1ubuntu1 was an early import of 1:2.1.53-1
(perhaps before the actual debian upload) which in fact just dropped the
delta we had back then.
Note that 1:2.1.53-1ubuntu2 added the missing piece of the debian/sid
package and 1:2.1.53-1ubuntu3 was a no change rebuild.
When we check the diff between Debian's 1:2.1.53-1 and the current sid
tip, and compare it with the diff between ubuntu/devel and sid, we
confirm that there are no differences between those diffs. This is
enough to confirm this is a sync.
$ diff -dru <(git diff pkg/import/1%2.1.53-1..debian/sid --
':!debian/changelog') <(git diff -I'^(Maintainer|XSBC-Original-
Maintainer): .*(debian\.org|ubuntu\.com)>$' ubuntu/devel..debian/sid --
':!debian/changelog')
(EMPTY)
** Changed in: targetcli-fb (Ubuntu)
Status: New => In Progress
--
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/2064471
Title:
Merge targetcli-fb from Debian unstable for oracular
To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/targetcli-fb/+bug/2064471/+subscriptions
--
ubuntu-bugs mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
