[Bug 1978007] Re: Please merge network-manager-applet 1.28.0-1 from Debian unstable

[Nathan Teodosio]

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.


** Patch added: "1.28.0-1--1.28.0-1ubuntu1.v2.diff"
   https://bugs.launchpad.net/ubuntu/+source/network-manager-applet/+bug/1978007/+attachment/5596420/+files/1.28.0-1--1.28.0-1ubuntu1.v2.diff

** Description changed:

  This is a proposed merge for network-manager-applet 1.28.0-1.
- 
- I verified that Ubuntu patches were applied and reached Debian, so they
- were dropped, but some older modifications remain.
  
  ==> debian/changelog <==
  network-manager-applet (1.28.0-1ubuntu1) UNRELEASED; urgency=medium
  
-   * Merge from Debian unstable.  Remaining changes:
-     - Drop all Ubuntu patches.
+   * Merge with Debian.  Remaining changes:
+     - d/control, d/rules:
+       + Run dh_translations
      - 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.
-     - d/control, d/rules:
-       + Run dh_translations.
+       + 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
+   * Drop patches applied upstream:
+     - git_owe_activation.patch 
+     - gitlab_new_meson.patch
  
-  -- Nathan Pratta Teodosio <nathan.teodosio at canonical.com>  Wed, 08 Jun 2022 16:26:11 -0300
+  -- Nathan Pratta Teodosio <nathan.teodosio at canonical.com>  Fri, 10 Jun 2022 09:10:05 -0300
  ==>END<==
  
  I tested it with Pbuilder.

-- 
You received this bug notification because you are a member of Ubuntu
Sponsors Team, which is subscribed to the bug report.
https://bugs.launchpad.net/bugs/1978007

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

Status in network-manager-applet package in Ubuntu:
  Incomplete

Bug description:
  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:
        + 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
    * Drop patches applied upstream:
      - git_owe_activation.patch 
      - gitlab_new_meson.patch

   -- Nathan Pratta Teodosio <nathan.teodosio at canonical.com>  Fri, 10 Jun 2022 09:10:05 -0300
  ==>END<==

  I tested it with Pbuilder.

To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/network-manager-applet/+bug/1978007/+subscriptions