Compare commits

...

24 Commits

Author SHA1 Message Date
7e5355a2b7 Upload to Plucky 2024-10-17 11:17:35 -05:00
a9350cc071 Bump Standards-version to 4.7.0, no changes needed. 2024-10-17 11:14:26 -05:00
6e845c282c Update dependencies for Qt 6. 2024-10-17 11:13:56 -05:00
7382d055e7 New upstream release. 2024-10-17 11:11:28 -05:00
Zixing Liu
af4ce8d021 Merge with Debian unstable (LP: #2065347) 2024-10-17 11:10:32 -05:00
Julian Andres Klode
ef56092836 No change rebuild against libqt5core5t64, libqt5dbus5t64, libqt5gui5t64, libqt5network5t64, libqt5widgets5t64. 2024-04-26 16:55:51 -05:00
Steve Langasek
0ec76560f2 No-change rebuild for CVE-2024-3094 2024-04-26 16:55:09 -05:00
Steve Langasek
eca8eca740 No-change rebuild against libqt5core5t64 2024-04-26 16:54:35 -05:00
aa3e5e4b07 Upload to Kinetic. 2022-06-02 23:49:20 -05:00
debf2703bd Wraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaap. 2022-06-02 23:40:57 -05:00
6d869dab53 Remove reverse-applicable patch. 2022-06-02 23:36:59 -05:00
7bfd7cbe7e Make debian/rules executable. 2022-06-02 23:36:02 -05:00
c0742da1e7 Bump debhelper compat and Standards-version, no changes needed. 2022-06-02 23:35:38 -05:00
b7fda9b108 New upstream release. 2022-06-02 23:34:43 -05:00
05d03d8d51 Sync from archive. 2021-02-23 20:09:09 -05:00
cc83478664 Merge branch 'ubuntu/focal' into ci/stable 2020-04-23 05:02:20 -05:00
apt-ghetto
5040504b2c Fix FTBS of nm-tray
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

Reviewed By: tsimonq2

Differential Revision: https://phab.lubuntu.me/D53
2019-10-09 15:04:53 -05:00
apt-ghetto
02814a7ea5 Fix FTBS of nm-tray
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
2019-10-03 18:42:28 +02:00
41338fc73e Fix up prior to uploading. 2019-08-10 23:12:46 -05:00
Hans P Möller
330d09bf76 Bump release 0.4.3
Summary: Get new release 0.4.3

Test Plan: after packagin see if version is 0.4.3, icons should be well seen in taskbar

Reviewers: wxl, tsimonq2

Reviewed By: tsimonq2

Differential Revision: https://phab.lubuntu.me/D26
2019-08-10 23:12:04 -05:00
debedb6084 fix gitignore 2019-07-30 19:43:58 -07:00
24f0cb9aeb fixed distribution 2019-07-30 19:39:33 -07:00
Hans P. Möller
dbac91e980 Reverted previous commit
Summary: Reverted previous commit that changed connection editor

Test Plan: edit connection should open nm-tui

Reviewers: wxl, tsimonq2

Reviewed By: wxl

Subscribers: wxl

Differential Revision: https://phab.lubuntu.me/D25
2019-07-30 19:12:27 -07:00
Hans P. Möller
1bc4f54069 Changed connection editor to nm-connection-editor
Summary: Changed connection editor to nm-connection-editor from network-manager-gnome

Test Plan: check if nm-tray open nm-connection-editor instead of nmtui

Reviewers: wxl, tsimonq2

Reviewed By: wxl, tsimonq2

Subscribers: hmollercl

Differential Revision: https://phab.lubuntu.me/D16
2019-07-04 12:11:04 -07:00
14 changed files with 257 additions and 33 deletions

172
debian/changelog vendored
View File

@ -1,3 +1,169 @@
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
* Removed dependency on libkf5networkmanagerqt-dev (LP: #1816267)
-- apt-ghetto <apt-ghetto@lubuntu.me> 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 <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
-- Walter Lapchynski <wxl@ubuntu.com> 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 <hmollercl@lubuntu.me> Mon, 01 Jul 2019 10:28:06 -0400
nm-tray (0.4.1-0ubuntu1) cosmic; urgency=medium nm-tray (0.4.1-0ubuntu1) cosmic; urgency=medium
* New upstream bugfix release. * New upstream bugfix release.
@ -6,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 -- 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 nm-tray (0.4.0-0ubuntu3) cosmic; urgency=medium
* Blacklist from menus. * Blacklist from menus.

1
debian/compat vendored
View File

@ -1 +0,0 @@
11

53
debian/control vendored
View File

@ -1,25 +1,46 @@
Source: nm-tray 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 Section: net
Priority: optional Priority: optional
Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com> Build-Depends: debhelper-compat (= 13),
Uploaders: Simon Quigley <tsimonq2@ubuntu.com> cmake,
Build-Depends: cmake, libkf6networkmanagerqt-dev (>= 6.5.0),
debhelper (>= 11), libkf6modemmanagerqt-dev (>= 6.5.0),
libkf5networkmanagerqt-dev (>= 5.36.0), qt6-tools-dev (>= 6.6.2),
qtbase5-dev (>= 5.4.0), qt6-tools-dev-tools (>= 6.6.2)
qttools5-dev (>= 5.4.0) Standards-Version: 4.7.0
Standards-Version: 4.2.1
Homepage: https://github.com/palinek/nm-tray Homepage: https://github.com/palinek/nm-tray
Vcs-Browser: https://phab.lubuntu.me/source/nm-tray/ Vcs-Browser: https://salsa.debian.org/lxqt-team/nm-tray
Vcs-Git: https://phab.lubuntu.me/source/nm-tray.git Vcs-Git: https://salsa.debian.org/lxqt-team/nm-tray.git
Rules-Requires-Root: no
Package: nm-tray Package: nm-tray
Architecture: any Architecture: any
Depends: libkf5networkmanagerqt-dev (>= 5.36.0), Depends: ${misc:Depends},
${misc:Depends}, ${shlibs:Depends},
${shlibs:Depends} network-manager,
Description: simple NetworkManager front end 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 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 in system tray (like e.g. nm-applet). It's a pure Qt application. For
interaction with NetworkManager it uses API provided by interaction with NetworkManager it uses API provided by KF5::NetworkManagerQt
KF5::NetworkManagerQt -> plain DBus communication. -> 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.

13
debian/copyright vendored
View File

@ -1,17 +1,18 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: nm-tray Upstream-Name: nm-tray
Upstream-Contact: Palo Kisa <palo.kisa@gmail.com>
Source: https://github.com/palinek/nm-tray Source: https://github.com/palinek/nm-tray
Files: * Files: *
Copyright: 2015-2018 Palo Kisa <palo.kisa@gmail.com> Copyright: 2015-2022, Palo Kisa <palo.kisa@gmail.com>
License: GPL-2+ License: GPL-2.0+
Files: debian/* Files: debian/*
Copyright: 2018 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com> Copyright: 2018-2019, Alf Gaida <agaida@siduction.org>
License: GPL-2+ 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 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or the Free Software Foundation; either version 2 of the License, or

1
debian/docs vendored Normal file
View File

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

6
debian/gbp.conf vendored Normal file
View File

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

2
debian/lintian-overrides vendored Normal file
View File

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

1
debian/nm-tray-l10n.install vendored Normal file
View File

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

3
debian/nm-tray.install vendored Normal file
View File

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

14
debian/rules vendored
View File

@ -1,17 +1,17 @@
#!/usr/bin/make -f #!/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_BUILD_MAINT_OPTIONS = hardening=+all
export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic 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: override_dh_auto_configure:
dh_auto_configure --\ dh_auto_configure -- \
-DPULL_TRANSLATIONS=OFF \ -DUPDATE_TRANSLATIONS=NO \
-DUPDATE_TRANSLATIONS=OFF \ -DWITH_MODEMMANAGER_SUPPORT=YES \
-DDOM_PLUGIN=YES \ -DDOM_PLUGIN=YES \
-DPULL_TRANSLATIONS=NO \
-DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_BUILD_TYPE=RelWithDebInfo

12
debian/salsa-ci.yml vendored Normal file
View File

@ -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

1
debian/source/options vendored Normal file
View File

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

5
debian/upstream/metadata vendored Normal file
View File

@ -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

6
debian/watch vendored
View File

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