[Merge] ~ogayot/ubuntu/+source/dbus:merge-lp2027991-mantic into ubuntu/+source/dbus:debian/sid

[Bryce Harrington]

Hi Olivier,

Overall, this looks good, I do have some suggestions for improving the package, although some of these are pretty minor.

  - I notice a couple of the commits cover multiple bulletpoints in the changelog, i.e. a3e0e3b6 and 6140ee75.  I might suggest merging the text into a single bullet point maybe with sub-bullets if desired.  In a "perfect merge" I would look to one '-' bullet item per commit, with one LP# bug number referenced.  I think you might be able to achieve that here with a little copyediting.

  - Forwarding delta upstream, or documenting why it is not forwardable, is a useful exercise to check when doing a merge, particularly for a package like dbus that is likely to accumulate lots of delta between merges.  It looks like most of this delta has been here a while, and some of the entries do indicate that forwardability has been considered previously, but it would be good to re-review and doublecheck.  Each item should ideally either a) have a Debian bug or PR associated, or b) somewhere identify why it is not forwardable.  For the latter, packagers sometimes annotate the commit, or the patch itself, or mention in the d/changelog entry, or even just discuss here in the MP description.  

  - I think there is a typo, "However a finalrd hook", unless there actually is something called "finalrd"?

  - I do agree with you that the d/gbp.conf change is probably vestigial; you might investigate further as to when and why that was added.  I also wonder about the value of retaining the .gitignore drop.  In any case if this is kept it should have a better commit message and changelog entry to advocate it's retention.



Diff comments:

> diff --git a/debian/gbp.conf b/debian/gbp.conf
> index b8b4f71..bd7222c 100644
> --- a/debian/gbp.conf
> +++ b/debian/gbp.conf
> @@ -1,5 +1,5 @@
>  [DEFAULT]
>  pristine-tar = True
> -debian-branch = debian/unstable
> +debian-branch = ubuntu/bionic

I suspect if git-ubuntu is being used, then yes this is rather irrelevant.  I also think it could be excluded but don't think it's urgent to clean up and can be left to a future merge.

>  upstream-branch = upstream/1.14.x
>  patch-numbers = False


-- 
https://code.launchpad.net/~ogayot/ubuntu/+source/dbus/+git/dbus/+merge/447077
Your team Ubuntu Sponsors is requested to review the proposed merge of ~ogayot/ubuntu/+source/dbus:merge-lp2027991-mantic into ubuntu/+source/dbus:debian/sid.