[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=3cde3ca

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 3cde3cafb7c3b5dd0cfe642018824e48249feaf2
Author: the-me <the-me at f1c9c430-f51a-44e6-a298-6f72677f57b2>
Date:   Thu Jul 8 18:05:02 2010 +0000

    * Bump Standards-Version to 3.9.0.
      - Replace Conflicts with Breaks.
    
    
    git-svn-id: https://svn.linux-dev.org/svn/pkg/kdenlive/trunk/debian@1909 f1c9c430-f51a-44e6-a298-6f72677f57b2
---
 changelog | 4 +++-
 control   | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/changelog b/changelog
index 9bc0a88..7a5a7ca 100644
--- a/changelog
+++ b/changelog
@@ -2,8 +2,10 @@ kdenlive (0.7.7.1+svn4571-1) UNRELEASED; urgency=low
 
   * New upstream svn snapshot.
     - Fixes FTBFS on armel.
+  * Bump Standards-Version to 3.9.0.
+    - Replace Conflicts with Breaks.
 
- -- Patrick Matthäi <pmatthaei at debian.org>  Thu, 08 Jul 2010 20:03:12 +0200
+ -- Patrick Matthäi <pmatthaei at debian.org>  Thu, 08 Jul 2010 20:04:27 +0200
 
 kdenlive (0.7.7.1+svn4541-1) unstable; urgency=low
 
diff --git a/control b/control
index 2bc2e8d..6c149af 100644
--- a/control
+++ b/control
@@ -3,7 +3,7 @@ Section: video
 Priority: optional
 Maintainer: Patrick Matthäi <pmatthaei at debian.org>
 Homepage: http://www.kdenlive.org/
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Build-Depends: debhelper (>= 7), pkg-config, cmake, kdelibs5-dev,
  libmlt-dev, libmlt++-dev, libavcodec-dev, libavformat-dev,
  libavdevice-dev, libavutil-dev, libqt4-dev (>= 4:4.6)
@@ -27,7 +27,7 @@ Package: kdenlive-data
 Architecture: all
 Depends: ${misc:Depends}
 Recommends: kdenlive
-Conflicts: kdenlive (<= 0.7.2.1)
+Breaks: kdenlive (<= 0.7.2.1)
 Description: a non-linear video editor (data files)
  Kdenlive is a non-linear video editing suite, which supports DV, HDC and much
  more formats.

-- 
kdenlive packaging