[SCM] kemoticons packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-g9b74b0b

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kemoticons.git;a=commitdiff;h=286e637

The following commit has been merged in the kubuntu_wily_archive branch:
commit 286e6372f8d03df22d9824f6b920ea473a223466
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Jan 28 14:12:46 2015 +0100

    Update copyright information.
---
 debian/changelog |  1 +
 debian/copyright | 76 +++++++++++++++++++++++++++++++++++---------------------
 2 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 60816cb..db0815b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ kemoticons (5.6.0-1~) UNRELEASED; urgency=medium
   * Update build dependencies to build against experimental and to
     follow cmake.
   * Bump Standards-Version to 3.9.6, no changes needed.
+  * Update copyright information.
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 27 Jan 2015 22:49:43 +0100
 
diff --git a/debian/copyright b/debian/copyright
index dddf5a3..37b2cd5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,14 +3,21 @@ Upstream-Name: kemoticons
 Source: https://projects.kde.org/projects/frameworks/kemoticons
 
 Files: *
-Copyright: 2007-2008 Carlo Segato <brandon.ml at gmail.com>
-           2002-2008 Kopete <kopete-devel at kde.org>
-           2005 Duncan Mac-Vicar <duncan at kde.org>
-           2002-2003 Stefan Gehn <metz at gehn.net>
-           2005 Engin AYDOGAN <engin at bzzzt.biz>
-           2004 Richard Smith <kde at metafoo.co.uk>
-           2008 Montel Laurent <montel at kde.org>
-           2006 Michael Larouche <larouche at kde.org>
+Copyright: 2007-2008, Carlo Segato <brandon.ml at gmail.com>
+           2014, Daniel Vrátil <dvratil at redhat.com>
+           2005, Engin AYDOGAN <engin at bzzzt.biz>
+           2008, Montel Laurent <montel at kde.org>
+           2002-2003, Stefan Gehn <metz at gehn.net>
+           2002-2008, the Kopete developers <kopete-devel at kde.org>
+License: LGPL-2.1+
+
+Files: autotests/kemoticontest.cpp
+       tests/main.cpp
+Copyright: 2014, Alex Merry <alex.merry at kde.org>
+           2008, Carlo Segato <brandon.ml at gmail.com>
+           2005, Duncan Mac-Vicar <duncan at kde.org>
+           2004, Richard Smith <kde at metafoo.co.uk>
+           2002-2005, the Kopete developers <kopete-devel at kde.org>
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -25,24 +32,38 @@ License: GPL-2+
  You should have received a copy of the GNU General Public License
  along with this program. If not, see <http://www.gnu.org/licenses/>
  .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+ On Debian systems, the complete text of the GNU General Public License
+ version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+Files: src/integrationplugin/ktexttohtml.cpp
+       src/integrationplugin/ktexttohtml.h
+Copyright: 2014, Daniel Vrátil <dvratil at redhat.com>
+License: LGPL-2+3+KDEeV
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2 of the License or ( at
+ your option ) version 3 or, at the discretion of KDE e.V. ( which shall
+ act as a proxy as in section 14 of the GPLv3 ), any later version.
+ .
+ This library 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
+ Library General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; see the file COPYING.LIB.  If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+ .
+ On Debian systems, the complete text of the GNU Library General Public
+ License version 2 can be found in "/usr/share/common-licenses/LGPL-2",
+ likewise, the complete text of the GNU Library General Public License version
+ 3 can be found in "/usr/share/common-licenses/LGPL-3".
+
+Files: debian/*
+Copyright: 2014, Scarlett Clark <scarlett at scarlettgatelyclark.com>
+License: LGPL-2.1+
 
-Files: src/core/* 
-       src/providers/adium/* 
-       src/providers/kde/* 
-       src/providers/pidgin/* 
-       src/providers/xmpp/* 
-       debian/*
-Copyright: 2007-2008 Carlo Segato <brandon.ml at gmail.com>
-           2002-2008 Kopete <kopete-devel at kde.org>
-           2005 Duncan Mac-Vicar <duncan at kde.org>
-           2002-2003 Stefan Gehn <metz at gehn.net>
-           2005 Engin AYDOGAN <engin at bzzzt.biz>
-           2004 Richard Smith <kde at metafoo.co.uk>
-           2008 Montel Laurent <montel at kde.org>
-           2006 Michael Larouche <larouche at kde.org>
-           2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
 License: LGPL-2.1+
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
@@ -54,6 +75,5 @@ License: LGPL-2.1+
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
  .
- 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
+ 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".

-- 
kemoticons packaging