summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>2014-05-22 01:07:46 -0300
committerLisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>2014-05-22 01:07:46 -0300
commitfa313077a42a5819a709033b6d94525d7b7558f1 (patch)
tree1aa75e3a91c3bc38290f2212f1ecc2e13f729522
parent9bdad2b56d3859cb14ab6cd30b18bf81cfec2a7a (diff)
downloadqtdeclarative-fa313077a42a5819a709033b6d94525d7b7558f1.tar.gz
Update debian/copyright.
-rw-r--r--debian/changelog1
-rw-r--r--debian/copyright17
2 files changed, 15 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index d46f043..ab5e8f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtdeclarative-opensource-src (5.3.0-2) UNRELEASED; urgency=medium
* qml-model-qtqml-models2 should have been named qml-module-qtqml-models2.
Create qml-module-qtqml-models2 and make qml-model-qtqml-models2 a
transitional dummy package.
+ * Update debian/copyright.
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 22 May 2014 00:43:29 -0300
diff --git a/debian/copyright b/debian/copyright
index c9b99c2..6c83dad 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -92,15 +92,20 @@ Files: examples/*
Copyright: 2012 Digia Plc and/or its subsidiary(-ies)
License: BSD-3-clause
-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)
+Files: examples/quick/customitems/painteditem/TextBalloonPlugin/plugin.h
+ examples/quick/customitems/painteditem/textballoon.cpp
+ examples/quick/customitems/painteditem/textballoon.h
+ examples/quick/scenegraph/*
+Copyright: 2012-2014 Digia Plc and/or its subsidiary(-ies)
+ 2013 Jolla Ltd.
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
+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
@@ -130,6 +135,12 @@ License: Mixed LGPL-2.1 and BSD
This product includes software developed by the University of
California, Berkeley and its contributors.
+Files: src/qml/animations/*
+ tests/auto/quick/qquickanimations/*
+Copyright: 2014 Jolla Ltd.
+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-NIV-1.3