[SCM] subtitlecomposer packaging branch, master, updated. debian/0.6.5-1-6-g7e8f59b

Pino Toscano pino at moszumanska.debian.org
Wed Feb 14 07:36:07 UTC 2018


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/subtitlecomposer.git;a=commitdiff;h=9e3b6de

The following commit has been merged in the master branch:
commit 9e3b6de90c971e6de9078c89b056e5d5d5cebfec
Author: Pino Toscano <pino at debian.org>
Date:   Wed Feb 14 08:26:14 2018 +0100

    build with cmake < 3.10
---
 debian/changelog                 |  1 +
 debian/patches/cmake-policy.diff | 18 ++++++++++++++++++
 debian/patches/series            |  1 +
 3 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 850ded7..197cc55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ subtitlecomposer (0.6.6-0r1) UNRELEASED; urgency=medium
   * New upstream release.
   * Add new build dependencies required by the new version: libavcodec-dev,
     libavformat-dev, libavutil-dev, and libswresample-dev.
+  * Do not fail if cmake does not have policy CMP0071; patch cmake-policy.diff.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Wed, 14 Feb 2018 08:07:32 +0100
 
diff --git a/debian/patches/cmake-policy.diff b/debian/patches/cmake-policy.diff
new file mode 100644
index 0000000..ad5a169
--- /dev/null
+++ b/debian/patches/cmake-policy.diff
@@ -0,0 +1,18 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Do not fail if cmake does not have policy CMP0071
+Forwarded: no
+Last-Update: 2018-02-14
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -12,7 +12,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PAT
+ 
+ cmake_policy(SET CMP0043 NEW)
+ cmake_policy(SET CMP0063 NEW)
+-cmake_policy(SET CMP0071 NEW)
++if(POLICY CMP0071)
++	cmake_policy(SET CMP0071 NEW)
++endif()
+ 
+ include(KDEInstallDirs)
+ include(KDECMakeSettings)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a1ae8f1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+cmake-policy.diff

-- 
subtitlecomposer packaging



More information about the pkg-kde-commits mailing list