Ubuntu Budgie shows Debian wallpaper due to greeter recommendation

There seems to be a need to upgrade to version 2.0.2. I merged and built successfully in a PPA:

https://launchpad.net/~gunnarhj/+archive/ubuntu/lightdm-gtk-greeter

However, the Ubuntu/Debian delta is a bit over my head to describe, so I didn't complete the changelog. Maybe some Xubuntu developer can take a look.

I have completed the rebuild and merge of lightdm-gtk-greeter from v2.0.1 to v2.0.2.

https://launchpad.net/~ubuntubudgie-dev/+archive/ubuntu/zesty-proposed/+sourcepub/7564041/+listing-archive-extra

I was a little surprise given the apparent diff size for such a minor version update - most appears to be description changes (copyright year change)

The revised upstream minor release also includes Ubuntu Budgie's lightdm-gtk-greeter icon that we also have in our binary package budgie-lightdm-theme. Thus the uplift of lightdm-gtk-greeter needs to occur together with a revised version of the source package budgie-artwork:

https://launchpad.net/~ubuntubudgie-dev/+archive/ubuntu/zesty-proposed/+sourcepub/7564043/+listing-archive-extra

Tested on xubuntu and ubuntu budgie. All appears to be ok.

If not considered suitable for zesty then the work should be considered for zesty+1

enc the debdiff for lightdm-gtk-greeter - but I think there is a binary change (icons) so the built source package should be used here.

enc is the debdiff for budgie-artwork - but also included is the built source package given the icon change I mentioned above.

I'm in favor of getting the updated greeter into Zesty. We'll do some testing on the Xubuntu side and confirm.

Hi David,

I took a brief look at your proposed upload for lightdm-gtk-greeter 2.0.2-1ubuntu1. I'm afraid it doesn't follow what we usually expect for an Ubuntu merge so cannot be uploaded to Ubuntu as-is.

Things I noticed:

Your merge entry in debian/changelog doesn't follow our convention on writing up a merge. In particular it doesn't detail the Ubuntu delta that is still remaining, or what has been dropped, or what aspects you have changed. This makes it difficult for me to review anything else, since I don't know what you have done that is intentional, nor reasons why, so I cannot tell apart what looks odd to me and what you have done that could be an accident.

You're clobbering entries in debian/changelog from the old Ubuntu; instead I'd expect only entries to be added to the top of debian/changelog from what Zesty has currently. You can use dpkg-mergechangelogs to achieve this manually if you wish.

You have "un-run" update-maintainer.

You have regressed Standards-Version from 3.9.8 back to 3.9.6.

The addition of the Breaks/Replaces in debian/control looks correct to me, but is not documented in debian/changelog.

Please could you study how to do an "Ubuntu merge"? Probably the best way is to study some other simple merges that are already uploaded. Please do ask for help if you need it, and resubscribe ~ubuntu-sponsors when you're ready.

What I expect to see is:

Each previous part of the Ubuntu delta identified in the changelog and either noted as dropped, retained or modified, with the reason being clear enough for another Ubuntu delta to understand. The actual delta retained, dropped or modified exactly as noted. debian/changelog merged in (new both previous Ubuntu and new Debian changelog entries present).

For budgie-artwork 0.7.2:

You're renaming something that lands in etc/lightdm/lightdm-gtk-greeter.conf.d/ presumably, so doesn't this need conffile renaming via dpkg-maintscript-helper or a debian/<package>.maintscript debhelper file if using debhelper?

As I think there's nothing to upload pending answers to these questions, I'll unsubscribe ~ubuntu-sponsors for now. Please resubscribe ~ubuntu-sponsors again when you're ready.

> You have regressed Standards-Version from 3.9.8 back to 3.9.6.

Apologies, I think I was looking at my local diff in reverse on that one. Your Standards-Version line is correct.

@Robie,

 thanks for the feedback.

I have revised the packaging as requested:

budgie-artwork:

https://launchpad.net/~ubuntubudgie-dev/+archive/ubuntu/lp1669818/+sourcepub/7657218/+listing-archive-extra

The updated changelog for this package is as follows:

  * Bug-fix release.
    - corrected lightdm-gtk-greeter conf file name
    - remove budgie-desktop_badge-symbolic.svg since this
      now exists in lightdm-gtk-greeter v2.0.2-1
  * Packaging Changes:
    - Corrected description for lightdm session package
    - changed debian/lightdm-theme.install to not install greeter icons
    - add debian/lightdm-theme.maintscript to remove old greeter conf file

lightdm-gtk-greeter:

