[SCM] kitemmodels packaging branch, master, updated. d2310c92e4a892ad513a4f8dfee27e0b400e12e2

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 6d78c748aff4054ace57c943ee7cf9553fd4ee27
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Mar 3 10:25:44 2015 +0100

    Update copyright information.
---
 debian/changelog |  1 +
 debian/copyright | 83 +++++++++++++++++++++++++++++---------------------------
 2 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3a49ccf..dd0b74e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kitemmodels (5.7.0-1~) UNRELEASED; urgency=medium
 
   * New upstream release (5.7.0).
+  * Update copyright information.
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Feb 2015 17:38:25 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 359155b..b24c1f7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,31 +3,13 @@ Upstream-Name: kitemmodels
 Source: https://projects.kde.org/projects/frameworks/kitemmodels
 
 Files: *
-       debian/*
 Copyright: 2013, Aurélien Gateau <agateau at kde.org>
-           2010, Klarälvdalens Datakonsult AB,
+           2010, Klarälvdalens Datakonsult AB
            2009-2010, Stephen Kelly <steveire at gmail.com>
-           2014, Jonathan Riddell <jriddell at ubuntu.com>
 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, 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: autotests/proxymodeltestapp/descendantpmwidget.cpp
+Files: COPYING.LIB
+       autotests/proxymodeltestapp/descendantpmwidget.cpp
        autotests/proxymodeltestapp/descendantpmwidget.h
        autotests/proxymodeltestapp/lessthanwidget.cpp
        autotests/proxymodeltestapp/lessthanwidget.h
@@ -42,31 +24,21 @@ Files: autotests/proxymodeltestapp/descendantpmwidget.cpp
        autotests/proxymodeltestapp/reparentingpmwidget.h
        autotests/proxymodeltestapp/selectionpmwidget.cpp
        autotests/proxymodeltestapp/selectionpmwidget.h
-Copyright: 2009, Stephen Kelly <steveire at gmail.com>
+Copyright: 1991-1999, Free Software Foundation, Inc
+           2009, Stephen Kelly <steveire at gmail.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
- License as published by the Free Software Foundation; either
- version 2.1 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
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public
- License along with this library; 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 Lesser General Public License
- version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1".
 
 Files: autotests/proxymodeltestsuite/modeltest.cpp
        autotests/proxymodeltestsuite/modeltest.h
 Copyright: 2013, Digia Plc and/or its subsidiary(-ies)
            2010, Stephen Kelly <steveire at gmail.com>
-License: LGPL-2
+License: LGPL-2.1
+
+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
@@ -84,3 +56,34 @@ License: LGPL-2
  .
  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".
+
+License: LGPL-2.1
+ GNU Lesser General Public License Usage
+ This file may be used under the terms of the GNU Lesser
+ General Public License version 2.1 as published by the Free Software
+ Foundation and appearing in the file COPYING.LIB included in the
+ packaging of this file.  Please review the following information to
+ ensure the GNU Lesser General Public License version 2.1 requirements
+ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ .
+ 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: 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
+ License as published by the Free Software Foundation; either
+ version 2.1 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; 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 Lesser General Public License
+ version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1".

-- 
kitemmodels packaging