Merge ~liushuyu-011/ubuntu/+source/nm-tray:merge-lp2065347 into ubuntu/+source/nm-tray:debian/sid

[Zixing Liu]

This MP merges nm-tray changes from Debian unstable into Ubuntu Oracular.

PPA build: https://launchpad.net/~liushuyu-011/+archive/ubuntu/misc/+sourcepub/16130153/+listing-archive-extra

Unmerged commits

1fea29c... by Zixing Liu on 2024-05-09

update-maintainer

9d1de02... by Zixing Liu on 2024-05-09

reconstruct-changelog

f0345f0... by Zixing Liu on 2024-05-09

merge-changelogs

7829010... by Lukas Märdian on 2021-02-17

        - debian/rules:
          + build with -Wall -pedantic
          + keep DOM_PLUGIN=YES and PULL_TRANSLATIONS=NO
        - debian/patches/blacklist-from-menu.patch
        - debian/patches/generalize-terminal-for-edits.patch

diff --git a/debian/changelog b/debian/changelog
index bed68ee..7a69609 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+nm-tray (0.5.0-2ubuntu1) oracular; urgency=medium
+
+  * Merge with Debian unstable (LP: #2065347). Remaining changes:
+    - debian/rules:
+      + build with -Wall -pedantic
+      + keep DOM_PLUGIN=YES and PULL_TRANSLATIONS=NO
+    - debian/patches/blacklist-from-menu.patch
+    - debian/patches/generalize-terminal-for-edits.patch
+
+ -- Zixing Liu <[e-mail]>  Thu, 09 May 2024 16:07:11 -0600
+
 nm-tray (0.5.0-2) unstable; urgency=medium
 
   [ Debian Janitor ]
@@ -32,6 +43,50 @@ nm-tray (0.5.0-1) unstable; urgency=medium
 
  -- suman rajan <[e-mail]>  Mon, 18 Jul 2022 17:10:31 +0200
 
+nm-tray (0.5.0-0ubuntu4) noble; urgency=high
+
+  * No change rebuild against libqt5core5t64, libqt5dbus5t64,
+    libqt5gui5t64, libqt5network5t64, libqt5widgets5t64.
+
+ -- Julian Andres Klode <[e-mail]>  Mon, 08 Apr 2024 16:46:22 +0200
+
+nm-tray (0.5.0-0ubuntu3) noble; urgency=medium
+
+  * No-change rebuild for CVE-2024-3094
+
+ -- Steve Langasek <[e-mail]>  Sun, 31 Mar 2024 09:21:14 +0000
+
+nm-tray (0.5.0-0ubuntu2) noble; urgency=medium
+
+  * No-change rebuild against libqt5core5t64
+
+ -- Steve Langasek <[e-mail]>  Fri, 15 Mar 2024 06:04:24 +0000
+
+nm-tray (0.5.0-0ubuntu1) kinetic; urgency=medium
+
+  * New upstream release.
+  * Bump debhelper compat and Standards-version, no changes needed.
+  * Remove reverse-applicable patch.
+  * Wraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaap.
+
+ -- Simon Quigley <[e-mail]>  Thu, 02 Jun 2022 23:49:10 -0500
+
+nm-tray (0.4.3-2ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/rules:
+      + build with -Wall -pedantic
+      + keep DOM_PLUGIN=YES and PULL_TRANSLATIONS=NO
+    - debian/patches/blacklist-from-menu.patch
+    - debian/patches/generalize-terminal-for-edits.patch
+  * Dropped changes, included upstream:
+    - debian/patches/include_used_class.patch
+      + included as debian/patches/nmmodel.cpp
+    - debian/control:
+      + build-depend on qtbase5-dev, required by d/p/include_used_class.patch
+
+ -- Lukas Märdian <[e-mail]>  Wed, 17 Feb 2021 15:56:49 +0100
+
 nm-tray (0.4.3-2) unstable; urgency=medium
 
   * Switched to gbp
@@ -50,6 +105,27 @@ nm-tray (0.4.3-1) unstable; urgency=medium
 
  -- Alf Gaida <[e-mail]>  Thu, 15 Aug 2019 23:25:48 +0200
 
+nm-tray (0.4.3-0ubuntu3) focal; urgency=medium
+
+  * No-change rebuild for libgcc-s1 package name change.
+
+ -- Matthias Klose <[e-mail]>  Mon, 23 Mar 2020 07:20:45 +0100
+
+nm-tray (0.4.3-0ubuntu2) eoan; urgency=medium
+
+  * Add missing include for used class
+  * Removed dependency on libkf5networkmanagerqt-dev (LP: #1816267)
+
+ -- apt-ghetto <[e-mail]>  Wed, 09 Oct 2019 18:26:16 +0200
+
+nm-tray (0.4.3-0ubuntu1) eoan; urgency=medium
+
+  * Bump version for new upstream release 0.4.3
+  * Bump Standards-version to 4.4.0, no changes needed
+  * Bump debhelper to 12, no changes needed
+
+ -- Hans P Möller <[e-mail]>  Fri, 09 Aug 2019 22:11:38 -0400
+
 nm-tray (0.4.2-1) unstable; urgency=medium
 
   * Cherry-picked new upstream release 0.4.2
@@ -64,8 +140,63 @@ nm-tray (0.4.1-1) unstable; urgency=medium
 
  -- Alf Gaida <[e-mail]>  Fri, 14 Sep 2018 23:19:21 +0200
 
+nm-tray (0.4.1-0ubuntu3) eoan; urgency=medium
+
+  * Reverted previous commit 1bc4f5406954
+
+ -- Walter Lapchynski <[e-mail]>  Tue, 30 Jul 2019 19:38:35 -0700
+
+nm-tray (0.4.1-0ubuntu2) eoan; urgency=medium
+
+  * Changed connection editor to nm-connnection-editor
+
+ -- Hans P Möller <[e-mail]>  Mon, 01 Jul 2019 10:28:06 -0400
+
+nm-tray (0.4.1-0ubuntu1) cosmic; urgency=medium
+
+  * New upstream bugfix release.
+  * Bump Standards-version to 4.2.1, no changes needed.
+  * Remove the reverse-applicable fix-internal-version.patch.
+
+ -- Simon Quigley <[e-mail]>  Sat, 06 Oct 2018 16:59:03 -0500
+
 nm-tray (0.4.0-1) unstable; urgency=medium
 
   * Initial release (Closes: #890354)
 
  -- Alf Gaida <[e-mail]>  Sat, 25 Aug 2018 16:58:47 +0200
+
+nm-tray (0.4.0-0ubuntu3) cosmic; urgency=medium
+
+  * Blacklist from menus.
+
+ -- Walter Lapchynski <[e-mail]>  Tue, 18 Sep 2018 23:15:13 -0700
+
+nm-tray (0.4.0-0ubuntu2) cosmic; urgency=medium
+
+  [ Simon Quigley ]
+  * Update Vcs-* for the new location.
+
+  [ Walter Lapchynski ]
+  * generalize-terminal-for-edits.patch: Use x-terminal-emulator in lieu of
+    xterm for connection editing. (LP: #1786978)
+
+ -- Simon Quigley <[e-mail]>  Thu, 16 Aug 2018 01:11:08 -0500
+
+nm-tray (0.4.0-0ubuntu1) cosmic; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-version to 4.1.5, no changes needed.
+  * Remove gilir as an uploader as he has left the team.
+  * Bump KF5 dependencies to 5.36.0.
+  * Update copyright.
+  * Remove upstream-applicable fix-xdg-install-dir.patch.
+  * Bump internal version which was missed upstream.
+
+ -- Simon Quigley <[e-mail]>  Thu, 05 Jul 2018 17:46:18 -0500
+
+nm-tray (0.3.0-0ubuntu1) bionic; urgency=medium
+
+  * Initial release.
+
+ -- Simon Quigley <[e-mail]>  Sat, 10 Feb 2018 20:56:10 -0600
diff --git a/debian/control b/debian/control
index e4c1de9..280fc72 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,10 @@
 Source: nm-tray
-Maintainer: LXQt Packaging Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: LXQt Packaging Team <[e-mail]>
 Uploaders: Alf Gaida <[e-mail]>,
            Andrew Lee (李健秋) <[e-mail]>,
            ChangZhuo Chen (陳昌倬) <[e-mail]>
+           Simon Quigley <[e-mail]>
 Section: net
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
diff --git a/debian/patches/blacklist-from-menu.patch b/debian/patches/blacklist-from-menu.patch
new file mode 100644
index 0000000..cb7c14d
--- /dev/null
+++ b/debian/patches/blacklist-from-menu.patch
@@ -0,0 +1,9 @@
+Description: Blacklist from menus.
+Author: Walter Lapchynski <[e-mail]>
+--- a/resources/nm-tray.desktop
++++ b/resources/nm-tray.desktop
+@@ -6,3 +6,4 @@ Icon=network-transmit
+ TryExec=nm-tray
+ Exec=nm-tray
+ Categories=System;Monitor;Qt;
++NoDisplay=true
diff --git a/debian/patches/generalize-terminal-for-edits.patch b/debian/patches/generalize-terminal-for-edits.patch
new file mode 100644
index 0000000..acbb64d
--- /dev/null
+++ b/debian/patches/generalize-terminal-for-edits.patch
@@ -0,0 +1,10 @@
+Description: Use x-terminal emulator in lieu of xterm for connection edits.
+Author: Walter Lapchynski <[e-mail]>
+Bug: https://launchpad.net/bugs/1786978
+--- a/resources/nm-tray.conf
++++ b/resources/nm-tray.conf
+@@ -1,3 +1,3 @@
+ [General]
+-connectionsEditor=xterm, -e, nmtui-edit
++connectionsEditor=x-terminal-emulator, -e, nmtui-edit
+ enableNotifications=true
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..7cdc5d4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+generalize-terminal-for-edits.patch
+blacklist-from-menu.patch
diff --git a/debian/rules b/debian/rules
index 241a5e2..4599466 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
 
 export LC_ALL=C.UTF-8
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 %:
 	dh ${@} --buildsystem cmake
@@ -11,4 +13,6 @@ override_dh_auto_configure:
 	dh_auto_configure -- \
 		-DUPDATE_TRANSLATIONS=NO \
 		-DWITH_MODEMMANAGER_SUPPORT=YES \
+		-DDOM_PLUGIN=YES \
+		-DPULL_TRANSLATIONS=NO \
 		-DCMAKE_BUILD_TYPE=RelWithDebInfo