[SCM] subtitlecomposer packaging branch, master, updated. debian/0.6.2-1-5-g463b57a

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 463b57a4473de31d6f450bc6551b56298e3cd2ce
Author: Pino Toscano <pino at debian.org>
Date:   Mon Apr 4 22:44:44 2016 +0200

    update the patches
    
    - link-x11.diff: drop, fixed upstream
---
 debian/changelog             |  2 ++
 debian/patches/link-x11.diff | 40 ----------------------------------------
 debian/patches/series        |  1 -
 3 files changed, 2 insertions(+), 41 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1ced2a7..bb8dbf8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ subtitlecomposer (0.6.3-0r1) UNRELEASED; urgency=medium
   [ Pino Toscano ]
   * New upstream release.
   * Fix Vcs-Git field.
+  * Update the patches:
+    - link-x11.diff: drop, fixed upstream
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Mon, 04 Apr 2016 22:35:30 +0200
 
diff --git a/debian/patches/link-x11.diff b/debian/patches/link-x11.diff
deleted file mode 100644
index 130b3c7..0000000
--- a/debian/patches/link-x11.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-Author: Pino Toscano <pino at debian.org>
-Description: Fix linking to X11
- Use the FindX11.cmake module to find X11, and use the variables it provides
- (instead of hardcoding -lX11).
-Forwarded: no
-Last-Update: 2016-03-27
-
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -27,6 +27,8 @@ set_package_properties(Phonon4Qt5 PROPER
-    DESCRIPTION "Qt-based audio library"
-    TYPE REQUIRED)
- 
-+find_package(X11 REQUIRED)
-+
- # the subdirs must be added in a specific order
- # if one dir uses code from another, its CMakeLists.txt will reference variables
- # defined in the dependency directory that must be created before the former
---- a/src/main/CMakeLists.txt
-+++ b/src/main/CMakeLists.txt
-@@ -50,7 +50,7 @@ target_link_libraries(subtitlecomposer
- 	${videoplayer_LIBS}
- 	${streamprocessor_LIBS}
- 	${widgets_LIBS}
--	-lX11 # xine needs XInitThreads() call in main
-+	${X11_LIBRARIES} # xine needs XInitThreads() call in main
- )
- 
- add_definitions(
---- a/src/videoplayerplugins/xine/CMakeLists.txt
-+++ b/src/videoplayerplugins/xine/CMakeLists.txt
-@@ -8,7 +8,7 @@ set(videoplayer_xine_DEFS
- )
- set(videoplayer_xine_LIBS
- 	${XINE_LIBRARY}
--	-lX11
-+	${X11_LIBRARIES}
- 	CACHE INTERNAL EXPORTEDVARIABLE
- )
- set(videoplayer_xine_SRCS
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d2b8c9e..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-link-x11.diff

-- 
subtitlecomposer packaging