Please merge network-manager-applet 1.28.0-1 from Debian unstable

[Nathan Teodosio]

This is a proposed merge for network-manager-applet 1.28.0-1.

==> debian/changelog <==
network-manager-applet (1.28.0-1ubuntu1) UNRELEASED; urgency=medium

  * Merge with Debian. Remaining changes:
    - d/control, d/rules:
      + Run dh_translations.
    - d/control:
      + Replace gnome-icon-theme by humanity-icon-theme in Recommends.
        Both provide gnome-lockscreen's icon, but the latter is installed
        by default in Ubuntu.
    - d/patches:
      + Force-online-state-with-unmanaged-devices.patch
      + Have-the-appindicator-enabled-by-default.patch
      + lp341684_device_sensitive_disconnect_notify.patch
      + lp460144_correctly_update_notification.patch
      + Make-policykit-restricted-actions-insensitive.patch
      + Support-hiding-rather-than-desensitizing-disallowed-items.patch
  * Drop patches applied upstream:
    - git_owe_activation.patch
    - gitlab_new_meson.patch
  * Drop <!s390x>, since the packages are now also available in s390x.

 -- Nathan Pratta Teodosio <email address hidden> Fri, 10 Jun 2022 13:54:36 -0300
==>END<==

I tested it with Pbuilder.

[Sebastien Bacher (seb128)]

Hey Nathan, thanks for the work there. Sorry I've probably been unclear but the changelog entry correctly describing the previous merge was the 1.18.0-1ubuntu1 one, and from that section

' - Add Ubuntu patches:
      - lp341684_device_sensitive_disconnect_notify.patch
      - lp460144_correctly_update_notification.patch
      - Have-the-appindicator-enabled-by-default.patch
      - Make-policykit-restricted-actions-insensitive.patch
      - Support-hiding-rather-than-desensitizing-disallowed-items.patch'

those haven't been included in Debian and are still needed

Or another way to check that, is to debdiff between the current Ubuntu version and your proposed one, the changes in there should only be the ones Debian did since we previous merge

[Nathan Teodosio (nteodosio)]

You were totally clear, I most definitely blundered by comparing the patches with Ubuntu's tree itself, sorry.

I'm attaching a new patch, also tested with Pbuilder.

[Sebastien Bacher (seb128)]

Thanks, it is better, the changelog needs fixing though

    - d/control:
      + Drop <!s390x>, since the packages are now also available in s390x
      + Drop >= 1.8 version requirement for network-manager since all supported releases satisfy it

is that really a delta we have over Debian? It sounds rather like a change we got from Debian.
You also forgot to list back the patches

One extra note, Debian added a recommends on gnome-icon-theme which is in universe in Ubuntu, could you replace it with humanity-icon-theme which also provides the gnome-lockscreen icon which justified the change and is installed by default on Ubuntu

[Nathan Teodosio (nteodosio)]

>= 1.8 came indeed from Debian, but not s390x:

  https://merges.ubuntu.com/n/network-manager-applet/network-manager-applet_1.28.0-1.patch

It was introduced in 1.8.18-2ubuntu5 according to the changelog.

I hope the patch is correct now, thanks for your feedback!

[Sebastien Bacher (seb128)]

> + + Drop <!s390x>, since the packages are now also available in s390x.

hum, I might be not seeing that right, but s390x isn't mentioned in that patch out of the changelog nor in https://salsa.debian.org/utopia-team/network-manager-applet/-/blob/debian/master/debian/control , what's part of the patch is documenting exactly?

we did had <!s390x> added to Depends
> gnome-shell <!s390x> | policykit-1-gnome <!s390x> | polkit-1-auth-agent <!s390x>,

if that's not needed anymore we can remove it but that's not a delta remaining

[Nathan Teodosio (nteodosio)]

> if that's not needed anymore we can remove it but that's not a delta remaining

Ah, that caused the confusion, I put it in the wrong place in the change log. Fixed.

[Sebastien Bacher (seb128)]

Thanks!