Merge branch 'ci/stable' into ci/unstable
Removed upstream applied patch Removed unnecessary dependency
This commit is contained in:
commit
792d166148
4
debian/changelog
vendored
4
debian/changelog
vendored
@ -1,8 +1,8 @@
|
|||||||
nm-tray (0.4.3-0ubuntu2) eoan; urgency=medium
|
nm-tray (0.4.3-0ubuntu2) eoan; urgency=medium
|
||||||
|
|
||||||
* Add patch to include used class
|
* Removed dependency on libkf5networkmanagerqt-dev (LP: #1816267)
|
||||||
|
|
||||||
-- apt-ghetto <apt-ghetto@lubuntu.me> Wed, 02 Oct 2019 18:44:42 +0200
|
-- apt-ghetto <apt-ghetto@lubuntu.me> Thu, 03 Oct 2019 18:06:08 +0200
|
||||||
|
|
||||||
nm-tray (0.4.3-0ubuntu1) eoan; urgency=medium
|
nm-tray (0.4.3-0ubuntu1) eoan; urgency=medium
|
||||||
|
|
||||||
|
3
debian/control
vendored
3
debian/control
vendored
@ -15,8 +15,7 @@ Vcs-Git: https://phab.lubuntu.me/source/nm-tray.git
|
|||||||
|
|
||||||
Package: nm-tray
|
Package: nm-tray
|
||||||
Architecture: any
|
Architecture: any
|
||||||
Depends: libkf5networkmanagerqt-dev (>= 5.36.0),
|
Depends: ${misc:Depends},
|
||||||
${misc:Depends},
|
|
||||||
${shlibs:Depends}
|
${shlibs:Depends}
|
||||||
Description: simple NetworkManager front end
|
Description: simple NetworkManager front end
|
||||||
nm-tray is a simple NetworkManager front end with information icon residing
|
nm-tray is a simple NetworkManager front end with information icon residing
|
||||||
|
22
debian/patches/include_used_class.patch
vendored
22
debian/patches/include_used_class.patch
vendored
@ -1,22 +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
|
|
||||||
{
|
|
||||||
|
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
@ -1,3 +1,2 @@
|
|||||||
generalize-terminal-for-edits.patch
|
generalize-terminal-for-edits.patch
|
||||||
blacklist-from-menu.patch
|
blacklist-from-menu.patch
|
||||||
include_used_class.patch
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user