diff --git a/debian/changelog b/debian/changelog index 3fb45ee..b4bdfef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,52 @@ +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 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 . + * debian/control: add myself as uploader. + * debian/copyright: update. + + -- Andrew Lee (李健秋) 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 Mon, 18 Jul 2022 17:10:31 +0200 + nm-tray (0.5.0-0ubuntu4) noble; urgency=high * No change rebuild against libqt5core5t64, libqt5dbus5t64, diff --git a/debian/control b/debian/control index 1ef00e6..1203d8e 100644 --- a/debian/control +++ b/debian/control @@ -1,13 +1,13 @@ Source: nm-tray -Maintainer: Lubuntu Developers -XSBC-Original-Maintainer: LXQt Packaging Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: LXQt Packaging Team Uploaders: Alf Gaida , - ChangZhuo Chen (陳昌倬) , - Simon Quigley + Andrew Lee (李健秋) , + ChangZhuo Chen (陳昌倬) Section: net Priority: optional -Build-Depends: cmake, - debhelper-compat (= 13), +Build-Depends: debhelper-compat (= 13), + cmake, libkf5networkmanagerqt-dev, modemmanager-qt-dev, qttools5-dev, @@ -20,10 +20,10 @@ Rules-Requires-Root: no Package: nm-tray Architecture: any -Depends: network-manager, - qterminal | x-terminal-emulator, - ${misc:Depends}, - ${shlibs:Depends} +Depends: ${misc:Depends}, + ${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 @@ -37,7 +37,8 @@ Package: nm-tray-l10n Architecture: all Multi-Arch: foreign Section: localization -Depends: qttranslations5-l10n, ${misc:Depends} +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). diff --git a/debian/copyright b/debian/copyright index 9b6cdbf..de00ee6 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,11 +3,13 @@ Upstream-Name: nm-tray Source: https://github.com/palinek/nm-tray Files: * -Copyright: 2015-2019, Palo Kisa +Copyright: 2015-2022, Palo Kisa License: GPL-2.0+ Files: debian/* Copyright: 2018-2019, Alf Gaida + 2022, suman rajan + 2023, Andrew Lee (李健秋) License: GPL-2.0+ License: GPL-2.0+ diff --git a/debian/gbp.conf b/debian/gbp.conf index 8957fee..395b717 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -2,5 +2,5 @@ debian-branch = debian/sid upstream-branch = upstream/latest pristine-tar = True -compression = xz +compression = gz diff --git a/debian/lintian-overrides b/debian/lintian-overrides index 20cc831..f50a69b 100644 --- a/debian/lintian-overrides +++ b/debian/lintian-overrides @@ -1,2 +1,2 @@ # there will be no manpage in nearer future -nm-tray: binary-without-manpage usr/bin/nm-tray +nm-tray: no-manual-page usr/bin/nm-tray diff --git a/debian/nm-tray.install b/debian/nm-tray.install index b8a160f..d3dd3f6 100644 --- a/debian/nm-tray.install +++ b/debian/nm-tray.install @@ -1,3 +1,3 @@ etc/xdg/autostart/nm-tray-autostart.desktop -usr/bin/nm-tray usr/share/applications/nm-tray.desktop +usr/bin/nm-tray diff --git a/debian/rules b/debian/rules index 72b51d1..e75ebf4 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,6 @@ 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 @@ -16,6 +15,3 @@ override_dh_auto_configure: -DDOM_PLUGIN=YES \ -DPULL_TRANSLATIONS=NO \ -DCMAKE_BUILD_TYPE=RelWithDebInfo - -override_dh_missing: - dh_missing --fail-missing diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml new file mode 100644 index 0000000..28214c5 --- /dev/null +++ b/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 + diff --git a/debian/upstream/metadata b/debian/upstream/metadata index 4752b36..024b7ed 100644 --- a/debian/upstream/metadata +++ b/debian/upstream/metadata @@ -1,6 +1,5 @@ -Name: nm-tray 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 +Repository: https://github.com/palinek/nm-tray.git Repository-Browse: https://github.com/palinek/nm-tray