[SCM] kdenlive packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%15.08.2-0ubuntu1-561-gb8d8ab5
Scarlett Clark
sgclark-guest at moszumanska.debian.org
Thu Feb 18 19:30:51 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kdenlive.git;a=commitdiff;h=750d370
The following commit has been merged in the kubuntu_xenial_archive branch:
commit 750d370cabacc3f69bdc271006c8e4de1bc4a139
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/debian@1001 f1c9c430-f51a-44e6-a298-6f72677f57b2
---
changelog | 7 +++++++
control | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/changelog b/changelog
index 19558ba..7937b4c 100644
--- a/changelog
+++ b/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/control b/control
index 21c4acf..fb9e187 100644
--- a/control
+++ b/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
More information about the pkg-kde-commits
mailing list