[SCM] qtquick1 packaging branch, master, updated. 19cd5ca1ac52571553a5fde291b164ecc96c3afc

[Timo Jyrinki]

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

The following commit has been merged in the master branch:
commit 18d02cf09c0ed262b84db271d2ceaf80a655dafb
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Fri Apr 19 08:34:03 2013 +0000

    Copyright updates
---
 debian/copyright |   48 +++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 8d0289a..840db53 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,9 @@
 Format: http://dep.debian.net/deps/dep5
 Upstream-Name: qtquick1-opensource-src
-Source: http://releases.qt-project.org/qt5/5.0.0/submodules_tar/
+Source: http://releases.qt-project.org/qt5/5.0.1/submodules_tar/
 
 Files: *
-Copyright: 2012-2013 Digia Plc and/or its subsidiary(-ies)
-           2008-2012 Nokia Corporation and/or its subsidiary(-ies)
-           1994-2008 Trolltech ASA.
+Copyright: 2012 Digia Plc and/or its subsidiary(-ies)
 License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
 
 Files: debian/*
@@ -15,7 +13,7 @@ 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 with Digia Qt LGPL Exception 1.1
  GNU Lesser General Public License version 2.1:
@@ -79,10 +77,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/doc/src/snippets/* src/plugins/platforms/uikit/examples/qmltest/qml/main.qml src/imports/folderlistmodel/plugin.cpp
+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 +107,37 @@ 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/declarative/calculator/main.cpp
+ examples/declarative/calculator/qml/calculator/CalculatorCore/Button.qml
+ examples/declarative/calculator/qml/calculator/CalculatorCore/Display.qml
+ examples/declarative/calculator/qml/calculator/calculator.qml
+ examples/declarative/flickr/*
+ examples/declarative/minehunt/*
+ examples/declarative/photoviewer/*
+ examples/declarative/rssnews/*
+ examples/declarative/samegame/*
+ examples/declarative/snake/*
+ examples/declarative/twitter/*
+Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
+License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
+
+Files: tests/auto/declarative/qdeclarativeimportorder/tst_qdeclarativeimportorder.cpp
+Copyright: 2012 Jolla Mobile
+License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
+
+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`,
+

-- 
qtquick1 packaging