[SCM] zanshin packaging branch, master, updated. debian/0.2.1-1-17-gb1cbdef

Pino Toscano pino at moszumanska.debian.org
Thu Jul 28 21:35:06 UTC 2016 

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/zanshin.git;a=commitdiff;h=b1cbdef

The following commit has been merged in the master branch:
commit b1cbdef08cf867c0d72feac8df08cdf455f520ad
Author: Pino Toscano <pino at debian.org>
Date:   Thu Jul 28 23:14:22 2016 +0200

    copyright: rewrite from scratch, use copyright-format v1.0
---
 debian/changelog |   1 +
 debian/copyright | 284 ++++++++++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 230 insertions(+), 55 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index db7fedc..e5a7fce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ zanshin (0.4.0-0r1) UNRELEASED; urgency=medium
   * Add Vcs-* fields.
   * Link in as-needed mode.
   * Bump Standards-Version to 3.9.8, no changes required.
+  * Rewrite copyright from scratch, following copyright-format v1.0.
 
   [ Fathi Boudra ]
   * Improve long description.
diff --git a/debian/copyright b/debian/copyright
index 213a525..cf826ce 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,80 +1,254 @@
-Format: http://dep.debian.net/deps/dep5
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: zanshin
 Source: http://zanshin.kde.org/
 
 Files: *
