[SCM] subtitlecomposer packaging branch, master, updated. debian/0.6.4-2-9-g7115364

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit c174ce2ceb064a0ebd15d42240383041d45725bf
Author: Pino Toscano <pino at debian.org>
Date:   Fri Sep 29 19:10:57 2017 +0200

    update the patches
    
    - xine-cmake.diff: drop, backported from upstream
---
 debian/changelog               |  2 ++
 debian/patches/series          |  1 -
 debian/patches/xine-cmake.diff | 25 -------------------------
 3 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2445bd6..10cc038 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ subtitlecomposer (0.6.5-0r1) UNRELEASED; urgency=medium
   * Replace the transitional build dependencies:
     - kio-dev -> libkf5kio-dev
   * Update copyright.
+  * Update the patches:
+    - xine-cmake.diff: drop, backported from upstream
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Fri, 29 Sep 2017 18:50:11 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 54bcaa1..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-xine-cmake.diff
diff --git a/debian/patches/xine-cmake.diff b/debian/patches/xine-cmake.diff
deleted file mode 100644
index a4ec825..0000000
--- a/debian/patches/xine-cmake.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-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