[SCM] kdenlive packaging branch, master, updated. 5fb678fd91531fc81682db16e8dac4e34c40aa13

[Jonathan Riddell]

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

The following commit has been merged in the master branch:
commit db266adcc3590f79f262cb31a8ed06023f39724d
Author: Raymond Wooninck <tittiatcoke at gmail.com>
Date:   Wed Sep 28 06:09:15 2016 +0200

    Hopefully fix merger
---
 debian/kdenlive-data.install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/kdenlive-data.install b/debian/kdenlive-data.install
index 6a4a7fd..da09e94 100644
--- a/debian/kdenlive-data.install
+++ b/debian/kdenlive-data.install
@@ -1,5 +1,4 @@
 etc/xdg
-usr/share/*/org.kde.kdenlive.appdata.xml
 usr/share/config.kcfg
 usr/share/doc/HTML
 usr/share/icons
@@ -7,5 +6,6 @@ usr/share/kdenlive
 usr/share/knotifications5
 usr/share/kservices5
 usr/share/kxmlgui5
+usr/share/metainfo/org.kde.kdenlive.appdata.xml
 usr/share/mime
 usr/share/pixmaps

-- 
kdenlive packaging