[SCM] libkgeomap packaging branch, master, updated. 32e903865fb64cc9556b304b7d86b0a72dc8a945

Mon Feb 8 12:32:26 UTC 2016

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/libkgeomap.git;a=commitdiff;h=32e9038

The following commit has been merged in the master branch:
commit 32e903865fb64cc9556b304b7d86b0a72dc8a945
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Feb 8 13:17:05 2016 +0100

    Update copyright file
---
 debian/copyright | 82 +++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 58 insertions(+), 24 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 948c754..0add3ef 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,17 +1,34 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
-Copyright: 2002-2003 Stephan Stapel <stephan dot stapel at web dot de>
-           2007-2009 by Gilles Caulier <caulier dot gilles at gmail dot com>
-           1991, 1992 TWAIN Working Group: Aldus, Caere, Eastman-Kodak
-           1997 TWAIN Working Group: Bell+Howell, Canon, DocuMagix
-           1998, 2000 TWAIN Working Group: Adobe Systems Incorporated
-           2007-2011 by Kare Sars <kare.sars at iki .fi>
-           2009 by Matthias Nagl <matthias at nagl dot info>
-           2009 by Grzegorz Kurtyka <grzegorz dot kurtyka at gmail dot com>
-           2007 David Faure <faure at kde.org>
-           2009 Aurélien Gâteau <agateau at kde.org>
-License: LGPL-2.1+
+Copyright: 1989-1991, Free Software Foundation, Inc
+           2006-2015, Gilles Caulier
+           2014, Justus Schwartz
+           2014, Justus Schwartz <justus at gmx.li>
+           2009-2014, Michael G. Hansen
+           2010-2014, Michael G. Hansen <mike at mghansen.de>
+           2015, Mohamed Anwer
+License: GPL-2+
+
+Files: CMakeLists.txt
+       COPYING-CMAKE-SCRIPTS
+       calibrator/CMakeLists.txt
+       cmake/modules/FindKGeoMap.cmake
+       cmake/modules/FindMarble.cmake
+       data/CMakeLists.txt
+       demo/CMakeLists.txt
+       src/CMakeLists.txt
+       tests/CMakeLists.txt
+Copyright: 2010-2015, Gilles Caulier <caulier.gilles at gmail.com>
+           2011, Michael G. Hansen <mike at mghansen.de>
+License: BSD-3-clause
+
+Files: COPYING.LIB
+       src/libkgeomap_debug.cpp
+       src/libkgeomap_debug.h
+Copyright: 1991, Free Software Foundation, Inc
+           2014, Laurent Montel <montel at kde.org>
+License: LGPL-2+
 
 Files: debian/*
 Copyright: 2015, Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
@@ -36,23 +53,40 @@ License: GPL-2+
  version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
 
-License: LGPL-2.1+
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ 1. Redistributions of source code must retain the copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+    derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License: LGPL-2+
  This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
+ modify it under the terms of the GNU Library General Public
  License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) version 3, or any
- later version accepted by the membership of KDE e.V. (or its
- successor approved by the membership of KDE e.V.), which shall
- act as a proxy defined in Section 6 of version 3 of the license.
+ 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
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public
- License along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ Library General Public License for more details.
  .
- On Debian systems, the full text of the GNU Lesser General Public
- License version 2.1 can be found in the file
- `/usr/share/common-licenses/LGPL-2.1'.
+ The full text of the GNU Libary General Public License version 2 can be found
+ in the file `/usr/share/common-licenses/LGPL-2'.

-- 
libkgeomap packaging

