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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 36e232ed31dac9f0d31f079e6d34a6cef991d94e
Author: the-me <the-me at f1c9c430-f51a-44e6-a298-6f72677f57b2>
Date:   Tue Aug 13 08:10:50 2013 +0000

    * Move from ffmpeg to avconv.
      Closes: #710419
    
    
    git-svn-id: https://svn.linux-dev.org/svn/pkg/kdenlive/trunk@4748 f1c9c430-f51a-44e6-a298-6f72677f57b2
---
 debian/changelog | 7 +++++++
 debian/control   | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d4f7a09..28e2263 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kdenlive (0.9.6-3) UNRELEASED; urgency=low
+
+  * Move from ffmpeg to avconv.
+    Closes: #710419
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Tue, 13 Aug 2013 10:10:12 +0200
+
 kdenlive (0.9.6-2) unstable; urgency=low
 
   * Uploading to unstable.
diff --git a/debian/control b/debian/control
index 8d097fb..33e878c 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Build-Depends: debhelper (>= 9),
  libavformat-dev,
  libavdevice-dev,
  libavutil-dev,
+ libav-tools,
  libqt4-dev,
  shared-desktop-ontologies,
  libx11-dev,
@@ -28,7 +29,7 @@ Depends: ${shlibs:Depends},
  ${misc:Depends},
  kdenlive-data (= ${source:Version}),
  melt,
- ffmpeg
+ libav-tools
 Recommends: swh-plugins,
  dvgrab,
  frei0r-plugins,

-- 
kdenlive packaging