[SCM] subtitlecomposer packaging branch, master, updated. debian/0.5.3-4-12-g386410e

[Martin Steghöfer]

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

The following commit has been merged in the master branch:
commit 2b991519e75c18ec93a9d612ebd7c78393aeb313
Author: Martin Steghöfer <martin at steghoefer.eu>
Date:   Sun Oct 4 17:15:34 2015 +0200

    Rebased remaining patches onto new upstream version.
---
 debian/patches/0001-Link-phonon.patch      | 25 +++++++++++++++++--------
 debian/patches/0002-Link-against-X11.patch | 21 ++++++++++++++++-----
 2 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/debian/patches/0001-Link-phonon.patch b/debian/patches/0001-Link-phonon.patch
index f91178c..0e39077 100644
--- a/debian/patches/0001-Link-phonon.patch
+++ b/debian/patches/0001-Link-phonon.patch
@@ -1,11 +1,20 @@
-# Description: This pacth adds a missing link against Phonon.
-#  Without this patch the package will FTBFS with binutils-gold.
-# Forwarded: not-needed
-# Author: José Manuel Santamaría Lema <panfaust at gmail.com>
-# 
---- subtitlecomposer-0.5.3.orig/src/player/phonon/CMakeLists.txt
-+++ subtitlecomposer-0.5.3/src/player/phonon/CMakeLists.txt
-@@ -4,3 +4,7 @@
+From: =?utf-8?q?Jos=C3=A9_Manuel_Santamar=C3=ADa_Lema?= <panfaust at gmail.com>
+Date: Fri, 13 Nov 2009 18:36:09 +0000
+Subject: Link phonon
+
+This patch adds a missing link against Phonon.
+Without this patch the package will FTBFS with binutils-gold.
+
+Forwarded: not-needed
+---
+ src/services/phonon/CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/services/phonon/CMakeLists.txt b/src/services/phonon/CMakeLists.txt
+index 96a3951..ee0d22a 100644
+--- a/src/services/phonon/CMakeLists.txt
++++ b/src/services/phonon/CMakeLists.txt
+@@ -4,3 +4,7 @@ SET( services_phonon_SRCS
  	CACHE INTERNAL EXPORTEDVARIABLE
  )
  
diff --git a/debian/patches/0002-Link-against-X11.patch b/debian/patches/0002-Link-against-X11.patch
index 7912958..f241172 100644
--- a/debian/patches/0002-Link-against-X11.patch
+++ b/debian/patches/0002-Link-against-X11.patch
@@ -1,15 +1,26 @@
---- a/src/player/xine/CMakeLists.txt
-+++ b/src/player/xine/CMakeLists.txt
+From: =?utf-8?q?Jos=C3=A9_Manuel_Santamar=C3=ADa_Lema?= <panfaust at gmail.com>
+Date: Mon, 14 Oct 2013 15:29:39 +0200
+Subject: Link against X11
+
+---
+ src/services/xine/CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/services/xine/CMakeLists.txt b/src/services/xine/CMakeLists.txt
+index fc873eb..504cd77 100644
+--- a/src/services/xine/CMakeLists.txt
++++ b/src/services/xine/CMakeLists.txt
 @@ -1,3 +1,5 @@
 +find_package(X11)
 +
- SET( players_xine_INCLUDE_DIR
+ SET( services_xine_INCLUDE_DIR
  	${XINE_INCLUDE_DIR}
  	CACHE INTERNAL EXPORTEDVARIABLE
-@@ -10,6 +12,7 @@ SET( players_xine_DEFS
+@@ -10,7 +12,7 @@ SET( services_xine_DEFS
  
- SET( players_xine_LIBS
+ SET( services_xine_LIBS
  	${XINE_LIBRARY}
+-	-lX11
 +	${X11_LIBRARIES}
  	CACHE INTERNAL EXPORTEDVARIABLE
  )

-- 
subtitlecomposer packaging