[SCM] qtbase packaging branch, experimental, updated. debian/5.4.2+dfsg-4-25-g19408a8

Mon Jul 6 02:11:56 UTC 2015

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

The following commit has been merged in the experimental branch:
commit 19408a851931be4d6db7ae19fbc2ab9628350d1c
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sun Jul 5 23:11:37 2015 -0300

    Update debian/copyright.
---
 debian/changelog |  1 +
 debian/copyright | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 78 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4ef0a3f..094c9b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ qtbase-opensource-src (5.5.0+dfsg-1) UNRELEASED; urgency=medium
     due to libinput not being available on other OSs yet.
   * Update symbols files with current build log.
   * Mark/unmark private symbols.
+  * Update debian/copyright.
 
   [ Pino Toscano ]
   * Fix build on Hurd, by temporarly disabling waitid() in forkfd code;
diff --git a/debian/copyright b/debian/copyright
index dab31e9..128e86c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -18,12 +18,23 @@ Files-Excluded: src/3rdparty/zlib/doc/rfc*.txt
 # * htmlinfo example which contains non-free websites snapshots
 
 Files: *
-Copyright: 2012-2015 Digia Plc and/or its subsidiary(-ies)
+Copyright: 2012-2015 The Qt Company Ltd.
 License: LGPL-2.1-or-3 with Digia-1.1 exception
 
-Files: examples/* doc/src/snippets/* src/*/doc/snippets/* tests/manual/qlocale/*
-       src/winmain/qtmain_win.cpp src/tools/qdoc/doc/examples/componentset/*
-Copyright: 2012 Digia Plc and/or its subsidiary(-ies)
+Files: examples/*
+       doc/src/snippets/*
+       qmake/doc/snippets/*
+       src/*/doc/snippets/*
+       tests/manual/xembed*
+       tests/manual/qlocale/*
+       src/winmain/qtmain_win.cpp
+       src/winmain/qtmain_winrt.cpp
+       src/platformsupport/eventdispatchers/qeventdispatcher_cf_p.h
+       src/platformheaders/doc/snippets/qwindowswindowfunctions/main.cpp
+       src/platformheaders/doc/snippets/qxcbwindowfunctions/main.cpp
+       src/tools/qdoc/doc/examples/componentset/*
+       tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp
+Copyright: 2012 The Qt Company Ltd.
 License: BSD-3-clause
 
 Files: debian/*
@@ -77,6 +88,15 @@ Copyright: 2011 Klarälvdalens Datakonsult AB, a KDAB Group company
            2007-2008 Apple, Inc.
 License: LGPL-2.1-or-3 with Digia-1.1 exception
 
+Files: src/plugins/platforms/cocoa/qcocoaeventdispatcher.h
+       src/plugins/platforms/cocoa/qcocoaapplication.h
+       src/plugins/platforms/cocoa/qcocoaintrospection.h
+       src/plugins/platforms/cocoa/qmacdefines_mac.h
+       src/plugins/platforms/cocoa/qcocoaapplicationdelegate.h
+Copyright: 2007-2008 Apple, Inc.
+           2015 The Qt Company Ltd.
+License: BSD-3-clause
+
 Files: src/plugins/platforms/qnx/*
        src/plugins/bearer/blackberry/*
        config.tests/unix/slog2/slog2.cpp
@@ -287,6 +307,27 @@ Copyright: 2002-2010 The ANGLE Project Authors.
            2002 NVIDIA Corporation
 License: BSD-3-clause
 
+Files: src/3rdparty/forkfd/*
+Copyright: 2014 Intel Corporation
+           2015 Klarälvdalens Datakonsult AB, a KDAB Group company, info at kdab.com
+License: MIT
+
+Files: src/3rdparty/xkbcommon/*
+Copyright: 2012 Ran Benita <ran234 at gmail.com>
+           2009 Dan Nicholson
+           2012 Intel Corporation
+           2006 Erdal Ronahî
+           2004 Gregory Mokhin <mokhin at bog.msu.ru>
+           2003-2004 Dmitry Golubev <lastguru at mail.ru>
+           1988 Digital Equipment Corporation, Maynard, Massachusetts.
+           1987-1998  The Open Group
+           1991 Oracle and/or its affiliates.
+           2012 Daniel Stone
+           1993 by Silicon Graphics Computer Systems, Inc.
+           2011 Joseph Adams <joeyadams3.14159 at gmail.com>
+           1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
+License: MIT
+
 Files: src/3rdparty/iaccessible2/idl/*
 Copyright: 2006 IBM Corporation
 License: BSD-3-clause
@@ -507,7 +548,7 @@ Copyright: 1998-2005 David Turner
            2000-2007 Red Hat, Inc
            2006 Behdad Esfahbod
            2008-2012 Nokia Corporation and/or its subsidiary(-ies)
-           2012-2013 Digia Plc and/or its subsidiary(-ies)
+           2012-2013 The Qt Company Ltd.
 License: Harfbuzz
  Permission is hereby granted, without written agreement and without
  license or royalty fees, to use, copy, modify, and distribute this
@@ -565,6 +606,14 @@ Copyright: 2001-2002 Francesco Zappa Nardelli
            2000 Computing Research Labs, New Mexico State University
 License: MIT
 
+Files: src/3rdparty/freetype/src/tools/ftrandom/ftrandom.c
+       src/3rdparty/freebsd/strtoull.c
+       src/3rdparty/freebsd/strtoll.c
+Copyright: 1992-1993 The Regents of the University of California
+           2011 The FreeBSD Foundation
+           2005, 2007, 2008, 2013 George Williams
+License: BSD-3-clause
+
 License: MIT
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and associated documentation files (the "Software"),
@@ -701,6 +750,10 @@ Copyright: -
 License: public-domain
  placed in the public domain
 
+Files: src/3rdparty/android/extract.h
+Copyright: 2005 The Android Open Source Project
+License: Apache-2.0
+
 Files: src/3rdparty/pcre/*
 Copyright: 1997-2012 University of Cambridge
            2007-2012 Google Inc.
@@ -1050,11 +1103,11 @@ License: FTL
     Werner Lemberg    <werner.lemberg at freetype.org>
 
 Files: *.qdoc
-Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
+Copyright: 2012 The Qt Company Ltd.
 License: GFDL-1.3
 
 Files: src/printsupport/kernel/qprinterinfo.cpp
-Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
+Copyright: 2012 The Qt Company Ltd.
 License: GFDL-1.3
 
 License: GFDL-1.3
@@ -1083,4 +1136,20 @@ License: Expat
  .
  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.
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+
+License: Apache-2.0
+  Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+     http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the complete text of the Apache License 2.0 can
+ be found in "/usr/share/common-licenses/Apache-2.0"

-- 
qtbase packaging

