[SCM] kmix packaging branch, kubuntu_wily_archive, updated. ubuntu/4%15.08.0-0ubuntu1-2-ged102ee

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kmix.git;a=commitdiff;h=ed102ee

The following commit has been merged in the kubuntu_wily_archive branch:
commit ed102ee67f82e8272a90192c86696a7a6d3087bd
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Sep 7 13:52:50 2015 +0100

    Add kubuntu_cmake-policy.diff to fix compilation
---
 debian/changelog                         |  6 ++++++
 debian/patches/kubuntu_cmake-policy.diff | 21 +++++++++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 729613c..c0a4e3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kmix (4:15.08.0-0ubuntu3) wily; urgency=medium
+
+  * Add kubuntu_cmake-policy.diff to fix compilation
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 07 Sep 2015 13:49:30 +0100
+
 kmix (4:15.08.0-0ubuntu2) wily; urgency=medium
 
   * Add upstream_fix-kmixui.rc-install-location.diff
diff --git a/debian/patches/kubuntu_cmake-policy.diff b/debian/patches/kubuntu_cmake-policy.diff
new file mode 100644
index 0000000..7749b7d
--- /dev/null
+++ b/debian/patches/kubuntu_cmake-policy.diff
@@ -0,0 +1,21 @@
+Description: set cmake policy to allow compilation
+ new cmake policy means kmix can't compile, set to old policy
+Author: Jonathan Riddell
+Origin: me
+Forwarded: will send to upstream maintainer
+Last-Update: 2015-09-07
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: kmix-15.08.0/CMakeLists.txt
+===================================================================
+--- kmix-15.08.0.orig/CMakeLists.txt
++++ kmix-15.08.0/CMakeLists.txt
+@@ -27,6 +27,8 @@ if(POLICY CMP0046)
+   cmake_policy (SET CMP0046 NEW)
+ endif()
+ 
++cmake_policy (SET CMP0046 OLD)
++
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") 
+ 
+ if (KMIX_KF5_BUILD)
diff --git a/debian/patches/series b/debian/patches/series
index a2e2551..63dba25 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 kmix_showeverywhere.diff
 upstream_fix-kmixui.rc-install-location.diff
+kubuntu_cmake-policy.diff

-- 
kmix packaging