From 5040504b2c6d77f3db92abb382121cb2bb5607c6 Mon Sep 17 00:00:00 2001 From: apt-ghetto Date: Wed, 9 Oct 2019 15:04:33 -0500 Subject: [PATCH] Fix FTBS of nm-tray Summary: * Add missing include for used class * Remove unnecessary dependency on libkf5networkmanagerqt-dev Test Plan: 1. Check that the build does not fail. 2. Check that it has the same behaviour as before. Reviewers: wxl, tsimonq2, hmollercl Reviewed By: tsimonq2 Differential Revision: https://phab.lubuntu.me/D53 --- debian/changelog | 7 +++++++ debian/control | 3 +-- debian/patches/include_used_class.patch | 18 ++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 debian/patches/include_used_class.patch diff --git a/debian/changelog b/debian/changelog index 4982b90..d9ede32 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +nm-tray (0.4.3-0ubuntu2) eoan; urgency=medium + + * Add missing include for used class + * Removed dependency on libkf5networkmanagerqt-dev (LP: #1816267) + + -- apt-ghetto Wed, 09 Oct 2019 18:26:16 +0200 + nm-tray (0.4.3-0ubuntu1) eoan; urgency=medium * Bump version for new upstream release 0.4.3 diff --git a/debian/control b/debian/control index 5550395..59e2981 100644 --- a/debian/control +++ b/debian/control @@ -15,8 +15,7 @@ Vcs-Git: https://phab.lubuntu.me/source/nm-tray.git Package: nm-tray Architecture: any -Depends: libkf5networkmanagerqt-dev (>= 5.36.0), - ${misc:Depends}, +Depends: ${misc:Depends}, ${shlibs:Depends} Description: simple NetworkManager front end nm-tray is a simple NetworkManager front end with information icon residing diff --git a/debian/patches/include_used_class.patch b/debian/patches/include_used_class.patch new file mode 100644 index 0000000..6bb90f6 --- /dev/null +++ b/debian/patches/include_used_class.patch @@ -0,0 +1,18 @@ +Description: Add missing include for used class +Author: Palo Kisa +Applied-Upstream: https://github.com/palinek/nm-tray/commit/4563dabee3cbee13bc9d23a4a5d0ddda1526b43f + +--- + src/nmmodel.cpp | 1 + + 1 file changed, 1 insertion(+) + +--- a/src/nmmodel.cpp ++++ b/src/nmmodel.cpp +@@ -45,6 +45,7 @@ COPYRIGHT_HEADER*/ + #include + #include + #include ++#include + + namespace + { diff --git a/debian/patches/series b/debian/patches/series index 7cdc5d4..e98994c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ generalize-terminal-for-edits.patch blacklist-from-menu.patch +include_used_class.patch