Lubuntu/nm-tray-packaging
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ci/stable' into ci/unstable

Browse Source
This commit is contained in:
Simon Quigley 2021-02-26 17:23:22 -06:00
commit 2a3028e484
13 changed files with 134 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
debian/changelog vendored
View File

@ -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 <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
* Removed dependency on libkf5networkmanagerqt-dev (LP: #1816267)
@ -12,6 +52,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
@ -32,6 +86,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.

1
debian/compat vendored
View File

@ -1 +0,0 @@
12

50
debian/control vendored
View File

@ -1,24 +1,46 @@
Source: nm-tray
Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
XSBC-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
Uploaders: Alf Gaida <agaida@siduction.org>,
ChangZhuo Chen (陳昌倬) <czchen@debian.org>,
Simon Quigley <tsimonq2@ubuntu.com>
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 (= 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.

11
debian/copyright vendored
View File

@ -1,17 +1,16 @@
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-2019, 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>
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

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 = xz

2
debian/lintian-overrides vendored Normal file
View File

@ -0,0 +1,2 @@
# there will be no manpage in nearer future
nm-tray: binary-without-manpage 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

16
debian/rules vendored Executable file → Normal file
View File

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

1
debian/source/options vendored Normal file
View File

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

6
debian/upstream/metadata vendored Normal file
View File

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

6
debian/watch vendored
View File

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