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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 2718462a4e17492f087a976181e062294e9b6cf9
Author: the-me <the-me at f1c9c430-f51a-44e6-a298-6f72677f57b2>
Date:   Sun Jun 14 17:57:40 2009 +0000

    * Fix conflicts against kdenlive from Marillat.
      Closes: #532086
    
    
    git-svn-id: https://svn.linux-dev.org/svn/pkg/kdenlive/trunk@1001 f1c9c430-f51a-44e6-a298-6f72677f57b2
---
 debian/changelog | 7 +++++++
 debian/control   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 19558ba..7937b4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kdenlive (0.7.4-2) UNRELEASED; urgency=low
+
+  * Fix conflicts against kdenlive from Marillat.
+    Closes: #532086
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Sun, 14 Jun 2009 19:56:49 +0200
+
 kdenlive (0.7.4-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 21c4acf..fb9e187 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Package: kdenlive-data
 Architecture: all
 Depends: ${misc:Depends}
 Recommends: kdenlive
-Conflicts: kdenlive (<< 0.7.2.1)
+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