[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=cf6c60a

The following commit has been merged in the master branch:
commit cf6c60a3fe128d801b987b7cefe18fa0d3e9ff3b
Author: Martin Steghöfer <martin at steghoefer.eu>
Date:   Sun Oct 4 16:51:29 2015 +0200

    Dropped patches regarding bugs that are already fixed in the new upstream version.
---
 .../{03_link_phonon.diff => 0001-Link-phonon.patch}       |  0
 ...{link_against_x11.diff => 0002-Link-against-X11.patch} |  0
 debian/patches/01_link_gobject.diff                       | 15 ---------------
 debian/patches/02_link_krosscore.diff                     | 15 ---------------
 debian/patches/04_fix_ftbfs_gcc_4_5.diff                  | 14 --------------
 debian/patches/series                                     |  7 ++-----
 6 files changed, 2 insertions(+), 49 deletions(-)

diff --git a/debian/patches/03_link_phonon.diff b/debian/patches/0001-Link-phonon.patch
similarity index 100%
rename from debian/patches/03_link_phonon.diff
rename to debian/patches/0001-Link-phonon.patch
diff --git a/debian/patches/link_against_x11.diff b/debian/patches/0002-Link-against-X11.patch
similarity index 100%
rename from debian/patches/link_against_x11.diff
rename to debian/patches/0002-Link-against-X11.patch
diff --git a/debian/patches/01_link_gobject.diff b/debian/patches/01_link_gobject.diff
deleted file mode 100644
index 091c005..0000000
--- a/debian/patches/01_link_gobject.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-# Description: This pacth adds a missing find_package for GObject.
-#  Without this patch the package will FTBFS with binutils-gold.
-# Forwarded: http://sourceforge.net/tracker/?func=detail&aid=2897376&group_id=208427&atid=1005654
-# Author: José Manuel Santamaría Lema <panfaust at gmail.com>
-# 
---- subtitlecomposer-0.5.3.orig/src/player/gstreamer/CMakeLists.txt
-+++ subtitlecomposer-0.5.3/src/player/gstreamer/CMakeLists.txt
-@@ -1,6 +1,7 @@
- # TODO WHY AREN'T THESE INCLUDED BY MACRO_OPTIONAL_FIND_PACKAGE( GStreamer )?
- FIND_PACKAGE( GLIB2 REQUIRED )
- FIND_PACKAGE( LibXml2 REQUIRED )
-+FIND_PACKAGE( GObject REQUIRED )
- 
- SET( players_gstreamer_INCLUDE_DIR
- 	${GLIB2_INCLUDE_DIR}
diff --git a/debian/patches/02_link_krosscore.diff b/debian/patches/02_link_krosscore.diff
deleted file mode 100644
index e6c87cd..0000000
--- a/debian/patches/02_link_krosscore.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-# Description: This pacth adds a missing link against Kross.
-#  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/main/CMakeLists.txt
-+++ subtitlecomposer-0.5.3/src/main/CMakeLists.txt
-@@ -46,6 +46,7 @@
- 	${KDE4_KDEUI_LIBS}
- 	${KDE4_KHTML_LIBS}
- 	${KDE4_KFILE_LIBS}
-+	${KDE4_KROSSCORE_LIBS}
- 	${KDE4_KROSSUI_LIBS}
- 	${common_LIBS}
- 	${config_LIBS}
diff --git a/debian/patches/04_fix_ftbfs_gcc_4_5.diff b/debian/patches/04_fix_ftbfs_gcc_4_5.diff
deleted file mode 100644
index d3e5d07..0000000
--- a/debian/patches/04_fix_ftbfs_gcc_4_5.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-# Description: Fixes an FTBFS with gcc 4.5.
-# Forwarded: http://sourceforge.net/tracker/index.php?func=detail&aid=2932063&group_id=208427&atid=1005654
-# Author: José Manuel Santamaría Lema <panfaust at gmail.com>
---- subtitlecomposer-0.5.3.orig/src/core/sstring.cpp
-+++ subtitlecomposer-0.5.3/src/core/sstring.cpp
-@@ -1112,7 +1112,7 @@
- 	append( str );
- }
- 
--SStringList::SStringList( const SStringList::SStringList& list ):
-+SStringList::SStringList( const SStringList& list ):
- 	QList<SString>( list )
- {
- }
diff --git a/debian/patches/series b/debian/patches/series
index a195907..49338ff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
-01_link_gobject.diff
-02_link_krosscore.diff
-03_link_phonon.diff
-04_fix_ftbfs_gcc_4_5.diff
-link_against_x11.diff
+0001-Link-phonon.patch
+0002-Link-against-X11.patch

-- 
subtitlecomposer packaging