[SCM] qttools packaging branch, master, updated. 79a4b439731215e1fd067a5ae306e4695cf591d0

Fri Apr 19 08:20:09 UTC 2013

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qttools.git;a=commitdiff;h=79a4b43

The following commit has been merged in the master branch:
commit 79a4b439731215e1fd067a5ae306e4695cf591d0
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Fri Apr 19 08:20:01 2013 +0000

    More additions to copyright.
---
 debian/copyright |   68 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index fa2ea4d..acba265 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,12 +15,21 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
            2012 Felix Geyer <fgeyer at debian.org>
            2012-2013 Timo Jyrinki <timo.jyrinki at canonical.com>
            2013 Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
-License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
+License: LGPL-2.1
 
-Files: tests/auto/cmake/test_modules/*
+Files: tests/auto/cmake/test_translation_macros/myi18nobject.cpp tests/auto/cmake/test_translation_macros/some_dir/some_include.h
 Copyright: 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info at kdab.com
 License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
 
+Files: src/linguist/Qt5LinguistToolsMacros.cmake
+Copyright: 2005-2011 Kitware, Inc.
+License: BSD-3-clause
+
+Files: tests/auto/linguist/lconvert/data/*.po
+Copyright: 2001, 2003 Free Software Foundation, Inc.
+           2002, 2003, 2004 Thomas Diehl, Stephan Johach, Thomas Reitelbach
+License: GPL-2+
+
 Files: examples/*
        src/linguist/linguist/doc/snippets/doc_src_linguist-manual.cpp
        src/assistant/help/doc/snippets/doc_src_qthelp.cpp
@@ -46,7 +55,7 @@ Copyright: 2003-2006 Ben van Klinken and the CLucene Team
            2000 Red Hat, Inc.
            1991, 1999 Free Software Foundation, Inc.
            2003-2006 The Apache Software Foundation
-           2006 Jos van den Oever
+           2003-2006 Jos van den Oever
            2003-2006 Matt J. Weinstein
            2012 Digia Plc and/or its subsidiary(-ies)
 License: Apache-2.0 or LGPL-2.1
@@ -94,6 +103,24 @@ License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
  Furthermore, you are not required to apply this additional permission to a
  modified version of the Library.
 
+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 Public Licenses can be found
+ in `/usr/share/common-licenses/GPL-2`.
+
 License: GPL-3
  Alternatively, this file may be used under the terms of the GNU General
  Public License version 3.0 as published by the Free Software Foundation
@@ -159,3 +186,38 @@ License: Apache-2.0
  .
  On Debian systems, the complete text of the Apache License 2.0
  can be found in `/usr/share/common-licenses/Apache-2.0`.
+
+Files: examples/designer/arthurplugin/plugin.cpp
+Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
+License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
+
+Files: *.qdoc
+Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
+License: GFDL-1.3
+
+Files: src/designer/src/designer/doc/src/designer-manual.qdoc
+Copyright: 2005 Bjoern Bergstroem
+           2012 Digia Plc and/or its subsidiary(-ies).
+License: GFDL-1.3
+
+Files: src/makeqpf/Blocks.txt
+Copyright: 1991-2006 Unicode, Inc.
+License: Unicode, Inc. License Agreement
+ Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified.
+ .
+ THE DATA FILES AND SOFTWARE ARE 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 OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+ .
+ Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.
+
+License: GFDL-1.3
+ GNU Free Documentation License Usage
+ Alternatively, this file may be used under the terms of the GNU Free
+ Documentation License version 1.3 as published by the Free Software
+ Foundation and appearing in the file included in the packaging of
+ this file.  Please review the following information to ensure
+ the GNU Free Documentation License version 1.3 requirements
+ will be met: http://www.gnu.org/copyleft/fdl.html.
+ .
+ On Debian systems, the complete text of the GFDL-1.3 license can be found in
+ `/usr/share/common-licenses/GFDL-1.3`,
+

-- 
qttools packaging