https://launchpad.net/~ubuntubudgie-dev/+archive/ubuntu/lp1669818/+sourcepub/7657177/+listing-archive-extra

  * Merge from Debian unstable. Remaining changes:
    - debian/control:
      + add build-dep on exo-utils and libgirepository1.0-dev for
        exo-csource.
   + Build-Depends on liblightdm-gobject-1-dev instead on
        liblightdm-gobject-dev as it's non-existing in archive.
      + update standards version to 3.9.8.
      + Install desktop-base as a suggestion, not as a
        recommendation (LP: #1669818)
      + add budgie-lightdm-theme to break/replaces due to conflicting
        budgie-desktop greeter icon (LP: #1669818)
    - debian/patches:
      + 01_at-spi.patch added, fix accessibility. closes: #802220
      + clean-up-atspi.patch now dropped since replaced by 01_at-spi.patch
    - debian/lightdm-gtk-greeter.lintian-overrides
      - add hardening-no-stackprotector
    - debian/copyright
      - replace debian version with the version for ubuntu
    - debian/01_ubuntu.conf,
      debian/lightdm-gtk-greeter.{post,pre}{inst,rm},
      debian/60-lightdm-gtk-greeter.conf:
      + Install and remove Ubuntu conf files.
    - debian/rules
      + Install lightdm and lightdm-gtk-greeter configuration

Thank you for the quick update.

I'm afraid this merge still is not correct. I've only looked at debian/changelog, and see that the entry for 2.0.2-1 has vanished. This is unlike the previous merge - take a look at the changelog entries for 2.0.1-2ubuntu1 and the 2.0.1-2 before it in the source currently in Zesty for example. I suggest that you look again at how to do an Ubuntu merge.

In addition, in debian/changelog:

You've noted "add budgie-lightdm-theme to break/replaces" under the heading "Remaining changes" but this is a new change, not one carried over from the previous delta, isn't it?

There's extra trailing whitespace on line 27

There's a tab/space whitespace inconsistency at the start of line 7

I did not proceed beyond looking at debian/changelog.

I'd be happy to take you through how to do a merge if you wish, but I don't think it will be very productive for you to continue submitting things by guessing. Please engage us on IRC or on the mailing list.

On the server team we use some new tooling and documentation (still at the experimental stage) that uses git to do Ubuntu merges. If you'd like to try that process, I'd be happy to take you through it. See https://lists.ubuntu.com/archives/ubuntu-devel/2014-August/038418.html and https://wiki.ubuntu.com/UbuntuDevelopment/Merging/GitWorkflow if you'd like to know more.

Alternatively I'd also be happy to take you through this the traditional way (by hand), just get in touch.

Unsubscribing ~ubuntu-sponsors again for now.

Hi Robie,

 Sean (bluesabre) will be uploading a revised lightdm-gtk-greeter tonight for artful

(package - https://launchpad.net/~bluesabre/+archive/ubuntu/experimental)

Thus could our revised budgie-artwork package also be uploaded to artful?

Without the upload, ubuntu budgie dailies will break due to the conflicting icon file that will be in the new lightdm-gtk-greeter package also existing in the existing budgie-artwork package.

https://launchpad.net/~ubuntubudgie-dev/+archive/ubuntu/lp1669818/+sourcepub/7657218/+listing-archive-extra

Hi David,

On Thu, Apr 27, 2017 at 09:57:37PM -0000, fossfreedom wrote:
> Without the upload, ubuntu budgie dailies will break due to the
> conflicting icon file that will be in the new lightdm-gtk-greeter
> package also existing in the existing budgie-artwork package.

Right - so I suggest that whoever uploads one uploads the other at the
same time. I'll be happy to review and sponsor both, assuming both
proposed uploads are good.

Hi Robie,

I've packaged lightdm-gtk-greeter for artful in my sponsoring PPA. Please feel free to use this if you are going to upload both packages.

https://launchpad.net/~bluesabre/+archive/ubuntu/sponsoring

Hi Sean,

Your merge itself looks correct - thanks!

However due to previous errors being carried forward, the changelog section of "Remaining changes" doesn't reflect the current state of the merge. For example, "Do not use update-alternatives for lightdm-gtk-greeter config" has vanished, "Add Indicators support." doesn't actually make any change to debian/rules as claimed and so on.

I'm going to JFDI and rewrite the changelog so that it is fully accurate before uploading. If you're interested, https://wiki.ubuntu.com/UbuntuDevelopment/Merging/GitWorkflow is what my team uses to keep both merges and their descriptions accurate.

Uploaded lightdm-gtk-greeter 2.0.2-1ubuntu1 and budgie-artwork 0.7.2 to artful with a few changes. Thank you for your work!

Changes:

lightdm-gtk-greeter: rewrote debian/changelog to accurately reflect the merge as above.

budgie-artwork:

1) I appended ~ to the prior-version in the maintscript. See dpkg-maintscript-helper(1) for details.
2) I bumped zesty to artful in debian/changelog as the update didn't make Zesty.

For lightdm-gtk-greeter, it seems that much of the current delta could be folded into Debian, but given the delays already I didn't want to delay an upload further asking for that. Please could the next person to merge lightdm-gtk-greeter sort this out? Additionally the maintscript snippets in the maintainer scripts could do with folding into the debhelper .maintscript file so everything is in one place. Additionally I didn't check if they could be dropped now.

This bug was fixed in the package lightdm-gtk-greeter - 2.0.2-1ubuntu1

---------------
lightdm-gtk-greeter (2.0.2-1ubuntu1) artful; urgency=medium

  * Merge from Debian.
    - This includes the new Budgie greeter badge added upstream (LP: #1568494).
    - Thanks to Sean Davis for preparing this merge. See LP 1669818 for details
      of this rewritten changelog.
  * Remaining changes:
    - debian/{01_ubuntu.conf,60-lightdm-gtk-greeter.conf,rules} add and
      install.
    - debian/control: add Indicators support.
    - debian/control: Build-Depends on liblightdm-gobject-1-dev instead on
      liblightdm-gobject-dev as it's non-existing in archive.
    - debian/copyright: update copyright for lightdm-gtk-greeter.
    - debian/lightdm-gtk-greeter.{preinst,postinst,postrm}: migrate post-1.0.0
      configuration to conf.d/01_ubuntu.conf.
    - debian/lightdm-gtk-greeter.lintian-overrides: drop unused override.
    - debian/lightdm-gtk-greeter.maintscript: drop obsolete version of Ubuntu
      config from /etc.
  * Drop changes:
    - Properly handle the startup/shutdown of the at-spi registry (now in
      Debian).

  [ David Mohammed ]
  * Add budgie-lightdm-theme to break/replaces due to conflicting
    budgie-desktop greeter icon (LP: #1669818).
  * Install desktop-base as a suggestion, not as a recommendation (LP:
    #1669818).

 -- Robie Basak <email address hidden> Wed, 03 May 2017 15:20:48 +0100