[SCM] kbookmarks packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-g32ca8de

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 7e6aca634b11b452b4640b6633e08e4dbd4bb856
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Jan 29 11:16:34 2015 +0100

    Update copyright information.
---
 debian/changelog |  1 +
 debian/copyright | 57 ++++++++++++++++++++++++++++++++++++++++----------------
 2 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9615094..400f44a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ kbookmarks (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>  Thu, 29 Jan 2015 11:01:39 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 7a86f6d..f54ac5a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,14 +3,13 @@ Upstream-Name: kbookmarks
 Source: https://projects.kde.org/projects/frameworks/kbookmarks
 
 Files: *
-Copyright: © 2006-2007 Daniel Teske <teske at squorn.de>
-           © 2002-2003 Alexander Kellett <lypanov at kde.org>
-           © 2000-2006, 2013 David Faure <faure at kde.org> <faure+bluesystems at kde.org>
-           © 1998-1999 Torben Weis <weis at kde.org>
-           © 2008 Norbert Frese <nf2 at scheinwelt.at>
-           © 2006 Thiago Macieira <thiago at kde.org>
-           © 1996-1998 Martin R. Jones <mjones at kde.org>
-           © 2013 Jignesh Kakadiya <jigneshhk1992 at gmail.com>
+Copyright: 2002-2003, Alexander Kellett <lypanov at kde.org>
+           2007, Daniel Teske <teske at squorn.de>
+           2000-2006, David Faure <faure at kde.org>
+           2013, Jignesh Kakadiya <jigneshhk1992 at gmail.com>
+           1996-1998, Martin R. Jones <mjones at kde.org>
+           2008, Norbert Frese <nf2 at scheinwelt.at>
+           2006, Thiago Macieira <thiago 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
@@ -44,14 +43,40 @@ Files: src/kbookmarkaction.cpp
        src/kbookmarkmenu_p.h
        src/konqbookmarkmenu.cpp
        src/konqbookmarkmenu.h
-       tests/kbookmarkdialogtest.cpp
-       debian/*
-Copyright: 1998, 1999 Torben Weis <weis at kde.org>
-	   2006 Daniel Teske <teske at squorn.de>
-	   2000 David Faure <faure at kde.org>
-	   2002-2003 Alexander Kellett <lypanov at kde.org>
-	   2013 David Faure <faure+bluesystems at kde.org>
-           2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
+Copyright: 2002-2003, Alexander Kellett <lypanov at kde.org>
+           2006, Daniel Teske <teske at squorn.de>
+           2000, David Faure <faure at kde.org>
+           1998-1999, Torben Weis <weis at kde.org>
+License: LGPL-2+
+
+Files: tests/kbookmarkdialogtest.cpp
+Copyright: 2013, David Faure <faure+bluesystems at kde.org>
+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 Lesser 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+
+
 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

-- 
kbookmarks packaging