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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit b51a89aa9956ce58ed233ed613268e1636a131b7
Author: the-me <the-me at f1c9c430-f51a-44e6-a298-6f72677f57b2>
Date:   Thu Aug 27 17:14:58 2015 +0000

    * Adjust debian/copyright.
    
    
    git-svn-id: https://svn.linux-dev.org/svn/pkg/kdenlive/trunk@6216 f1c9c430-f51a-44e6-a298-6f72677f57b2
---
 debian/changelog | 1 +
 debian/copyright | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1ff78d1..ba768c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ kdenlive (15.08.0-1) UNRELEASED; urgency=medium
   * New upstream release.
     - Remove merged patch 02-armhf-armel-use-opengles.
     - Add new build dependency qtdeclarative5-dev.
+  * Adjust debian/copyright.
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Thu, 20 Aug 2015 20:53:11 +0200
 
diff --git a/debian/copyright b/debian/copyright
index b2f7578..c616cbe 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -176,11 +176,6 @@ Files: src/monitor/monitoreditwidget.cpp
 Copyright: 2010, 2011, Till Theato (root at ttill.de)
 License: GPL-2+
 
-Files: src/monitor/twostateaction.cpp
-  src/monitor/twostateaction.h
-Copyright: 2014, Simon A. Eugster <simon.eu at gmail.com>
-License: GPL-3+
-
 Files: src/onmonitoritems/*
 Copyright: 2010, 2011, Till Theato (root at ttill.de)
 License: GPL-2+

-- 
kdenlive packaging