[SCM] qtquick1 packaging branch, master, updated. 48c98d9283dea22c5424ece7b0afdb7b2b7f9cc2

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 48c98d9283dea22c5424ece7b0afdb7b2b7f9cc2
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sun Jun 2 10:25:25 2013 -0300

    Files above, GFDL is NIV.
---
 debian/copyright |   46 +++++++++++++++++++++++-----------------------
 1 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 9cfa1aa..d2868f9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,6 +15,28 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
            2012-2013 Timo Jyrinki <timo.jyrinki at canonical.com>
 License: LGPL-2.1
 
+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-NIV-1.3
+
 License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
  GNU Lesser General Public License version 2.1:
  This file may be used under the terms of the GNU Lesser General Public
@@ -107,29 +129,7 @@ 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
+License: GFDL-NIV-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

-- 
qtquick1 packaging