[SCM] qtsystems packaging branch, master, updated. 52551a42142890804946b2d26f0cb52f12941a01

[Timo Jyrinki]

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

The following commit has been merged in the master branch:
commit 5845215440b201f1e5a2266ac6ea4d9153488b5d
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Fri Jun 14 11:45:29 2013 +0300

    Update debian/copyright
---
 debian/copyright |   59 ++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 55 insertions(+), 4 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 84ef0c2..ca178cf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,8 +4,6 @@ Source: http://qt.gitorious.org/qt/qtsystems
 
 Files: *
 Copyright: 2012-2013 Digia Plc and/or its subsidiary(-ies)
-           2008-2012 Nokia Corporation and/or its subsidiary(-ies)
-           1994-2008 Trolltech ASA.
 License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
 
 Files: debian/*
@@ -79,10 +77,42 @@ License: LGPL-2.1
  On Debian systems, the complete text of the LGPL-2.1 license can be found in
  `/usr/share/common-licenses/LGPL-2.1`,
 
+Files: doc/config/publishsubscribe/scripts/superfish.js doc/config/systeminfo/scripts/superfish.js doc/config/serviceframework/scripts/superfish.js
+Copyright: 2008 Joel Birch
+License: MIT
+
+Files: doc/config/publishsubscribe/scripts/jquery.js doc/config/systeminfo/scripts/jquery.js doc/config/serviceframework/scripts/jquery.js
+Copyright: 2010 John Resig
+           2010 The Dojo Foundation
+License: MIT
+
+License: 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: tests/auto/cmake/test_modules/main.cpp
+Copyright: 2012 Klarälvdalens Datakonsult AB, a KDAB Group company
+License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
+
 Files: examples/*
 Copyright: 2012-2013 Digia Plc and/or its subsidiary(-ies)
-           2008-2012 Nokia Corporation and/or its subsidiary(-ies)
-           1994-2008 Trolltech ASA.
 License: BSD-3-clause
  You may use this file under the terms of the BSD license as follows:
  .
@@ -110,3 +140,24 @@ License: BSD-3-clause
  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."
+
+Files: *.qdoc
+Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
+License: GFDL-1.3
+
+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`,
+
+Files: examples/systeminfo/stub.h examples/systeminfo/qml-deviceinfo/main.cpp examples/systeminfo/qml-deviceinfo/qml-deviceinfo.qml examples/systeminfo/qml-storageinfo/main.cpp examples/systeminfo/qml-storageinfo/qml-storage.qml examples/systeminfo/qml-battery/main.cpp examples/systeminfo/qml-battery/qml-battery.qml doc/src/serviceframework/snippets/code/doc_src_lgpl.qdoc
+Copyright: 2012-2013 Digia Plc and/or its subsidiary(-ies)
+License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
+

-- 
qtsystems packaging