diff --git a/debian/changelog b/debian/changelog index d9ede32..d6cbdcc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,43 @@ +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 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 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 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 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 +53,20 @@ nm-tray (0.4.3-0ubuntu1) eoan; urgency=medium -- Hans P Möller 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 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 Fri, 14 Sep 2018 23:19:21 +0200 + nm-tray (0.4.1-0ubuntu3) eoan; urgency=medium * Reverted previous commit 1bc4f5406954 @@ -33,6 +87,12 @@ nm-tray (0.4.1-0ubuntu1) cosmic; urgency=medium -- Simon Quigley Sat, 06 Oct 2018 16:59:03 -0500 +nm-tray (0.4.0-1) unstable; urgency=medium + + * Initial release (Closes: #890354) + + -- Alf Gaida Sat, 25 Aug 2018 16:58:47 +0200 + nm-tray (0.4.0-0ubuntu3) cosmic; urgency=medium * Blacklist from menus. diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 48082f7..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -12 diff --git a/debian/control b/debian/control index 59e2981..ab4d1e1 100644 --- a/debian/control +++ b/debian/control @@ -1,24 +1,46 @@ Source: nm-tray +Maintainer: Lubuntu Developers +XSBC-Original-Maintainer: LXQt Packaging Team +Uploaders: Alf Gaida , + ChangZhuo Chen (陳昌倬) , + Simon Quigley Section: net Priority: optional -Maintainer: Lubuntu Developers -Uploaders: Simon Quigley -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 (= 12), + cmake, + libkf5networkmanagerqt-dev, + modemmanager-qt-dev, + qttools5-dev, + qttools5-dev-tools +Standards-Version: 4.4.1 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. diff --git a/debian/copyright b/debian/copyright index faf96da..9b6cdbf 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,17 +1,16 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: nm-tray -Upstream-Contact: Palo Kisa Source: https://github.com/palinek/nm-tray Files: * -Copyright: 2015-2018 Palo Kisa -License: GPL-2+ +Copyright: 2015-2019, Palo Kisa +License: GPL-2.0+ Files: debian/* -Copyright: 2018 Lubuntu Developers -License: GPL-2+ +Copyright: 2018-2019, Alf Gaida +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 diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..b43bf86 --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +README.md diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..8957fee --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,6 @@ +[DEFAULT] +debian-branch = debian/sid +upstream-branch = upstream/latest +pristine-tar = True +compression = xz + diff --git a/debian/lintian-overrides b/debian/lintian-overrides new file mode 100644 index 0000000..20cc831 --- /dev/null +++ b/debian/lintian-overrides @@ -0,0 +1,2 @@ +# there will be no manpage in nearer future +nm-tray: binary-without-manpage usr/bin/nm-tray diff --git a/debian/nm-tray-l10n.install b/debian/nm-tray-l10n.install new file mode 100644 index 0000000..ff049e9 --- /dev/null +++ b/debian/nm-tray-l10n.install @@ -0,0 +1 @@ +usr/share/nm-tray diff --git a/debian/nm-tray.install b/debian/nm-tray.install new file mode 100644 index 0000000..d3dd3f6 --- /dev/null +++ b/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 diff --git a/debian/patches/include_used_class.patch b/debian/patches/nmmodel.patch similarity index 51% rename from debian/patches/include_used_class.patch rename to debian/patches/nmmodel.patch index 6bb90f6..6d319ef 100644 --- a/debian/patches/include_used_class.patch +++ b/debian/patches/nmmodel.patch @@ -1,11 +1,14 @@ -Description: Add missing include for used class -Author: Palo Kisa -Applied-Upstream: https://github.com/palinek/nm-tray/commit/4563dabee3cbee13bc9d23a4a5d0ddda1526b43f +From 4563dabee3cbee13bc9d23a4a5d0ddda1526b43f Mon Sep 17 00:00:00 2001 +From: Palo Kisa +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*/ diff --git a/debian/patches/series b/debian/patches/series index e98994c..21f0314 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,3 @@ +nmmodel.patch generalize-terminal-for-edits.patch blacklist-from-menu.patch -include_used_class.patch diff --git a/debian/rules b/debian/rules old mode 100755 new mode 100644 index f31a2fd..72b51d1 --- a/debian/rules +++ b/debian/rules @@ -1,17 +1,21 @@ #!/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 + +override_dh_missing: + dh_missing --fail-missing diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 0000000..112dfc8 --- /dev/null +++ b/debian/source/options @@ -0,0 +1 @@ +tar-ignore=.gitignore diff --git a/debian/upstream/metadata b/debian/upstream/metadata new file mode 100644 index 0000000..4752b36 --- /dev/null +++ b/debian/upstream/metadata @@ -0,0 +1,6 @@ +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-Browse: https://github.com/palinek/nm-tray diff --git a/debian/watch b/debian/watch index 3f148e7..df79982 100644 --- a/debian/watch +++ b/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