[SCM] kmix packaging branch, master, updated. debian/16.08.0-1-9-g410c411
Pino Toscano
pino at moszumanska.debian.org
Mon Jan 1 10:09:45 UTC 2018
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kmix.git;a=commitdiff;h=a417e5e
The following commit has been merged in the master branch:
commit a417e5e64c103d060224bb7ac998596897772d15
Author: Pino Toscano <pino at debian.org>
Date: Mon Jan 1 11:02:47 2018 +0100
kubuntu_cmake-policy.diff: drop, obsolete
---
debian/changelog | 2 ++
debian/patches/kubuntu_cmake-policy.diff | 21 ---------------------
debian/patches/series | 1 -
3 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 73aea8b..94ae3a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ kmix (4:17.08.3-0r1) UNRELEASED; urgency=medium
* Remove workaround for mips* architectures, as it should be not needed
anymore (hopefully)
- remove patch mips-no-as-needed-workaround.diff
+ * Remove patch kubuntu_cmake-policy.diff, as its job is already done
+ upstream.
-- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 31 Dec 2017 20:43:44 +0100
diff --git a/debian/patches/kubuntu_cmake-policy.diff b/debian/patches/kubuntu_cmake-policy.diff
deleted file mode 100644
index 7843813..0000000
--- a/debian/patches/kubuntu_cmake-policy.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Thu, 21 Apr 2016 01:37:11 +0200
-Subject: kubuntu_cmake-policy
-
----
- CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 458eb9c..3aee4d3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -28,6 +28,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 061ef34..2f3c3f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
kmix_showeverywhere.diff
-kubuntu_cmake-policy.diff
--
kmix packaging
More information about the pkg-kde-commits
mailing list