Upload to Plucky

Summary:
  * Add missing include for used class
  * Remove unnecessary dependency on libkf5networkmanagerqt-dev

Test Plan:
1. Check that the build does not fail.
           2. Check that it has the same behaviour as before.

Reviewers: wxl, tsimonq2, hmollercl

Differential Revision: https://phab.lubuntu.me/D48

debian/changelog

@@ -1,3 +1,128 @@
+nm-tray (0.5.1-0ubuntu1) plucky; urgency=medium
+
+  * New upstream release.
+  * Update dependencies for Qt 6.
+  * Bump Standards-version to 4.7.0, no changes needed.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 17 Oct 2024 11:17:23 -0500
+
+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
+  * Dropped changes:
+    - debian/control: Add Simon Quigley as one of the uploaders
+    - "Bump debhelper compat and Standards-version, no changes needed."
+      Already applied in Debian.
+
+ -- Zixing Liu <zixing.liu@canonical.com>  Thu, 09 May 2024 16:07:11 -0600
+
+nm-tray (0.5.0-2) unstable; urgency=medium
+
+  [ Debian Janitor ]
+  * Trim trailing whitespace.
+  * Bump debhelper from old 12 to 13.
+    + debian/rules: Drop --fail-missing argument to dh_missing, which
+      is now the default.
+  * Set upstream metadata fields: Repository.
+  * Remove obsolete field Name from debian/upstream/metadata (already
+    present in  machine-readable debian/copyright).
+  * Update standards version to 4.6.1, no changes needed.
+  * Avoid explicitly specifying -Wl,--as-needed linker flag.
+
+  [ Andrew Lee (李健秋) ]
+  * Update team email to <team+lxqt@tracker.debian.org>.
+  * debian/control: add myself as uploader.
+  * debian/copyright: update.
+
+ -- Andrew Lee (李健秋) <ajqlee@debian.org>  Tue, 05 Sep 2023 20:40:01 +0200
+
+nm-tray (0.5.0-1) unstable; urgency=medium
+
+  [ suman rajan ]
+  * New upstream version 0.5.0
+  * debian/copyright: Added new entry for  debian copyright
+  * debian/lintian-overrides: Updated lintian overrides
+  * debian/patches: Removed nmmodel.patch
+  * debian/gbp.conf: Changed compression to gz
+
+  [ Andrew Lee (李健秋) ]
+  * Add debian/salsa-ci.yml file.
+
+ -- suman rajan <suman@cryptolab.net>  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 <juliank@ubuntu.com>  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 <steve.langasek@ubuntu.com>  Sun, 31 Mar 2024 09:21:14 +0000
+
+nm-tray (0.5.0-0ubuntu2) noble; urgency=medium
+
+  * No-change rebuild against libqt5core5t64
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  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 <tsimonq2@ubuntu.com>  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 <slyon@ubuntu.com>  Wed, 17 Feb 2021 15:56:49 +0100
+
+nm-tray (0.4.3-2) unstable; urgency=medium
+
+  * Switched to gbp
+  * Added upstream patch for incomplete type 'class QMetaEnum'
+    (Closes: #941648)
+  * Added Rules-Requires-Root field
+
+ -- Alf Gaida <agaida@siduction.org>  Fri, 04 Oct 2019 19:39:14 +0200
+
+nm-tray (0.4.3-1) unstable; urgency=medium
+
+  * Cherry-picked new upstream release 0.4.3
+  * Switched from debhelper to debhelper-compat, no changes needed
+  * Bumped Standards-Version to 4.4.0, no changes needed
+  * Fixed years in copyright
+
+ -- Alf Gaida <agaida@siduction.org>  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 <doko@ubuntu.com>  Mon, 23 Mar 2020 07:20:45 +0100
+
 nm-tray (0.4.3-0ubuntu2) eoan; urgency=medium
 
   * Add missing include for used class
@@ -13,6 +138,20 @@ nm-tray (0.4.3-0ubuntu1) eoan; urgency=medium
 
  -- Hans P Möller <hmoller@gmail.com>  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
+
+ -- Alf Gaida <agaida@siduction.org>  Sat, 20 Oct 2018 12:52:26 +0200
+
+nm-tray (0.4.1-1) unstable; urgency=medium
+
+  * Cherry-picked new upstream release 0.4.1
+  * Added Dependency qterminal | x-terminal-emulator
+  * Bumped Standards to 4.2.1, no changes needed
+
+ -- Alf Gaida <agaida@siduction.org>  Fri, 14 Sep 2018 23:19:21 +0200
+
 nm-tray (0.4.1-0ubuntu3) eoan; urgency=medium
 
   * Reverted previous commit 1bc4f5406954
@@ -33,6 +172,12 @@ nm-tray (0.4.1-0ubuntu1) cosmic; urgency=medium
 
  -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 06 Oct 2018 16:59:03 -0500
 
+nm-tray (0.4.0-1) unstable; urgency=medium
+
+  * Initial release (Closes: #890354)
+
+ -- Alf Gaida <agaida@siduction.org>  Sat, 25 Aug 2018 16:58:47 +0200
+
 nm-tray (0.4.0-0ubuntu3) cosmic; urgency=medium
 
   * Blacklist from menus.

debian/compat

@@ -1 +0,0 @@
-12

debian/control

@@ -1,24 +1,46 @@
 Source: nm-tray
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: LXQt Packaging Team <team+lxqt@tracker.debian.org>
+Uploaders: Alf Gaida <agaida@siduction.org>,
+           Andrew Lee (李健秋) <ajqlee@debian.org>,
+           ChangZhuo Chen (陳昌倬) <czchen@debian.org>
 Section: net
 Priority: optional
-Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-Uploaders: Simon Quigley <tsimonq2@ubuntu.com>
-Build-Depends: cmake,
-               debhelper (>= 12),
-               libkf5networkmanagerqt-dev (>= 5.36.0),
-               qtbase5-dev (>= 5.4.0),
-               qttools5-dev (>= 5.4.0)
-Standards-Version: 4.4.0
+Build-Depends: debhelper-compat (= 13),
+               cmake,
+               libkf6networkmanagerqt-dev (>= 6.5.0),
+               libkf6modemmanagerqt-dev (>= 6.5.0),
+               qt6-tools-dev (>= 6.6.2),
+               qt6-tools-dev-tools (>= 6.6.2)
+Standards-Version: 4.7.0
 Homepage: https://github.com/palinek/nm-tray
-Vcs-Browser: https://phab.lubuntu.me/source/nm-tray/
-Vcs-Git: https://phab.lubuntu.me/source/nm-tray.git
+Vcs-Browser: https://salsa.debian.org/lxqt-team/nm-tray
+Vcs-Git: https://salsa.debian.org/lxqt-team/nm-tray.git
+Rules-Requires-Root: no
 
 Package: nm-tray
 Architecture: any
 Depends: ${misc:Depends},
-         ${shlibs:Depends}
-Description: simple NetworkManager front end
+         ${shlibs:Depends},
+         network-manager,
+         qterminal | x-terminal-emulator
+Recommends: nm-tray-l10n
+Description: Simple Network Manager frontend written in Qt
  nm-tray is a simple NetworkManager front end with information icon residing
  in system tray (like e.g. nm-applet). It's a pure Qt application. For
- interaction with NetworkManager it uses API provided by
- KF5::NetworkManagerQt -> plain DBus communication.
+ interaction with NetworkManager it uses API provided by KF5::NetworkManagerQt
+ -> plain DBus communication.
+ .
+ This package contain the application files.
+
+Package: nm-tray-l10n
+Architecture: all
+Multi-Arch: foreign
+Section: localization
+Depends: ${misc:Depends},
+         qttranslations5-l10n
+Description: Language package for nm-tray
+ nm-tray is a simple NetworkManager front end with information icon residing
+ in system tray (like e.g. nm-applet).
+ .
+ This package contains the l10n files needed by nm-tray.

debian/copyright

@@ -1,17 +1,18 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: nm-tray
-Upstream-Contact: Palo Kisa <palo.kisa@gmail.com>
 Source: https://github.com/palinek/nm-tray
 
 Files: *
-Copyright: 2015-2018 Palo Kisa <palo.kisa@gmail.com>
-License: GPL-2+
+Copyright: 2015-2022, Palo Kisa <palo.kisa@gmail.com>
+License: GPL-2.0+
 
 Files: debian/*
-Copyright: 2018 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-License: GPL-2+
+Copyright: 2018-2019, Alf Gaida <agaida@siduction.org>
+           2022,      suman rajan <suman@cryptolab.net>
+           2023,      Andrew Lee (李健秋) <ajqlee@debian.org>
+License: GPL-2.0+
 
-License: GPL-2+
+License: GPL-2.0+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or

debian/docs

@@ -0,0 +1 @@
+README.md

debian/gbp.conf

@@ -0,0 +1,6 @@
+[DEFAULT]
+debian-branch = debian/sid
+upstream-branch = upstream/latest
+pristine-tar = True
+compression = gz
+

debian/lintian-overrides

@@ -0,0 +1,2 @@
+# there will be no manpage in nearer future
+nm-tray: no-manual-page usr/bin/nm-tray

debian/nm-tray-l10n.install

@@ -0,0 +1 @@
+usr/share/nm-tray

debian/nm-tray.install

@@ -0,0 +1,3 @@
+etc/xdg/autostart/nm-tray-autostart.desktop
+usr/share/applications/nm-tray.desktop
+usr/bin/nm-tray

debian/patches/include_used_class.patch

@@ -1,18 +0,0 @@
-Description: Add missing include for used class
-Author: Palo Kisa <palo.kisa@gmail.com>
-Applied-Upstream: https://github.com/palinek/nm-tray/commit/4563dabee3cbee13bc9d23a4a5d0ddda1526b43f
-
----
- src/nmmodel.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/src/nmmodel.cpp
-+++ b/src/nmmodel.cpp
-@@ -45,6 +45,7 @@ COPYRIGHT_HEADER*/
- #include <NetworkManagerQt/ConnectionSettings>
- #include <QDBusPendingCallWatcher>
- #include <QInputDialog>
-+#include <QMetaEnum>
- 
- namespace
- {

debian/patches/series

@@ -1,3 +1,2 @@
 generalize-terminal-for-edits.patch
 blacklist-from-menu.patch
-include_used_class.patch

debian/rules

@@ -1,17 +1,17 @@
 #!/usr/bin/make -f
+# export DH_VERBOSE=1
 
-export DH_VERBOSE = 1
+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
-
+	dh ${@} --buildsystem cmake
 
 override_dh_auto_configure:
-	dh_auto_configure --\
-		-DPULL_TRANSLATIONS=OFF \
-		-DUPDATE_TRANSLATIONS=OFF \
+	dh_auto_configure -- \
+		-DUPDATE_TRANSLATIONS=NO \
+		-DWITH_MODEMMANAGER_SUPPORT=YES \
 		-DDOM_PLUGIN=YES \
+		-DPULL_TRANSLATIONS=NO \
 		-DCMAKE_BUILD_TYPE=RelWithDebInfo

debian/salsa-ci.yml

@@ -0,0 +1,12 @@
+# For more information on what jobs are run see:
+# https://salsa.debian.org/salsa-ci-team/pipeline
+#
+# To enable the jobs, go to your repository (at salsa.debian.org)
+# and click over Settings > CI/CD > Expand (in General pipelines).
+# In "Custom CI config path" write debian/salsa-ci.yml and click
+# in "Save Changes". The CI tests will run after the next commit.
+---
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
+

debian/source/options

@@ -0,0 +1 @@
+tar-ignore=.gitignore

debian/upstream/metadata

@@ -0,0 +1,5 @@
+Bug-Database: https://github.com/palinek/nm-tray/issues
+Bug-Submit: https://github.com/palinek/nm-tray/issues/new
+Changelog: https://github.com/palinek/nm-tray/commits/master
+Repository: https://github.com/palinek/nm-tray.git
+Repository-Browse: https://github.com/palinek/nm-tray

debian/watch

@@ -1,3 +1,3 @@
-version=3
-opts="filenamemangle=s/(?:.*\/)?v?(\d[\d.]*)\.tar\.gz/$1.tar.gz/" \
-         https://github.com/palinek/nm-tray/tags (?:.*/)?v?(\d[\d.]*)\.tar\.gz
+version=4
+opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/nm-tray-$1\.tar\.gz/ \
+  https://github.com/palinek/nm-tray/tags .*/v?(\d\S+)\.tar\.gz