[SCM] baloo packaging branch, master, updated. debian/4.14.2-1-12-g192289a

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/baloo.git;a=commitdiff;h=70ca745

The following commit has been merged in the master branch:
commit 70ca7450734f14c52245c81d04cc2bb1ce9aab81
Author: Pino Toscano <pino at debian.org>
Date:   Thu Jul 28 08:09:02 2016 +0200

    fix linking against baloofiles using cmake
    
    backport upstream commit e898ea0ed2f89d977c41671ac2a93b4fd3b9b6c6
---
 debian/changelog                                   |  3 +++
 debian/patches/series                              |  1 +
 ...was-missing-the-EXPORT-that-other-libs-ha.patch | 26 ++++++++++++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index df977e9..c7133ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ baloo (4:4.14.3-0r1) UNRELEASED; urgency=medium
     the cmake minimum version required and policies, and build properly with
     that; patch
     upstream_Set-cmake_minimum_required-to-set-the-cmake-policies.patch.
+  * Backport upstream commit e898ea0ed2f89d977c41671ac2a93b4fd3b9b6c6 to fix
+    linking against baloofiles using cmake; patch
+    upstream_baloofiles-was-missing-the-EXPORT-that-other-libs-ha.patch.
 
  -- Debian/Ubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 28 Jul 2016 07:52:05 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index c39170d..5bec6db 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 disable_tests_depending_on_revdep
 upstream_Set-cmake_minimum_required-to-set-the-cmake-policies.patch
+upstream_baloofiles-was-missing-the-EXPORT-that-other-libs-ha.patch
diff --git a/debian/patches/upstream_baloofiles-was-missing-the-EXPORT-that-other-libs-ha.patch b/debian/patches/upstream_baloofiles-was-missing-the-EXPORT-that-other-libs-ha.patch
new file mode 100644
index 0000000..bf7442e
--- /dev/null
+++ b/debian/patches/upstream_baloofiles-was-missing-the-EXPORT-that-other-libs-ha.patch
@@ -0,0 +1,26 @@
+From e898ea0ed2f89d977c41671ac2a93b4fd3b9b6c6 Mon Sep 17 00:00:00 2001
+From: David Faure <faure at kde.org>
+Date: Wed, 18 May 2016 23:12:37 +0200
+Subject: [PATCH] baloofiles was missing the EXPORT that other libs have
+
+This led to "ld: cannot find -lbaloofiles" in nepomuk-core.
+---
+ src/file/lib/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/file/lib/CMakeLists.txt b/src/file/lib/CMakeLists.txt
+index 867e082..3649f3e 100644
+--- a/src/file/lib/CMakeLists.txt
++++ b/src/file/lib/CMakeLists.txt
+@@ -33,7 +33,7 @@ set_target_properties(baloofiles PROPERTIES
+     SOVERSION ${BALOO_VERSION_MAJOR}
+ )
+ 
+-install(TARGETS baloofiles ${INSTALL_TARGETS_DEFAULT_ARGS})
++install(TARGETS baloofiles EXPORT BalooLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+ install(FILES
+     file.h
+-- 
+2.8.1
+

-- 
baloo packaging