Compare commits

..

No commits in common. 'ubuntu/oracular' and 'ubuntu/hirsute' have entirely different histories.

77
debian/changelog vendored

@ -1,80 +1,3 @@
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 nm-tray (0.4.3-2ubuntu1) hirsute; urgency=low
* Merge from Debian unstable. Remaining changes: * Merge from Debian unstable. Remaining changes:

12
debian/control vendored

@ -1,18 +1,18 @@
Source: nm-tray Source: nm-tray
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
XSBC-Original-Maintainer: LXQt Packaging Team <team+lxqt@tracker.debian.org> XSBC-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
Uploaders: Alf Gaida <agaida@siduction.org>, Uploaders: Alf Gaida <agaida@siduction.org>,
Andrew Lee (李健秋) <ajqlee@debian.org>, ChangZhuo Chen (陳昌倬) <czchen@debian.org>,
ChangZhuo Chen (陳昌倬) <czchen@debian.org> Simon Quigley <tsimonq2@ubuntu.com>
Section: net Section: net
Priority: optional Priority: optional
Build-Depends: debhelper-compat (= 13), Build-Depends: debhelper-compat (= 12),
cmake, cmake,
libkf5networkmanagerqt-dev, libkf5networkmanagerqt-dev,
modemmanager-qt-dev, modemmanager-qt-dev,
qttools5-dev, qttools5-dev,
qttools5-dev-tools qttools5-dev-tools
Standards-Version: 4.6.1 Standards-Version: 4.4.1
Homepage: https://github.com/palinek/nm-tray Homepage: https://github.com/palinek/nm-tray
Vcs-Browser: https://salsa.debian.org/lxqt-team/nm-tray Vcs-Browser: https://salsa.debian.org/lxqt-team/nm-tray
Vcs-Git: https://salsa.debian.org/lxqt-team/nm-tray.git Vcs-Git: https://salsa.debian.org/lxqt-team/nm-tray.git

4
debian/copyright vendored

@ -3,13 +3,11 @@ Upstream-Name: nm-tray
Source: https://github.com/palinek/nm-tray Source: https://github.com/palinek/nm-tray
Files: * Files: *
Copyright: 2015-2022, Palo Kisa <palo.kisa@gmail.com> Copyright: 2015-2019, Palo Kisa <palo.kisa@gmail.com>
License: GPL-2.0+ License: GPL-2.0+
Files: debian/* Files: debian/*
Copyright: 2018-2019, Alf Gaida <agaida@siduction.org> 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.0+
License: GPL-2.0+ License: GPL-2.0+

2
debian/gbp.conf vendored

@ -2,5 +2,5 @@
debian-branch = debian/sid debian-branch = debian/sid
upstream-branch = upstream/latest upstream-branch = upstream/latest
pristine-tar = True pristine-tar = True
compression = gz compression = xz

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

@ -0,0 +1,21 @@
From 4563dabee3cbee13bc9d23a4a5d0ddda1526b43f Mon Sep 17 00:00:00 2001
From: Palo Kisa <palo.kisa@gmail.com>
Date: Tue, 1 Oct 2019 12:03:43 +0200
Subject: [PATCH] nmmodel: Add include for used class
---
src/nmmodel.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/nmmodel.cpp b/src/nmmodel.cpp
index d779801..ac70307 100644
--- a/src/nmmodel.cpp
+++ b/src/nmmodel.cpp
@@ -45,6 +45,7 @@ COPYRIGHT_HEADER*/
#include <NetworkManagerQt/ConnectionSettings>
#include <QDBusPendingCallWatcher>
#include <QInputDialog>
+#include <QMetaEnum>
namespace
{

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

4
debian/rules vendored

@ -4,6 +4,7 @@
export LC_ALL=C.UTF-8 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
@ -15,3 +16,6 @@ override_dh_auto_configure:
-DDOM_PLUGIN=YES \ -DDOM_PLUGIN=YES \
-DPULL_TRANSLATIONS=NO \ -DPULL_TRANSLATIONS=NO \
-DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_BUILD_TYPE=RelWithDebInfo
override_dh_missing:
dh_missing --fail-missing

@ -1,12 +0,0 @@
# 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,5 +1,6 @@
Name: nm-tray
Bug-Database: https://github.com/palinek/nm-tray/issues Bug-Database: https://github.com/palinek/nm-tray/issues
Bug-Submit: https://github.com/palinek/nm-tray/issues/new Bug-Submit: https://github.com/palinek/nm-tray/issues/new
Changelog: https://github.com/palinek/nm-tray/commits/master Changelog: https://github.com/palinek/nm-tray/commits/master
Repository: https://github.com/palinek/nm-tray.git Repository: https://github.com/palinek/nm-tray
Repository-Browse: https://github.com/palinek/nm-tray Repository-Browse: https://github.com/palinek/nm-tray

Loading…
Cancel
Save