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

[Scarlett Clark]

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

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

    git diff is picking up wrong line number? Trying 125 as that is the @@ line.
---
 debian/changelog                        | 1 +
 debian/patches/01-desktop-keywords.diff | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ef9a0cf..886c22a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ kdenlive (4:15.12.1-0ubuntu1) UNRELEASED; urgency=medium
   * git diff patch with upstream sources. If it does not apply, I give up. 
   * Patch madness, does not apply, attempt 6. 
   * 7 
+  * git diff is picking up wrong line number? Trying 125 as that is the @@ line. 
 
  -- 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 ab751cd..e43e344 100644
--- a/debian/patches/01-desktop-keywords.diff
+++ b/debian/patches/01-desktop-keywords.diff
@@ -1,9 +1,9 @@
 # Add keywords to desktop file.
 
 diff --git a/data/org.kde.kdenlive.desktop b/data/org.kde.kdenlive.desktop
---- data/org.kde.kdenlive.desktop
-+++ data/org.kde.kdenlive.desktop
-@@ -126,7 +126,7 @@ X-DocPath[cs]=http://cs.wikibooks.org/wiki/Kdenlive
+--- a/data/org.kde.kdenlive.desktop
++++ b/data/org.kde.kdenlive.desktop
+@@ -125,7 +125,7 @@ X-DocPath[cs]=http://cs.wikibooks.org/wiki/Kdenlive
  Terminal=false
  MimeType=application/x-kdenlive;
  Categories=Qt;KDE;AudioVideo;AudioVideoEditing;

-- 
kdenlive packaging