[SCM] kdenlive packaging branch, master, updated. 9f550ac28d3e70cb6e0992fdea79b6c2f9777920

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 9f550ac28d3e70cb6e0992fdea79b6c2f9777920
Merge: d2090d31ff8ae69e5a86aea99156b1b9e091fec9 cea87f9c50587fe2e66ae4dc151d78b8f96773f9
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Sep 9 10:14:07 2015 +0200

    Merge branch 'master' into HEAD

 debian/changelog                                |  42 +++
 debian/control                                  |  44 ++-
 debian/copyright                                | 406 ++++++++++++++++++++----
 debian/kdenlive-data.install                    |  16 +-
 debian/kdenlive.install                         |   8 +-
 debian/patches/01-desktop-keywords.diff         |  12 +-
 debian/patches/02-fix-spelling-error.diff       |  14 +
 debian/patches/03-armhf-armel-use-opengles.diff |  98 ++++++
 debian/patches/series                           |   3 +-
 debian/rules                                    |   4 +-
 debian/watch                                    |   2 +-
 11 files changed, 554 insertions(+), 95 deletions(-)

diff --cc debian/changelog
index 515b948,d52a334..560fe71
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,45 +1,56 @@@
+ kdenlive (15.08.0-2) unstable; urgency=medium
+ 
+   * Add dependency on kinit, kded5 and kio. Without it the file browser will
+     not work.
+     Closes: #797684
+   * Add again patch 03-armhf-armel-use-opengles, it was not merged.
+ 
+  -- Patrick Matthäi <pmatthaei at debian.org>  Thu, 03 Sep 2015 10:19:24 +0200
+ 
+ kdenlive (15.08.0-1) unstable; urgency=medium
+ 
+   * New upstream release.
+     - Remove merged patch 02-armhf-armel-use-opengles.
+     - Add new build dependency qtdeclarative5-dev.
+   * Adjust debian/copyright.
+   * Add patch 02-fix-spelling-error to fix a spelling error.
+ 
+  -- Patrick Matthäi <pmatthaei at debian.org>  Thu, 27 Aug 2015 19:17:49 +0200
+ 
+ kdenlive (15.04.3-2) unstable; urgency=medium
+ 
+   * Cherry pick Ubuntu patch 02-armhf-armel-use-opengles to fix a FTBFS on
+     armel and armhf.
+ 
+  -- Patrick Matthäi <pmatthaei at debian.org>  Mon, 27 Jul 2015 18:09:25 +0200
+ 
+ kdenlive (15.04.3-1) unstable; urgency=low
+ 
+   * New upstream release.
+     - Rewrite patch 01-desktop-keywords.
+     - Rewrite the whole build dependencies.
+     - Build against Qt5.
+       Closes: #788790
+     - Adjust install files.
+   * Adjust debian/watch download location.
+   * Switch away from libav to ffmpeg.
+   * Bump mlt build dependency up to version 0.9.6-3~ to ensure that it has been
+     built against ffmpeg and Qt5.
+   * Update to DEP5 debian/copyright format.
+ 
+  -- Patrick Matthäi <pmatthaei at debian.org>  Thu, 09 Jul 2015 09:38:16 +0200
+ 
 +kdenlive (0.9.10-2ubuntu1) vivid; urgency=low
 +
 +  * Merge from Debian unstable. (LP: #1402216, #1346733)
 +    Remaining changes:
 +    - debian/patches/opengl_optional.patch:
 +      + Make opengl optional for ARM.
 +  * debian/patches/kubuntu_armhf-missing-include.diff:
 +    - Dropped, fixed upstream.
 +
 + -- Artur Rona <ari-tczew at ubuntu.com>  Fri, 19 Dec 2014 16:52:41 +0100
 +
  kdenlive (0.9.10-2) unstable; urgency=medium
  
    * Add libv4l-dev as build dependency for webcam support.

-- 
kdenlive packaging