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

[Scarlett Clark]

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

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

    git diff patch with upstream sources. If it does not apply, I give up.
---
 debian/changelog                        | 1 +
 debian/patches/01-desktop-keywords.diff | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 16f771e..413bdb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ kdenlive (4:15.12.1-0ubuntu1) UNRELEASED; urgency=medium
   * Fix EOL patch. 
   * Fix patch again. 
   * Patch.. 
+  * git diff patch with upstream sources. If it does not apply, I give up. 
 
  -- 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 a5f2081..7c12221 100644
--- a/debian/patches/01-desktop-keywords.diff
+++ b/debian/patches/01-desktop-keywords.diff
@@ -3,10 +3,12 @@
 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 +130,4 @@
+@@ -126,7 +126,7 @@ X-DocPath[cs]=http://cs.wikibooks.org/wiki/Kdenlive
  Terminal=false
  MimeType=application/x-kdenlive;
  Categories=Qt;KDE;AudioVideo;AudioVideoEditing;
 -Keywords=editing;video;audio;mlt;kde;
 +Keywords=video;audio;firewire;video4linux;suite;editing;kde;mlt;
  Keywords[ca]=edició;vídeo;àudio;mlt;kde;
+ Keywords[ca at valencia]=edició;vídeo;àudio;mlt;kde;
+ Keywords[da]=redigering;video;lyd;mlt;kde;

-- 
kdenlive packaging