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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 7a7616136628cae3ac2964c1298aae36b69f290e
Author: the-me <the-me at f1c9c430-f51a-44e6-a298-6f72677f57b2>
Date:   Fri May 29 19:39:03 2009 +0000

    * Add conflicts against kdenlive (<< 0.7.2.1) to kdenlive-data, because it
      clashes with the old debian-multimedia.org version.
      Closes: #529048
    
    
    git-svn-id: https://svn.linux-dev.org/svn/pkg/kdenlive/trunk@958 f1c9c430-f51a-44e6-a298-6f72677f57b2
---
 debian/changelog | 5 ++++-
 debian/control   | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2ee8c4c..a8af715 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,11 @@ kdenlive (0.7.3-4) UNRELEASED; urgency=low
   * Depend on ffmpeg.
   * Recommend frei0r-plugins, recordmydesktop, dvdauthor and genisoimage.
     They are very usefull for kdenlive.
+  * Add conflicts against kdenlive (<< 0.7.2.1) to kdenlive-data, because it
+    clashes with the old debian-multimedia.org version.
+    Closes: #529048
 
- -- Patrick Matthäi <pmatthaei at debian.org>  Fri, 29 May 2009 21:27:22 +0200
+ -- Patrick Matthäi <pmatthaei at debian.org>  Fri, 29 May 2009 21:37:44 +0200
 
 kdenlive (0.7.3-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index ed62e79..472e003 100644
--- a/debian/control
+++ b/debian/control
@@ -25,6 +25,7 @@ Package: kdenlive-data
 Architecture: all
 Depends: ${misc:Depends}
 Recommends: kdenlive
+Conflicts: 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