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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit de7cfb420b53a37ab58cba5a0402575fbcce6470
Author: the-me <the-me at f1c9c430-f51a-44e6-a298-6f72677f57b2>
Date:   Wed Jul 8 09:42:12 2015 +0000

    * Switch away from libav to ffmpeg.
    
    
    git-svn-id: https://svn.linux-dev.org/svn/pkg/kdenlive/trunk@6045 f1c9c430-f51a-44e6-a298-6f72677f57b2
---
 debian/changelog | 1 +
 debian/control   | 6 +++---
 debian/rules     | 2 --
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9f5ca18..6dfdf20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kdenlive (0.9.10-3) UNRELEASED; urgency=low
 
   * Adjust debian/watch download location.
+  * Switch away from libav to ffmpeg.
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Wed, 08 Jul 2015 11:40:01 +0200
 
diff --git a/debian/control b/debian/control
index 112d30b..6a1c1bd 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,8 @@ Build-Depends: debhelper (>= 9),
  kdelibs5-dev,
  libmlt-dev (>= 0.9.0),
  libmlt++-dev (>= 0.9.0),
- libav-tools,
- libqt4-dev,
+ ffmpeg,
+ libqt5-dev,
  shared-desktop-ontologies,
  libx11-dev,
  libv4l-dev,
@@ -24,7 +24,7 @@ Depends: ${shlibs:Depends},
  ${misc:Depends},
  kdenlive-data (= ${source:Version}),
  melt,
- libav-tools
+ ffmpeg
 Recommends: swh-plugins,
  dvgrab,
  frei0r-plugins,
diff --git a/debian/rules b/debian/rules
index 3e574be..9d4f6cf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-#export DH_VERBOSE=1
-
 EXTRAFLAGS :=
 ifeq ($(DEB_BUILD_ARCH_OS),kfreebsd)
 	EXTRAFLAGS := -DNO_JOGSHUTTLE=YES

-- 
kdenlive packaging