[SCM] muon packaging branch, kubuntu_vivid_archive, updated. cb6f9eb6fa755f0710fa8144e9e2f5dbdb49bcb0

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/muon.git;a=commitdiff;h=cb6f9eb

The following commit has been merged in the kubuntu_vivid_archive branch:
commit cb6f9eb6fa755f0710fa8144e9e2f5dbdb49bcb0
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Mar 25 12:00:14 2015 +0100

    Add build-dep on libkf5kdelibs4support-dev and kubuntu_detect-kdelibs4support.diff
---
 debian/changelog                                   |  8 +++++++-
 debian/patches/kubuntu_detect-kdelibs4support.diff | 18 ++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0a32375..61192ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-muon (4:5.2.2a-0ubuntu1) vivid; urgency=medium
+muon (4:5.2.2-1-0ubuntu2) vivid; urgency=medium
+
+  * Add build-dep on libkf5kdelibs4support-dev and kubuntu_detect-kdelibs4support.diff
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 25 Mar 2015 09:59:22 +0100
+
+muon (4:5.2.2-1-0ubuntu1) vivid; urgency=medium
 
   * Add back muon-installer.mo
   * Fixed upstream release
diff --git a/debian/patches/kubuntu_detect-kdelibs4support.diff b/debian/patches/kubuntu_detect-kdelibs4support.diff
new file mode 100644
index 0000000..87294f6
--- /dev/null
+++ b/debian/patches/kubuntu_detect-kdelibs4support.diff
@@ -0,0 +1,18 @@
+Index: muon-5.2.2-1/libmuonapt/CMakeLists.txt
+===================================================================
+--- muon-5.2.2-1.orig/libmuonapt/CMakeLists.txt
++++ muon-5.2.2-1/libmuonapt/CMakeLists.txt
+@@ -6,9 +6,12 @@ set(muonapt_SRCS
+     HistoryView/HistoryView.cpp
+ )
+ 
++find_package(KF5 REQUIRED KDELibs4Support)
++
++
+ add_library(MuonApt ${muonapt_SRCS})
+ target_link_libraries(MuonApt Qt5::Core
+-     KF5::Solid KF5::KIOWidgets KF5::XmlGui
++     KF5::Solid KF5::KIOWidgets KF5::XmlGui KF5::KDELibs4Support
+      QApt::Main muonprivate
+ )
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b0bfd3c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+kubuntu_detect-kdelibs4support.diff

-- 
muon packaging