[SCM] ktp-common-internals packaging branch, master, updated. debian/0.8.1-4-157-g3ee7b4d

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=0b2c5b1

The following commit has been merged in the master branch:
commit 0b2c5b129d80a0a88f794b8f38b48619c2c697a4
Author: Diane Trout <diane at ghic.org>
Date:   Fri Nov 6 20:01:34 2015 -0800

    Update copyright file to match the above licensing fixes.
---
 debian/changelog |  1 +
 debian/copyright | 37 -------------------------------------
 2 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8c648aa..1b68ea3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,7 @@ ktp-common-internals (15.08.2-1) UNRELEASED; urgency=medium
     - 0002-Relicense-invalid-license-to-LGPL-2.1.patch
     - 0003-Relicense-David-Edmundson-s-code-to-LGPL-2.1-to-matc.patch
     - 0004-Add-GPLv2-COPYING-file-as-there-s-a-few-files-still-.patch
+  * Update copyright file to match the above licensing fixes.
 
  -- Diane Trout <diane at debian.org>  Tue, 03 Nov 2015 21:23:43 -0800
 
diff --git a/debian/copyright b/debian/copyright
index 3cde626..ff76ea9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -25,33 +25,10 @@ Copyright: 2011-2013 David Edmundson <kde at davidedmundson.co.uk>
            2014 Marcin Ziemiński <zieminn at gmail.com>
 License: LGPL-2.1+
 
-Files: KTp/Logger/*
-Copyright: 2013 Daniel Vrátil <dvratil at redhat.com>
-License: GPL-2+
-
-Files: KTp/Logger/scrollback-manager.cpp
-       KTp/Logger/debug.*
-Copyright: 2013 Daniel Vrátil <dvratil at redhat.com>
-           2014 Martin Klapetek <mklapetek at kde.org>
-           2014 Aleix Pol Gonzalez <aleixpol at blue-systems.com>
-License: LGPL-2.1+
-
-Files: kpeople/actionsplugin/kpeople-actions-plugin.*
-Copyright: 2013 David Edmundson <davidedmundson at kde.org>
-License: GPL-3+
-
 Files: KTp/OTR/*
 Copyright: 2014 Marcin Ziemiński <zieminn at gmail.com>
 License: GPL-2+
 
-Files: otr-proxy/*
-Copyright: 2014 Marcin Ziemiński <zieminn at gmail.com>
-License: GPL-2.1+
-
-Files: otr-proxy/KTpProxy/ktp-proxy-debug.*
-Copyright: 2014 Martin Klapetek <mklapetek at kde.org>
-License: LGPL-2+
-
 Files: cmake/*
 Copyright: 2014 Marcin Ziemiński <zieminn at gmail.com>
            2008-2013 Michael Zanetti <mzanetti @ kde.org>
@@ -80,20 +57,6 @@ License: LGPL-2.1+
  On Debian systems, the complete text of the GNU Lesser General
  Public License version 2.1+ can be found in "/usr/share/common-licenses/LGPL-2.1"
 
-License: GPL-3+
- This program 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, either version 3 of the License, or
- (at your option) any later version.
- .
- This program 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
- GNU General Public License for more details.
- .
- On Debian systems, the complete text of the GNU General
- Public License version 3+ can be found in "/usr/share/common-licenses/GPL-3"
-
 License: GPL-2+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

-- 
ktp-common-internals packaging