[SCM] kdenlive packaging branch, kubuntu_stable, updated. ubuntu/4%15.08.2-0ubuntu1-578-g0454801

Kubuntu CI (Harald Sitter) kubuntu-ci-guest at moszumanska.debian.org
Tue Feb 23 16:04:05 UTC 2016


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

The following commit has been merged in the kubuntu_stable branch:
commit fca891e69eac35fb6591eac8d54b686fa0b3170b
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Thu Feb 18 12:55:02 2016 -0800

    Add missing files.
---
 debian/changelog             |  1 +
 debian/control               | 93 ++++++++++++++++++++++----------------------
 debian/kdenlive-data.install | 12 +++---
 debian/kdenlive.install      |  6 ++-
 4 files changed, 57 insertions(+), 55 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a863680..2fd69d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ kdenlive (4:15.12.1-0ubuntu1) UNRELEASED; urgency=medium
   * We are a release behind.
   * Fix merge into kubuntu_unstable 
   * Sadly we must keep the epoch. 
+  * Add missing files. 
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 18 Feb 2016 11:21:37 -0800
 
diff --git a/debian/control b/debian/control
index cf8c036..ad04f87 100644
--- a/debian/control
+++ b/debian/control
@@ -4,54 +4,54 @@ Priority: optional
 Maintainer: Patrick Matthäi <pmatthaei at debian.org>
 Homepage: http://www.kdenlive.org/
 Standards-Version: 3.9.7
-Build-Depends: debhelper (>= 9),
- pkg-config,
- cmake,
- libmlt-dev (>= 0.9.8),
- libmlt++-dev (>= 0.9.8),
- ffmpeg,
- libqt5opengl5-dev,
- extra-cmake-modules,
- qtscript5-dev,
- libqt5svg5-dev,
- kdoctools-dev,
- kio-dev,
- libv4l-dev,
- libkf5archive-dev,
- libkf5bookmarks-dev,
- libkf5config-dev,
- libkf5configwidgets-dev,
- libkf5coreaddons-dev,
- libkf5dbusaddons-dev,
- libkf5guiaddons-dev,
- libkf5iconthemes-dev,
- libkf5newstuff-dev,
- libkf5notifications-dev,
- libkf5notifyconfig-dev,
- libkf5plotting-dev,
- libkf5textwidgets-dev,
- libkf5widgetsaddons-dev,
- qtdeclarative5-dev,
- libkf5xmlgui-dev
+Build-Depends: cmake,
+               debhelper (>= 9),
+               extra-cmake-modules,
+               ffmpeg,
+               kdoctools-dev,
+               kio-dev,
+               libkf5archive-dev,
+               libkf5bookmarks-dev,
+               libkf5config-dev,
+               libkf5configwidgets-dev,
+               libkf5coreaddons-dev,
+               libkf5dbusaddons-dev,
+               libkf5guiaddons-dev,
+               libkf5iconthemes-dev,
+               libkf5newstuff-dev,
+               libkf5notifications-dev,
+               libkf5notifyconfig-dev,
+               libkf5plotting-dev,
+               libkf5textwidgets-dev,
+               libkf5widgetsaddons-dev,
+               libkf5xmlgui-dev,
+               libmlt++-dev (>= 0.9.8),
+               libmlt-dev (>= 0.9.8),
+               libqt5opengl5-dev,
+               libqt5svg5-dev,
+               libv4l-dev,
+               pkg-config,
+               qtdeclarative5-dev,
+               qtscript5-dev
 
 Package: kdenlive
 Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- kdenlive-data (= ${source:Version}),
- qml-module-qtquick2,
- kinit,
- kded5,
- kio,
- oxygen-icon-theme,
- melt,
- ffmpeg
-Recommends: swh-plugins,
- dvgrab,
- frei0r-plugins,
- recordmydesktop,
- dvdauthor,
- genisoimage
+Depends: ffmpeg,
+         kded5,
+         kdenlive-data (= ${source:Version}),
+         kinit,
+         kio,
+         melt,
+         oxygen-icon-theme,
+         qml-module-qtquick2,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Recommends: dvdauthor,
+            dvgrab,
+            frei0r-plugins,
+            genisoimage,
+            recordmydesktop,
+            swh-plugins
 Suggests: khelpcenter
 Description: non-linear video editor
  Kdenlive is a non-linear video editing suite, which supports DV, HDV and many
@@ -86,8 +86,7 @@ Package: kdenlive-dbg
 Section: debug
 Architecture: any
 Priority: extra
-Depends: ${misc:Depends},
- kdenlive (= ${binary:Version})
+Depends: kdenlive (= ${binary:Version}), ${misc:Depends}
 Description: non-linear video editor (debugging symbols)
  Kdenlive is a non-linear video editing suite, which supports DV, HDV and many
  more formats.
diff --git a/debian/kdenlive-data.install b/debian/kdenlive-data.install
index 1705afb..e005721 100644
--- a/debian/kdenlive-data.install
+++ b/debian/kdenlive-data.install
@@ -1,10 +1,10 @@
-usr/share/icons
-usr/share/mime
 etc/xdg
 usr/share/appdata
-usr/share/kxmlgui5
-usr/share/kservices5
-usr/share/knotifications5
+usr/share/config.kcfg
 usr/share/doc/HTML
+usr/share/icons
 usr/share/kdenlive
-usr/share/config.kcfg
+usr/share/knotifications5
+usr/share/kservices5
+usr/share/kxmlgui5
+usr/share/mime
diff --git a/debian/kdenlive.install b/debian/kdenlive.install
index 430b413..d096bc0 100644
--- a/debian/kdenlive.install
+++ b/debian/kdenlive.install
@@ -1,4 +1,6 @@
-usr/lib usr/
-usr/share/man
 usr/bin usr/
+usr/lib usr/
 usr/share/applications
+usr/share/man
+usr/share/menu/kdenlive
+usr/share/pixmaps/kdenlive.png

-- 
kdenlive packaging



More information about the pkg-kde-commits mailing list