[SCM] kfilemetadata packaging branch, master, updated. debian/4.14.0-1-8-g6561e62

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kfilemetadata.git;a=commitdiff;h=6561e62

The following commit has been merged in the master branch:
commit 6561e62e47be1b784d0ad50c1c9d4efdbffbf35c
Author: Pino Toscano <pino at debian.org>
Date:   Wed Jul 27 20:00:55 2016 +0200

    fix cmake policies
    
    backport upstream commit e6ce5bc30ecc40343da35affe2edb65947204ea4
---
 debian/changelog                                   |  3 ++
 debian/patches/series                              |  1 +
 .../upstream_fix-cmake-policy-warnings.patch       | 34 ++++++++++++++++++++++
 3 files changed, 38 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6f46da1..d4c9c49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ kfilemetadata (4:4.14.3-0r1) UNRELEASED; urgency=medium
   * Rename XS-Testsuite field as Testsuite.
   * Small fix to copyright.
   * Bump Standards-Version to 3.9.8, no changes required.
+  * Backport upstream commit e6ce5bc30ecc40343da35affe2edb65947204ea4 to set
+    the cmake minimum version required and policies, and build properly with
+    that; patch upstream_fix-cmake-policy-warnings.patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 27 Jul 2016 19:45:28 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..605af68
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_fix-cmake-policy-warnings.patch
diff --git a/debian/patches/upstream_fix-cmake-policy-warnings.patch b/debian/patches/upstream_fix-cmake-policy-warnings.patch
new file mode 100644
index 0000000..c7bc196
--- /dev/null
+++ b/debian/patches/upstream_fix-cmake-policy-warnings.patch
@@ -0,0 +1,34 @@
+From e6ce5bc30ecc40343da35affe2edb65947204ea4 Mon Sep 17 00:00:00 2001
+From: David Faure <faure at kde.org>
+Date: Sun, 26 Jul 2015 23:23:57 +0200
+Subject: [PATCH] fix cmake policy warnings
+
+---
+ CMakeLists.txt     | 1 +
+ src/CMakeLists.txt | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3b53f43..5fe22ef 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,3 +1,4 @@
++cmake_minimum_required(VERSION 2.8.9)
+ project(kfilemetadata)
+ 
+ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index a66fa1c..58cf7c0 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -7,6 +7,7 @@ kde4_add_library(kfilemetadata SHARED
+ )
+ 
+ target_link_libraries(kfilemetadata
++   LINK_PRIVATE
+   ${QT_QTCORE_LIBRARY}
+   ${KDE4_KDECORE_LIBS}
+ )
+-- 
+2.8.1
+

-- 
kfilemetadata packaging