Please merge dbus 1.14.0-2 from Debian unstable.

[Dave Jones]

Please merge dbus 1.14.0-2 from Debian unstable.

Updated changelog and diff against Debian unstable to be attached below.

[Dave Jones (waveform)]

Attaching patch against Debian unstable. For ease of review, relevant commits and tags have been pushed to the following repository:

  https://code.launchpad.net/~waveform/ubuntu/+source/dbus/+git/dbus

Specifically:

* logical/1.12.20-2ubuntu2 represents our split-out delta on top of old/debian (1.12.20-2)
* logical/1.12.20-3ubuntu1 represents our rebased delta on top of new/debian (1.12.20-3)
* merge/1.12.20-3ubuntu1 just adds changelog and maintainer changes on top of logical/1.12.20-3ubuntu1

Hence, the following command may produce output useful to the purposes of review:

  git range-diff old/debian..logical/1.12.20-2ubuntu2 new/debian..logical/1.12.20-3ubuntu1

[Launchpad Janitor (janitor)]

Status changed to 'Confirmed' because the bug affects multiple users.

[Dave Jones (waveform)]

Attaching patch against Debian unstable. For ease of review, relevant commits
and tags have been pushed to the following repository:

https://code.launchpad.net/~waveform/ubuntu/+source/dbus/+git/dbus

Specifically:

* logical/1.12.20-2ubuntu4 represents our split-out delta on top of old/debian (1.12.20-2)
* logical/1.14.0-2ubuntu1 represents our rebased delta on top of new/debian (1.14.0-2)
* merge/1.14.0-2ubuntu1 just adds changelog and maintainer changes on top of logical/1.14.0-2ubuntu1

Hence, the following command may produce output useful to the purposes of review:

git range-diff old/debian..logical/1.12.20-2ubuntu4 new/debian..logical/1.14.0-2ubuntu1

[Dave Jones (waveform)]

Test builds will be available in ppa:waveform/dbus at the following URL:

https://launchpad.net/~waveform/+archive/ubuntu/dbus

[Lukas Märdian (slyon)]

Thank you very much, Dave, for providing a git-ubuntu style merge! This is so much easier to review. I'll upload it using git-ubuntu style, too, so it will be easier to do the next merge.

LGTM!

A few comments (but nothing that would hold back sponsoring of this upload):

commit 96edb47fa870a9dfd6c3d4eb44a82bcc17bde3d9 (tag: logical/1.14.0-2ubuntu1)
Author: Dave Jones <email address hidden>
Date: Thu Jan 27 12:04:00 2022 +0000

    - git configuration changes for Ubuntu (d/gbp.conf, d/.gitignore)

=> Using a "ubuntu/bionic" gbp branch, is probably as useless as using a "debian/unstable" branch in Ubuntu's development release. I wonder if we could/should drop that part of the delta on the next occation.

commit 0af3122e0a4f876bb4c4089aac46dfe4d76036ec
Author: Dave Jones <email address hidden>
Date: Thu Jan 27 12:02:04 2022 +0000

        - Make autopkgtests cross-test-friendly.

=> This seems to be generally useful. Would you mind sending this patch to Debian, so we can eventually drop it from our delta?

Thanks!

[Dave Jones (waveform)]

> I'll upload it using git-ubuntu style, too, so it will be easier to do the next merge.

I must get Robie to remind me what I need to stuff in the .changes file to make that automatic (I vaguely recall him mentioning there were some extra tags that could/should be placed there).

> Using a "ubuntu/bionic" gbp branch, is probably as useless as using a "debian/unstable" branch in Ubuntu's development release. I wonder if we could/should drop that part of the delta on the next occasion.

Yes -- during the merge I initially dropped that change, but then reverted it because it made the range-diff a little noisier for no particularly good reason. Still, I do agree it's basically pointless and should be dropped.

> This seems to be generally useful. Would you mind sending this patch to Debian, so we can eventually drop it from our delta?

Will do.

[Dave Jones (waveform)]

It appears dbus is stuck in kinetic-proposed due to failures in dependency resolution on i386; there are two new arch-indep packages in the merged package which the dbus package depends on, but they lack Multi-Arch tags in d/control.

I'm attaching (yet another :) debdiff which adds M-A: foreign to these packages which should permit the resolver to use these packages when attempting to install dbus:i386.

@slyon could you sponsor this change into -proposed? Hopefully things will migrate this time (and many thanks to @jawn-smith for the recollection of Multi-Arch when dealing with i386 things!)

[Launchpad Janitor (janitor)]

This bug was fixed in the package dbus - 1.14.0-2ubuntu2

---------------
dbus (1.14.0-2ubuntu2) kinetic; urgency=medium

  * d/control: Add M-A: foreign to the new dbus-{session,system}-bus-common
    packages to permit the resolver to use them to satisfy i386 dependencies

 -- Dave Jones <email address hidden> Tue, 30 Aug 2022 15:15:24 +0100