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

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit fd1eae2cd264f1eb10587e4a9cd6591b66ae1d01
Author: the-me <the-me at f1c9c430-f51a-44e6-a298-6f72677f57b2>
Date:   Wed Jul 8 13:26:03 2015 +0000

    - Adjust install files.
    
    
    git-svn-id: https://svn.linux-dev.org/svn/pkg/kdenlive/trunk/debian@6050 f1c9c430-f51a-44e6-a298-6f72677f57b2
---
 changelog             |  1 +
 control               |  1 -
 kdenlive-data.dirs    |  1 -
 kdenlive-data.install | 16 ++++++++++------
 kdenlive.install      |  8 ++++----
 rules                 |  2 +-
 6 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/changelog b/changelog
index f8727cd..cb50627 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,7 @@ kdenlive (15.04.3-1) UNRELEASED; urgency=low
   * New upstream release.
     - Drop patch 01-desktop-keywords.
     - Rewrite the whole build dependencies.
+    - Adjust install files.
   * Adjust debian/watch download location.
   * Switch away from libav to ffmpeg.
 
diff --git a/control b/control
index 656775e..924fff6 100644
--- a/control
+++ b/control
@@ -22,7 +22,6 @@ Build-Depends: debhelper (>= 9),
  libkf5config-dev,
  libkf5configwidgets-dev,
  libkf5coreaddons-dev,
- libkf5coreaddons-dev,
  libkf5dbusaddons-dev,
  libkf5guiaddons-dev,
  libkf5iconthemes-dev,
diff --git a/kdenlive-data.dirs b/kdenlive-data.dirs
deleted file mode 100644
index c8d6d03..0000000
--- a/kdenlive-data.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/kde/HTML
diff --git a/kdenlive-data.install b/kdenlive-data.install
index 699f389..1705afb 100644
--- a/kdenlive-data.install
+++ b/kdenlive-data.install
@@ -1,6 +1,10 @@
-debian/tmp/usr/share/icons usr/share/
-debian/tmp/usr/share/kde4/config.kcfg usr/share/kde4/
-debian/tmp/usr/share/kde4 usr/share/
-debian/tmp/usr/share/mime usr/share/
-debian/tmp/usr/share/doc/kde/HTML usr/share/doc/kde/
-debian/tmp/usr/share/locale usr/share/
+usr/share/icons
+usr/share/mime
+etc/xdg
+usr/share/appdata
+usr/share/kxmlgui5
+usr/share/kservices5
+usr/share/knotifications5
+usr/share/doc/HTML
+usr/share/kdenlive
+usr/share/config.kcfg
diff --git a/kdenlive.install b/kdenlive.install
index 8b4c159..a7e7fdd 100644
--- a/kdenlive.install
+++ b/kdenlive.install
@@ -1,5 +1,5 @@
-debian/tmp/usr/lib usr/
-debian/tmp/usr/share/man usr/share/
-debian/tmp/usr/share/applications/kde4 usr/share/applications/
-debian/tmp/usr/bin usr/
+usr/lib usr/
+usr/share/man
+usr/bin usr/
+usr/share/applications
 data/kdenlive.xpm usr/share/pixmaps/
diff --git a/rules b/rules
index 9d4f6cf..277ab33 100755
--- a/rules
+++ b/rules
@@ -17,7 +17,7 @@ override_dh_compress:
 override_dh_install:
 	rm -f $(CURDIR)/debian/tmp/usr/share/doc/kde/HTML/*/kdenlive/common
 	cp $(CURDIR)/data/kdenlive.menu $(CURDIR)/debian/
-	dh_install
+	dh_install --list-missing
 
 override_dh_strip:
 	dh_strip --dbg-package=kdenlive-dbg

-- 
kdenlive packaging