Merge branch 'ci/stable' into ci/unstable

Merge branch 'ubuntu/hirsute' into ci/stable
2021-02-26 17:23:22 -06:00 · 2021-02-26 17:20:17 -06:00 · 2020-06-19 15:50:46 -05:00 · 2020-06-19 15:49:01 -05:00 · 2020-04-23 05:02:54 -05:00 · 2019-10-03 18:51:10 +02:00
4 changed files with 2 additions and 23 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -40,7 +40,6 @@ nm-tray (0.4.3-0ubuntu3) focal; urgency=medium
 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
--- a/debian/nm-tray.lintian-overrides
+++ b/debian/nm-tray.lintian-overrides
@ -0,0 +1,2 @@
 # nm-tray has no CLI functionality, so there's really nothing to document
 nm-tray: binary-without-manpage usr/bin/nm-tray
--- a/debian/patches/nmmodel.patch
+++ b/debian/patches/nmmodel.patch
@ -1,21 +0,0 @@
 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
 {
--- a/debian/patches/series
+++ b/debian/patches/series
@ -1,3 +1,2 @@
 nmmodel.patch
 generalize-terminal-for-edits.patch
 blacklist-from-menu.patch
Author	SHA1	Message	Date
Simon Quigley	2a3028e484	Merge branch 'ci/stable' into ci/unstable	2021-02-26 17:23:22 -06:00
Simon Quigley	1d64d3d4a8	Merge branch 'ubuntu/hirsute' into ci/stable	2021-02-26 17:20:17 -06:00
Simon Quigley	a3e23cb454	Merge branch 'ci/stable' into ci/unstable	2020-06-19 15:50:46 -05:00
Simon Quigley	631e708f49	Override binary-without-manpage, there's no use for one.	2020-06-19 15:49:01 -05:00
Simon Quigley	8cf482bdfb	Merge branch 'ci/stable' into ci/unstable	2020-04-23 05:02:54 -05:00
apt-ghetto	792d166148	Merge branch 'ci/stable' into ci/unstable Removed upstream applied patch Removed unnecessary dependency	2019-10-03 18:51:10 +02:00
apt-ghetto	3f7b126ede	Add patch to add missing include nm-tray FTBFS, because a missing include directive.	2019-10-02 19:07:36 +02:00
		`@ -0,0 +1,2 @@`
							`# nm-tray has no CLI functionality, so there's really nothing to document`
							`nm-tray: binary-without-manpage usr/bin/nm-tray`