[SCM] subtitlecomposer packaging branch, master, updated. debian/0.6.3-1-6-g6003c26

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 99bb582c48c806093e0fb40afa6de9901c61d49c
Author: Pino Toscano <pino at debian.org>
Date:   Mon May 16 08:01:43 2016 +0200

    fix-plugins-loading.diff: drop, fixed upstream
---
 debian/changelog                        |  2 ++
 debian/patches/fix-plugins-loading.diff | 31 -------------------------------
 debian/patches/series                   |  1 -
 3 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 69dbb5b..ab64d8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ subtitlecomposer (0.6.4-0r1) UNRELEASED; urgency=medium
   [ Pino Toscano ]
   * New upstream release.
   * Update copyright.
+  * Update the patches:
+    - fix-plugins-loading.diff: drop, fixed upstream
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Mon, 16 May 2016 07:50:17 +0200
 
diff --git a/debian/patches/fix-plugins-loading.diff b/debian/patches/fix-plugins-loading.diff
deleted file mode 100644
index 02aff7c..0000000
--- a/debian/patches/fix-plugins-loading.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-Author: Pino Toscano <pino at debian.org>
-Description: Fix the loading of plugins
- Disable the loading of plugins from a location relative to the executable
- path, which is done on non-release builds.  Since NDEBUG is not debug in our
- case, make sure these relative paths are not used, using instead the proper
- system path.
-Last-Update: 2016-04-05
-Forwarded: not-needed
-
---- a/src/speechprocessor/speechprocessor.cpp
-+++ b/src/speechprocessor/speechprocessor.cpp
-@@ -71,7 +71,7 @@ SpeechProcessor::SpeechProcessor(QWidget
- 	// Using Qt::DirectConnection here makes SpeechProcessor::onStreamData() to execute in GStreamer's thread
- 	connect(m_stream, &StreamProcessor::audioDataAvailable, this, &SpeechProcessor::onStreamData, Qt::DirectConnection);
- 
--#ifndef NDEBUG
-+#if 0
- 	const QString exePath(qApp->applicationDirPath());
- 	pluginLoad(exePath + QStringLiteral("/../speechplugins/pocketsphinx/pocketsphinxasr.so"));
- #else
---- a/src/videoplayer/videoplayer.cpp
-+++ b/src/videoplayer/videoplayer.cpp
-@@ -102,7 +102,7 @@ VideoPlayer::VideoPlayer() :
- {
- 	backendAdd(new DummyPlayerBackend());
- 
--#ifndef NDEBUG
-+#if 0
- 	const QString exePath(qApp->applicationDirPath());
- 	backendLoad(exePath + QStringLiteral("/../videoplayerplugins/gstreamer/gstplayer.so"));
- 	backendLoad(exePath + QStringLiteral("/../videoplayerplugins/mplayer/mplayer.so"));
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e7b5044..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix-plugins-loading.diff

-- 
subtitlecomposer packaging