[SCM] krecipes packaging branch, master, updated. debian/2.1.0-2-4-gd444831
Pino Toscano
pino at moszumanska.debian.org
Sat Jun 18 13:25:08 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/krecipes.git;a=commitdiff;h=55bca82
The following commit has been merged in the master branch:
commit 55bca82f87b032a2e284d5bdfb5dfd1c54cf2fd0
Author: Pino Toscano <pino at debian.org>
Date: Sat Jun 18 15:21:17 2016 +0200
fix cmake policies
---
debian/changelog | 5 +++++
debian/patches/series | 1 +
...in_req-to-match-kdelibs-policy-and-enable.patch | 25 ++++++++++++++++++++++
3 files changed, 31 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 074a9de..aa904cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
krecipes (2.1.0-3) UNRELEASED; urgency=medium
+ [ Pino Toscano ]
+ * Backport upstream commit b4f0a78ad630e397bac9deafb4d91dc9edbe6ecb to set
+ the cmake minimum version required and policies, and build properly with
+ that; patch
+ upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch.
-- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Sat, 18 Jun 2016 15:16:33 +0200
diff --git a/debian/patches/series b/debian/patches/series
index a6fd53a..511ee66 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
upstream_Fix-flags-for-KFontDialog-getFont.patch
+upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch
diff --git a/debian/patches/upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch b/debian/patches/upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch
new file mode 100644
index 0000000..7608282
--- /dev/null
+++ b/debian/patches/upstream_set-cmake_min_req-to-match-kdelibs-policy-and-enable.patch
@@ -0,0 +1,25 @@
+From b4f0a78ad630e397bac9deafb4d91dc9edbe6ecb Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Sat, 18 Jun 2016 15:07:57 +0200
+Subject: [PATCH] set cmake_min_req to match kdelibs policy and enable newer
+ cmake policies
+
+---
+ CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0497fde..635efa2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,7 @@
+ project(krecipes)
+
++cmake_minimum_required(VERSION 2.8.9)
++
+ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake
+ ${CMAKE_MODULE_PATH})
+
+--
+2.8.1
+
--
krecipes packaging
More information about the pkg-kde-commits
mailing list