[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.3.2-4-13-gee225aa

Dmitry Shachnev mitya57 at moszumanska.debian.org
Tue Dec 16 17:00:47 UTC 2014


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

The following commit has been merged in the experimental branch:
commit ee225aaeb77fd478f9bf40958cf99046452d5cc1
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Dec 16 20:00:29 2014 +0300

    More copyright updates.
---
 debian/copyright | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index f49716b..99e5e7c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -51,43 +51,23 @@ 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
@@ -101,17 +81,16 @@ Copyright: 2012-2014 Digia Plc and/or its subsidiary(-ies)
 License: LGPL-2.1-or-3 with Digia-1.1 exception 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
+ tests/benchmarks/qml/qquickwindow/tst_qquickwindow.cpp
 Copyright: 2012 Research In Motion
 License: LGPL-2.1-or-3 with Digia-1.1 exception or GPL-3
 
-Files: test/auto/qml/parserstress/tests/*
+Files: tests/auto/qml/parserstress/tests/*
 Copyright: 1998-2003 Netscape Communications Corporation
            2005-2007 Mozilla Foundation
 License: LGPL-2.1
@@ -119,7 +98,7 @@ 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
+License: custom-qqmllocale
  A portion of the file is LGPL-2.1-or-3 with Digia-1.1 exception or
  GPL-3. A portion is however BSD licensed:
  .

-- 
qtdeclarative packaging



More information about the pkg-kde-commits mailing list