[SCM] subtitlecomposer packaging branch, master, updated. debian/0.6.4-1-4-g63ce559

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 63ce559b63819c21651cca021b71d5e2adab6afc
Author: Pino Toscano <pino at debian.org>
Date:   Fri Jun 17 23:31:16 2016 +0200

    avoid cmake failure when Xine is not found
---
 debian/changelog               |  1 +
 debian/patches/series          |  1 +
 debian/patches/xine-cmake.diff | 25 +++++++++++++++++++++++++
 3 files changed, 27 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6d83907..947077b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ subtitlecomposer (0.6.4-2) UNRELEASED; urgency=medium
     - stop mentioning it in the description
     - stop using the xine dh addon
     - stop mentioning the ${xine-x:Depends} variable
+    - avoid cmake failure when Xine is not found; patch xine-cmake.diff.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Fri, 17 Jun 2016 22:27:31 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..54bcaa1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+xine-cmake.diff
diff --git a/debian/patches/xine-cmake.diff b/debian/patches/xine-cmake.diff
new file mode 100644
index 0000000..a4ec825
--- /dev/null
+++ b/debian/patches/xine-cmake.diff
@@ -0,0 +1,25 @@
+Author: Pino Toscano <toscano.pino at tiscali.it>
+Description: cmake: do not error out if Xine is not found
+ .
+ If Xine is not found, then the PKG_XINE_VERSION variable is empty,
+ causing the string() command where it is used unquoted to fail.
+ .
+ Calculate the Xine version only if Xine was found using pkg-config.
+Forwarded: https://github.com/maxrd2/subtitlecomposer/pull/64
+Last-Update: 2016-06-17
+
+--- a/cmake/FindXine.cmake
++++ b/cmake/FindXine.cmake
+@@ -31,8 +31,10 @@ FIND_PATH(XINE_INCLUDE_DIR NAMES xine.h
+ FIND_LIBRARY(XINE_LIBRARY NAMES xine
+ 	PATHS ${PKG_XINE_LIBRARY_DIRS} )
+ 
+-string(REGEX REPLACE "[0-9].[0-9]." "" XINE_BUGFIX_VERSION ${PKG_XINE_VERSION})
+-set(XINE_VERSION ${PKG_XINE_VERSION})
++IF (PKG_XINE_FOUND)
++	string(REGEX REPLACE "[0-9].[0-9]." "" XINE_BUGFIX_VERSION ${PKG_XINE_VERSION})
++	set(XINE_VERSION ${PKG_XINE_VERSION})
++ENDIF (PKG_XINE_FOUND)
+ 
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(Xine

-- 
subtitlecomposer packaging