[SCM] qtdeclarative packaging branch, master, updated. 082674768e7c338c38113a3935b4822fcce8c9b1
Lisandro Damián Nicanor Pérez
lisandro at alioth.debian.org
Sun Apr 21 20:12:02 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=commitdiff;h=0826747
The following commit has been merged in the master branch:
commit 082674768e7c338c38113a3935b4822fcce8c9b1
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Sun Apr 21 17:11:35 2013 -0300
Tidy up debian/copyright (a little).
---
debian/copyright | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index 953b774..51b2cb1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -91,11 +91,12 @@ 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/* 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
+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
-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
+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
@@ -116,7 +117,7 @@ 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
+ 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
--
qtdeclarative packaging
More information about the pkg-kde-commits
mailing list