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

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit b963d50b9564924046f64c8697a9f24d8d342333
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Tue Feb 16 11:38:53 2016 -0800

    Patch madness, does not apply, attempt 6.
---
 debian/changelog                        | 1 +
 debian/patches/01-desktop-keywords.diff | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 413bdb1..c33af95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ kdenlive (4:15.12.1-0ubuntu1) UNRELEASED; urgency=medium
   * Fix patch again. 
   * Patch.. 
   * git diff patch with upstream sources. If it does not apply, I give up. 
+  * Patch madness, does not apply, attempt 6. 
 
  -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 13:48:55 +0000
 
diff --git a/debian/patches/01-desktop-keywords.diff b/debian/patches/01-desktop-keywords.diff
index 7c12221..0c3953e 100644
--- a/debian/patches/01-desktop-keywords.diff
+++ b/debian/patches/01-desktop-keywords.diff
@@ -1,8 +1,9 @@
 # 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
+diff --git a/data/org.kde.kdenlive.desktop b/data/org.kde.kdenlive.desktop
+index 9dd5d4d..bfdbd39 100644
+--- a/data/org.kde.kdenlive.desktop
++++ b/data/org.kde.kdenlive.desktop
 @@ -126,7 +126,7 @@ X-DocPath[cs]=http://cs.wikibooks.org/wiki/Kdenlive
  Terminal=false
  MimeType=application/x-kdenlive;

-- 
kdenlive packaging