[SCM] subtitlecomposer packaging branch, master, updated. debian/0.6.3-1-6-g6003c26

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/subtitlecomposer.git;a=commitdiff;h=fb3fb47

The following commit has been merged in the master branch:
commit fb3fb4780dcff5ab0fb0296d0d869e0c58d42201
Author: Pino Toscano <pino at debian.org>
Date:   Mon May 16 07:58:10 2016 +0200

    copyright: update
---
 debian/changelog |  1 +
 debian/copyright | 25 -------------------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f822dbf..69dbb5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ subtitlecomposer (0.6.4-0r1) UNRELEASED; urgency=medium
 
   [ Pino Toscano ]
   * New upstream release.
+  * Update copyright.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Mon, 16 May 2016 07:50:17 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 5ae558c..6ab8a5a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -42,31 +42,6 @@ License: BSD-3-clause
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-Files: src/common/qxtsignalwaiter.cpp
-       src/common/qxtsignalwaiter.h
-Copyright: 2006, Adam Higerd <ahigerd at stratitec.com>
-License: LGPL-2.1+_or_GPL-2+
- QxtSignalWaiter is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, version 2 or greater, or under the terms
- of the GNU Lesser General Public License, version 2.1 or greater, or
- under the terms of the Q Public License as published by Trolltech.
- This disjunctive license follows the license of the linked Qt toolkit.
- Specifically, if you use Qt under the GPL, QxtSignalWaiter is licensed
- to you under the GPL. If you use Qt under the QPL, this is licensed to
- you under the QPL. If you use Qt with a commercial license purchased
- from Trolltech, this is licensed to you under the LGPL.
- .
- QxtSignalWaiter is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- appropriate license agreement for more details.
- .
- The complete text of the GNU General Public License version 2 can be
- found in the `/usr/share/common-licenses/GPL-2' file, likewise, the complete
- text of the GNU Lesser General Public License version 2.1 can be found in
- `/usr/share/common-licenses/LGPL-2.1'.
-
 Files: debian/*
 Copyright: 2009, José Manuel Santamaría Lema <panfaust at gmail.com>
            2015, Martin Steghöfer <martin at steghoefer.eu>

-- 
subtitlecomposer packaging