[SCM] qtdeclarative packaging branch, master, updated. 33d7cb39d0e643fd507e7394d0b7913c9899154a

Thu Mar 21 06:38:23 UTC 2013

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

The following commit has been merged in the master branch:
commit 06cadbc961a22c0aa3cbceebe69678f69138f7ab
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Thu Mar 21 06:31:15 2013 +0000

    Update debian/copyright
---
 debian/copyright |   73 ++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 68 insertions(+), 5 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index b06fd51..0930ff8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,7 +15,19 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
            2007-2009 Ana Beatriz Guerrero Lopez <ana at debian.org>
            2005-2007 Brian Nelson <pyro at debian.org>
            2012-2013 Timo Jyrinki <timo.jyrinki at canonical.com>
-License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
+License: LGPL-2.1
+
+License: LGPL-2.1
+ GNU Lesser General Public License version 2.1:
+ 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.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ can be found in `/usr/share/common-licenses/LGPL-2.1`.
 
 License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
  GNU Lesser General Public License version 2.1:
@@ -79,10 +91,8 @@ 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: examples/*
-Copyright: 2012-2013 Digia Plc and/or its subsidiary(-ies)
-           2008-2012 Nokia Corporation and/or its subsidiary(-ies)
-           1994-2008 Trolltech ASA.
+Files: examples/* src/qml/doc/snippets/* src/quick/doc/snippets/* tests/auto/qmltest/listview/tst_listview.qml tests/auto/qmltest/listview/tst_listview.qml tests/auto/qmltest/image/tst_image.qml tests/auto/qmltest/image/tst_image.qml tests/auto/qmltest/text/tst_text.qml tests/auto/qmltest/text/tst_text.qml tests/auto/qmltest/animatedimage/tst_animatedimage.qml tests/auto/qmltest/animatedimage/tst_animatedimage.qml tests/auto/qmltest/gradient/tst_gradient.qml tests/auto/qmltest/gradient/tst_gradient.qml tests/auto/qmltest/textinput/tst_textinput.qml tests/auto/qmltest/textinput/tst_textinput.qml tests/auto/qmltest/rectangle/tst_rectangle.qml tests/auto/qmltest/rectangle/tst_rectangle.qml tests/auto/qmltest/textedit/tst_textedit.qml tests/auto/qmltest/textedit/tst_textedit.qml tests/auto/qmltest/listmodel/tst_listmodel.qml tests/auto/qmltest/listmodel/tst_listmodel.qml tests/auto/qmltest/fontloader/tst_fontloader.qml tests/auto/qmltest/fontloader/tst_fontloader.qml tests/benchmarks/qml/holistic/data/largeTargets/gridview-example.qml tests/benchmarks/qml/holistic/data/largeTargets/gridview-example.qml tests/benchmarks/qml/holistic/data/largeTargets/mousearea-example.qml tests/benchmarks/qml/holistic/data/largeTargets/mousearea-example.qml tests/benchmarks/qml/holistic/data/largeTargets/layoutdirection.qml tests/benchmarks/qml/holistic/data/largeTargets/layoutdirection.qml tests/testapplications/listview/sections.qml tests/testapplications/listview/sections.qml tests/testapplications/listview/onRemove.qml tests/testapplications/listview/onRemove.qml tests/testapplications/listview/alteredViews.qml tests/testapplications/listview/alteredViews.qml tests/testapplications/listview/viewTransitions.qml tests/testapplications/listview/viewTransitions.qml tests/testapplications/animatedsprite/animatedsprite.qml tests/testapplications/animatedsprite/animatedsprite.qml tests/testapplications/animatedsprite/animatedspriteadvance.qml tests/testapplications/animatedsprite/animatedspriteadvance.qml
+Copyright: 2012 Digia Plc and/or its subsidiary(-ies)
 License: BSD-3-clause
  You may use this file under the terms of the BSD license as follows:
  .
@@ -111,3 +121,56 @@ License: BSD-3-clause
  (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: examples/quick/customitems/painteditem/TextBalloonPlugin/plugin.h examples/quick/customitems/painteditem/textballoon.cpp examples/quick/customitems/painteditem/textballoon.h examples/quick/scenegraph/customgeometry/beziercurve.cpp examples/quick/scenegraph/customgeometry/beziercurve.h examples/quick/scenegraph/customgeometry/main.cpp examples/quick/scenegraph/openglunderqml/squircle.cpp examples/quick/scenegraph/openglunderqml/squircle.h examples/quick/scenegraph/openglunderqml/main.cpp examples/quick/scenegraph/simplematerial/simplematerial.cpp examples/qmltest/qmltest/tst_qmltest.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: examples/quick/demos/stocqt/content/CheckBox.qml examples/quick/demos/samegame/settings.js examples/quick/demos/samegame/content/SamegameText.qml
+Copyright: 2012 Research In Motion
+License: BSD-3-clause
+
+Files: tests/auto/qml/qqmlnotifier/tst_qqmlnotifier.cpp benchmarks/qml/qquickwindow/tst_qquickwindow.cpp
+Copyright: 2012 Research In Motion
+License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
+
+Files: test/auto/qml/parserstress/tests/*
+Copyright: 1998-2003 Netscape Communications Corporation
+           2005-2007 Mozilla Foundation
+License: LGPL-2.1
+
+Files: src/qml/qml/qqmllocale.cpp
+Copyright: 1991 AT&T
+           2012 Digia Plc and/or its subsidiary(-ies).
+License: Mixed LGPL-2.1 and BSD
+ A portion of the file is LGPL-2.1 with Digia Qt LGPL Exception 1.1 or 
+ GPL-3. A portion is however BSD licensed:
+ .
+ Permission to use, copy, modify, and distribute this software for any
+ purpose without fee is hereby granted, provided that this entire notice
+ is included in all copies of any software which is or includes a copy
+ or modification of this software and in all copies of the supporting
+ documentation for such software.
+ .
+ THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
+ WARRANTY.  IN PARTICULAR, NEITHER THE AUTHOR NOR AT&T MAKES ANY
+ REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
+ OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
+ .
+ This product includes software developed by the University of
+ California, Berkeley and its contributors.
+
+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`,

-- 
qtdeclarative packaging

