[SCM] kdenlive packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%15.08.2-0ubuntu1-561-gb8d8ab5

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 8ef9693de381d08f7e1771f5ac33f2049055917b
Author: the-me <the-me at f1c9c430-f51a-44e6-a298-6f72677f57b2>
Date:   Wed Nov 11 13:11:33 2015 +0000

     - Remove merged patch 01-desktop-keywords.
     - Remove merged patch 02-fix-spelling-error.
    
    
    git-svn-id: https://svn.linux-dev.org/svn/pkg/kdenlive/trunk/debian@6417 f1c9c430-f51a-44e6-a298-6f72677f57b2
---
 changelog                          |  2 ++
 patches/01-desktop-keywords.diff   | 11 -----------
 patches/02-fix-spelling-error.diff | 14 --------------
 patches/series                     |  2 --
 4 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/changelog b/changelog
index 928194c..ee5d0f9 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,8 @@
 kdenlive (15.08.3-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+    - Remove merged patch 01-desktop-keywords.
+    - Remove merged patch 02-fix-spelling-error.
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Wed, 11 Nov 2015 13:30:59 +0100
 
diff --git a/patches/01-desktop-keywords.diff b/patches/01-desktop-keywords.diff
deleted file mode 100644
index 426f33c..0000000
--- a/patches/01-desktop-keywords.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-# Add keywords to desktop file.
-
-diff -Naur kdenlive-15.08.1.orig/data/org.kde.kdenlive.desktop kdenlive-15.08.1/data/org.kde.kdenlive.desktop
---- kdenlive-15.08.1.orig/data/org.kde.kdenlive.desktop	2015-09-11 00:31:47.000000000 +0200
-+++ kdenlive-15.08.1/data/org.kde.kdenlive.desktop	2015-09-21 13:55:29.235494220 +0200
-@@ -126,4 +126,5 @@
- Terminal=false
- MimeType=application/x-kdenlive;
- Categories=Qt;KDE;AudioVideo;AudioVideoEditing;
-+Keywords=video;audio;firewire;video4linux;suite;editing;kde;mlt;
- X-DBUS-ServiceName=org.kde.kdenlive
diff --git a/patches/02-fix-spelling-error.diff b/patches/02-fix-spelling-error.diff
deleted file mode 100644
index b7809cf..0000000
--- a/patches/02-fix-spelling-error.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-# Fix spelling error.
-
-diff -Naur kdenlive-15.08.1.orig/src/bin/projectclip.cpp kdenlive-15.08.1/src/bin/projectclip.cpp
---- kdenlive-15.08.1.orig/src/bin/projectclip.cpp	2015-09-11 00:31:47.000000000 +0200
-+++ kdenlive-15.08.1/src/bin/projectclip.cpp	2015-09-21 13:56:51.379263499 +0200
-@@ -269,7 +269,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/patches/series b/patches/series
deleted file mode 100644
index a97da15..0000000
--- a/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-01-desktop-keywords.diff
-02-fix-spelling-error.diff

-- 
kdenlive packaging