[SCM] kitemviews packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-gfd21fca

Tue May 19 12:59:25 UTC 2015

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit c6b42156925f8c01cc7430f810e741ddf42cd136
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Jan 23 15:47:54 2015 +0100

    Update copyright information.
---
 debian/changelog |  1 +
 debian/copyright | 88 ++++++++++++++++++++++++++++++--------------------------
 2 files changed, 48 insertions(+), 41 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c433356..1bef2bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ kitemviews (5.6.0-1~) UNRELEASED; urgency=medium
   * Bump Standards-Version to 3.9.6, no changes needed.
   * Update install files.
   * Update build dependencies to follow cmake.
+  * Update copyright information.
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 23 Jan 2015 15:29:58 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 6b4de80..78b027a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,19 +3,29 @@ Upstream-Name: kitemviews
 Source: https://projects.kde.org/projects/frameworks/kitemviews
 
 Files: *
-Copyright: 2004 Gustavo Sverzut Barbieri <gsbarbieri at users.sourceforge.net>
- 2007-2008 Omat Holding B.V. <info at omat.nl>
- 2007-2008 Rafael Fernández López <ereslibre at kde.org>
- 2007, 2009 Rafael Fernández López <ereslibre at kde.org>
- 2007 John Tapsell <tapsell at kde.org>
- 2007 Rafael Fernández López <ereslibre at kde.org>
- 2008 Kevin Ottens <ervin at kde.org>
- 2008 Rafael Fernández López <ereslibre at kde.org>
+Copyright: 2006-2007, Andreas Hartmetz <ahartmetz at gmail.com>
+           2004 Gustavo Sverzut Barbieri <gsbarbieri at users.sourceforge.net>
+           2007, John Tapsell <tapsell at kde.org>
+           2008, Kevin Ottens <ervin at kde.org>
+           2007-2008, Omat Holding B.V <info at omat.nl>
+           2007-2009, Rafael Fernández López <ereslibre at kde.org>
+           2008, Urs Wolfer <uwolfer at kde.org>
 License: LGPL-2+
+
+Files: src/klistwidgetsearchline.h
+       src/klistwidgetsearchline.cpp
+       src/ktreewidgetsearchline.h
+       src/ktreewidgetsearchline.cpp
+       src/ktreewidgetsearchlinewidget.h
+       src/ktreewidgetsearchlinewidget.cpp
+Copyright: 2004, Gustavo Sverzut Barbieri <gsbarbieri at users.sourceforge.net>
+           2006, Hamish Rodda <rodda at kde.org>
+           2005, Rafal Rzepecki <divide at users.sourceforge.net>
+           2003, Scott Wheeler <wheeler at kde.org>
+License: LGPL-2
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
+ License version 2 as published by the Free Software Foundation.
  .
  This library is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,41 +33,15 @@ License: LGPL-2+
  Library General Public License for more details.
  .
  You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB.  If not,
- see <http://www.gnu.org/licenses/>
+ 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".
 
-Files: src/ktreewidgetsearchline.h
-       src/klistwidgetsearchline.h
-       src/ktreewidgetsearchlinewidget.h
-       src/klistwidgetsearchline.cpp
-       src/ktreewidgetsearchline.cpp
-       src/ktreewidgetsearchlinewidget.cpp
-Copyright: 2003 Scott Wheeler <wheeler at kde.org>
-   2005 Rafal Rzepecki <divide at users.sourceforge.net>
-   2006 Hamish Rodda <rodda at kde.org>
-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 version 2
- as published by the Free Software Foundation.
- .
- 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.
- .
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB.  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".
-
-Files: debian/*
-       autotests/klistwidgetsearchlinetest.cpp
-Copyright: 2014 Jonathan Riddell <jriddell at ubuntu.com>
+Files: autotests/klistwidgetsearchlinetest.cpp
+Copyright: 2011, Frank Reininghaus <frank78ac at googlemail.com>
 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
@@ -74,3 +58,25 @@ License: 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: debian/*
+Copyright: 2014, Jonathan Riddell <jriddell at ubuntu.com>
+License: LGPL-2+
+
+License: LGPL-2+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) 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 Library General Public License
+ along with this library; see the file COPYING.LIB.  If not,
+ see <http://www.gnu.org/licenses/>
+ .
+ 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".

-- 
kitemviews packaging

