[SCM] kdenlive packaging branch, kubuntu_unstable, updated. ubuntu/4%15.08.2-0ubuntu1-583-g2bd5529

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 2bd55291ddd8cfaa948917c687bdca66b00ba4e3
Merge: e4e051cd596c97a4e3517cc261b6c96cac4fb632 b79f0ea3ac7723c334b9ac66367d6ba4cf19f6eb
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Sat Mar 5 07:20:56 2016 -0800

    Fixing install file

 debian/changelog        | 7 +++++++
 debian/kdenlive.install | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index cfad3a8,2335b5a..7196ee9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -9,9 -10,10 +10,15 @@@ kdenlive (4:15.12.1-0ubuntu1) UNRELEASE
    * Revert above and merge in changes from unstable,
      where all of my changes were done... 
    * Add missing dependencies. 
 +  * Put manpage back in -data. 
 +  * fix merger. 
  
+   [ Clive Johnston ]
+   * Fixing install file 
+ 
++  [ Scarlett Clark ]
++  * fix merger. 
++
   -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 18 Feb 2016 11:21:37 -0800
  
  kdenlive (15.12.2-1) unstable; urgency=medium
diff --cc debian/kdenlive.install
index de37ed9,87aefd4..8bd12b2
--- a/debian/kdenlive.install
+++ b/debian/kdenlive.install
@@@ -1,5 -1,6 +1,5 @@@
  usr/bin usr/
  usr/lib usr/
  usr/share/applications
 -usr/share/man
  usr/share/menu/kdenlive
- usr/share/pixmaps/kdenlive.png
+ usr/share/pixmaps/

-- 
kdenlive packaging