[SCM] kdoctools packaging branch, kubuntu_unstable, updated. debian/5.9.0-1-4-g67cafe2

Kubuntu CI (Harald Sitter) kubuntu-ci-guest at moszumanska.debian.org
Wed May 20 00:01:24 UTC 2015


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

The following commit has been merged in the kubuntu_unstable branch:
commit 351f8be1f5240c398e10292acee7d19b7664db35
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Jan 26 11:12:21 2015 +0100

    Update copyright information.
---
 debian/changelog |  1 +
 debian/copyright | 86 +++++++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 61 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f761fc3..fd3838f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ kdoctools (5.6.0-1~) UNRELEASED; urgency=medium
   * Update install files.
   * Update watch file.
   * Update build dependencies to follow cmake.
+  * Update copyright information.
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 26 Jan 2015 10:22:56 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 5c3b7cb..287023d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,38 +1,22 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: kdoctools
 Source: https://projects.kde.org/projects/frameworks/kdoctools
+Comment: This program includes a number of documentation templates, which
+ include the license notices and the complete texts in different formats.
 
 Files: *
-       debian/*
 Copyright: 2006-2009, Alexander Neundorf <neundorf at kde.org>
            2006-2007, Laurent Montel <montel at kde.org>
            2010, Luigi Toscano <luigi.toscano at tiscali.it>
            2007, Matthias Kretz <kretz at kde.org>
-           2014, Scarlett Clark <sgclark at kubuntu.org>
 License: Expat
- 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: cmake/*
-Copyright: 2010-2014, Luigi Toscano <luigi.toscano at tiscali.it>
+Files: KF5DocToolsMacros.cmake
+       cmake/*
+Copyright: 2006-2009, Alexander Neundorf <neundorf at kde.org>
+           2006-2007, Laurent Montel <montel at kde.org>
+           2010-2014, Luigi Toscano <luigi.toscano at tiscali.it>
+           2007, Matthias Kretz <kretz at kde.org>
 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:
@@ -59,9 +43,31 @@ License: BSD-3-clause
  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.
 
+Files: common/ro/kde-localised.css
+       src/customization/dtd/kdedbx45.dtd.cmake
+Copyright: 2000, Claudiu Costin
+           2000, Frederik Fouvry
+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
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ .
+ 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, 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 General Public License
+ version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
 Files: src/docbookl10nhelper.cpp
 Copyright: 2010, Luigi Toscano <luigi.toscano at tiscali.it>
-License: LGPL-2.1 or LGPL-3 or later accepted by KDE e.V.
+License: LGPL-2.1+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
@@ -81,4 +87,32 @@ License: LGPL-2.1 or LGPL-3 or later accepted by KDE e.V.
  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".
+ version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1", 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 <sgclark at kubuntu.org>
+License: Expat
+
+License: Expat
+ 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.

-- 
kdoctools packaging



More information about the pkg-kde-commits mailing list