[SCM] kdenlive packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%15.08.2-0ubuntu1-66-gab54772

Scarlett Clark sgclark-guest at moszumanska.debian.org
Tue Feb 16 19:48:41 UTC 2016


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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit ab54772e3108f1dfd73198148b5b532280134a8a
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Tue Feb 16 11:48:35 2016 -0800

    git rm the patch.
---
 debian/changelog                          |  1 +
 debian/patches/02-fix-spelling-error.diff | 14 --------------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d7d8930..7cfd972 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ kdenlive (4:15.12.1-0ubuntu1) UNRELEASED; urgency=medium
   * 7 
   * git diff is picking up wrong line number? Trying 125 as that is the @@ line. 
   * Remove patch 02-fix-spelling-error.diff fixed upstream. 
+  * git rm the patch. 
 
  -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 13:48:55 +0000
 
diff --git a/debian/patches/02-fix-spelling-error.diff b/debian/patches/02-fix-spelling-error.diff
deleted file mode 100644
index b7809cf..0000000
--- a/debian/patches/02-fix-spelling-error.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-# Fix spelling error.
-
-diff -Naur kdenlive-15.08.1.orig/src/bin/projectclip.cpp kdenlive-15.08.1/src/bin/projectclip.cpp
---- kdenlive-15.08.1.orig/src/bin/projectclip.cpp	2015-09-11 00:31:47.000000000 +0200
-+++ kdenlive-15.08.1/src/bin/projectclip.cpp	2015-09-21 13:56:51.379263499 +0200
-@@ -269,7 +269,7 @@
- void ProjectClip::setProducer(ClipController *controller, bool replaceProducer)
- {
-     if (!replaceProducer && m_controller) {
--        qDebug()<<"// RECIEVED PRODUCER BUT WE ALREADY HAVE ONE
----------";
-+        qDebug()<<"// RECEIVED PRODUCER BUT WE ALREADY HAVE ONE
----------";
-         return;
-     }
-     if (m_controller) {

-- 
kdenlive packaging



More information about the pkg-kde-commits mailing list