[SCM] kdenlive packaging branch, master, updated. 9f550ac28d3e70cb6e0992fdea79b6c2f9777920

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kdenlive.git;a=commitdiff;h=a854620

The following commit has been merged in the master branch:
commit a8546203f5c9b49384b39e33890d1e812cff1cc3
Author: the-me <the-me at f1c9c430-f51a-44e6-a298-6f72677f57b2>
Date:   Thu Aug 27 17:17:46 2015 +0000

    * Add patch 02-fix-spelling-error to fix a spelling error.
    
    
    git-svn-id: https://svn.linux-dev.org/svn/pkg/kdenlive/trunk@6217 f1c9c430-f51a-44e6-a298-6f72677f57b2
---
 debian/changelog                          |  1 +
 debian/patches/02-fix-spelling-error.diff | 14 ++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 16 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ba768c5..2483ba9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ kdenlive (15.08.0-1) UNRELEASED; urgency=medium
     - Remove merged patch 02-armhf-armel-use-opengles.
     - Add new build dependency qtdeclarative5-dev.
   * Adjust debian/copyright.
+  * Add patch 02-fix-spelling-error to fix a spelling error.
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Thu, 20 Aug 2015 20:53:11 +0200
 
diff --git a/debian/patches/02-fix-spelling-error.diff b/debian/patches/02-fix-spelling-error.diff
new file mode 100644
index 0000000..2859525
--- /dev/null
+++ b/debian/patches/02-fix-spelling-error.diff
@@ -0,0 +1,14 @@
+# Fix spelling error.
+
+diff -Naur kdenlive-15.08.0.orig/src/bin/projectclip.cpp kdenlive-15.08.0/src/bin/projectclip.cpp
+--- kdenlive-15.08.0.orig/src/bin/projectclip.cpp	2015-08-12 01:20:55.000000000 +0200
++++ kdenlive-15.08.0/src/bin/projectclip.cpp	2015-08-27 19:16:09.172511189 +0200
+@@ -257,7 +257,7 @@
+ void ProjectClip::setProducer(ClipController *controller, bool replaceProducer)
+ {
+     if (!replaceProducer && m_controller) {
+-        qDebug()<<"// RECIEVED PRODUCER BUT WE ALREADY HAVE ONE
----------";
++        qDebug()<<"// RECEIVED PRODUCER BUT WE ALREADY HAVE ONE
----------";
+         return;
+     }
+     if (m_controller) {
diff --git a/debian/patches/series b/debian/patches/series
index 3d832ef..a97da15 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-desktop-keywords.diff
+02-fix-spelling-error.diff

-- 
kdenlive packaging