-Copyright: 2008-2011 Kevin Ottens <ervin at kde.org>
-           2008-2011 Mario Bensi <nef at ipsquad.net>
-License: GPL-2+
-
-Files: src/actionduedatedelegate.*
-Copyright: 2008 Thomas Thrainer <tom_t at gmx.at>
-License: GPL-2+
-
-Files: src/kdateedit.*
-Copyright: 2002 Cornelius Schumacher <schumacher at kde.org>
-           2002 David Jarvie <software at astrojar.org.uk>
-           2003-2004 Reinhold Kainhofer <reinhold at kainhofer.com>
-           2004 Tobias Koenig <tokoe at kde.org>
-License: LGPL-2+
-
-Files: src/kdatepickerpopup.*
-Copyright: 2004 Bram Schoenmakers <bramschoenmakers at kde.nl>
-License: LGPL-2+
-
-Files: tests/testlib/modeltest.*
-Copyright: 2011 Nokia Corporation and/or its subsidiary(-ies)
-License: LGPL2.1 with exception
-
-Files: debian/*
-Copyright: 2012 Fathi Boudra <fabo at debian.org>
-License: GPL-2+
-
-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
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This package is distributed in the hope that it will be useful,
+Copyright: 2011-2016, Kevin Ottens <ervin at kde.org>
+           2012,2014, Christian Mollekopf <mollekopf at kolabsys.com>
+           2014, David Faure <faure at kde.org>
+           2014-2015, Franck Arrecot <franck.arrecot at gmail.com>
+           2014, Mario Bensi <mbensi at ipsquad.net>
+           2014, Rémi Benoit <r3m1.benoit at gmail.com>
+           2015, René J.V. Bertin <rjvbertin at gmail.com>
+           2015, Theo Vaucher <theo.vaucher at gmail.com>
+License: GPL-2-or-2-or-KDE-eV
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2 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 14 of version 3 of the license.
+ .
+ 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
+ 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 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
-can be found in "/usr/share/common-licenses/GPL-2" and
-"/usr/share/common-licenses/GPL-3".
-
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ USA.
+
+Files: 3rdparty/cucumber-cpp/*
+Copyright: 2010, Paolo Ambrosio
+License: cucumber-MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
+Files: 3rdparty/cucumber-cpp/cmake/modules/FindGMock.cmake
+Copyright: 2011, Matej Svec
+License: cucumber-cmake-MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to
+ deal in the Software without restriction, including without limitation the
+ rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ sell copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ IN THE SOFTWARE.
+
+Files: 3rdparty/cucumber-cpp/include/json_spirit/*
+Copyright: 2007-2009, John W. Wilkinson
+License: cucumber-boost-spirit
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
+Files: 3rdparty/kdepim/libkdepim/*
+Copyright: 2001,2003, Carsten Pfeiffer <pfeiffer at kde.org>
+           2001, Waldo Bastian <bastian at kde.org>
+           2002, Cornelius Schumacher <schumacher at kde.org>
+           2002, David Jarvie <software at astrojar.org.uk>
+           2002, Helge Deller <deller at gmx.de>
+           2002, Klarälvdalens Datakonsult AB
+           2002, Lubos Lunak <llunak at suse.cz>
+           2002-2010, Tobias Koenig <tokoe at kde.org>
+           2003-2004, Reinhold Kainhofer <reinhold at kainhofer.com>
+           2004, Bram Schoenmakers <bramschoenmakers at kde.nl>
+           2004, Daniel Molkentin <danimo at klaralvdalens-datakonsult.se>
+           2004, Karl-Heinz Zimmer <khz at klaralvdalens-datakonsult.se>
+           2006, Christian Schaarschmidt <schaarsc at gmx.de>
+           2013-2015, Montel Laurent <montel at kde.org>
 License: LGPL-2+
- This package is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
+ 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 package is distributed in the hope that it will be useful,
+ .
+ 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.
+ 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.
+
+Files: 3rdparty/kdepim/libkdepim/addressline/addresseelineedit_p.cpp
+       3rdparty/kdepim/libkdepim/addressline/addresseelineedit_p.h
+       3rdparty/kdepim/libkdepim/addressline/addresseelineeditstatic.cpp
+       3rdparty/kdepim/libkdepim/addressline/addresseelineeditstatic.h
+Copyright: 2015, Montel Laurent <montel at kde.org>
+License: GPL-2+
 
+Files: 3rdparty/kdepim/libkdepim/completionorder/completionordereditor.cpp
+       3rdparty/kdepim/libkdepim/completionorder/completionordereditor.h
+       3rdparty/kdepim/libkdepim/recentaddress/recentaddresses.cpp
+       3rdparty/kdepim/libkdepim/recentaddress/recentaddresses.h
+Copyright: 2001-2003, Carsten Pfeiffer <pfeiffer at kde.org>
+           2003, Zack Rusin <zack at kde.org>
+           2004, David Faure <faure at kde.org>
+           2010, Tobias Koenig <tokoe at kde.org>
+License: GPL-2-with-Qt-exception
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License
+ .
+ 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 General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-On Debian systems, the complete text of the GNU Lesser General Public
-License can be found in "/usr/share/common-licenses/LGPL-2" and
-"/usr/share/common-licenses/LGPL-3".
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ In addition, as a special exception, the copyright holders give
+ permission to link the code of this program with any edition of
+ the Qt library by Trolltech AS, Norway (or with modified versions
+ of Qt that use the same license as Qt), and distribute linked
+ combinations including the two.  You must obey the GNU General
+ Public License in all respects for all of the code used other than
+ Qt.  If you modify this file, you may extend this exception to
+ your version of the file, but you are not obligated to do so.  If
+ you do not wish to do so, delete this exception statement from
+ your version.
+
+Files: 3rdparty/kdepim/libkdepim/tests/testldapclient.cpp
+       3rdparty/kdepim/libkdepim/tests/testldapclient.h
+Copyright: 2005, David Faure <faure 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 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
+ 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.
+
+Files: 3rdparty/mockitopp/*
+Copyright: 2008, Trevor Pounds
+License: mockitopp-MIT
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following
+ conditions:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
 
-License: LGPL2.1 with exception
+Files: tests/testlib/modeltest.*
+Copyright: 2011, Nokia Corporation and/or its subsidiary(-ies).
+License: LGPL-2.1
+ No Commercial Usage
+ This file contains pre-release code and may not be distributed.
+ You may use this file in accordance with the terms and conditions
+ contained in the Technology Preview License Agreement accompanying
+ this package.
+ .
+ GNU Lesser General Public License Usage
  Alternatively, 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 LICENSE.LGPL 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.
-
+ .
  In addition, as a special exception, Nokia gives you certain additional
  rights.  These rights are described in the Nokia Qt LGPL Exception
  version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+ .
+ If you have questions regarding the use of this file, please contact
+ Nokia at qt-info at nokia.com.
 
+Files: debian/*
+Copyright: 2012, Fathi Boudra <fabo at debian.org>
+           2016, Pino Toscano <pino at debian.org>
+License: GPL-2+
+
+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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package 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 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
+ can be found in "/usr/share/common-licenses/GPL-2" and
+ "/usr/share/common-licenses/GPL-3".

-- 
zanshin packaging

More information about the pkg-kde-commits mailing list