[SCM] qtquickcontrols packaging branch, master, updated. 597d417dbc842ce6cb262036f6e11bbb4dd6db78

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 597d417dbc842ce6cb262036f6e11bbb4dd6db78
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Aug 23 15:39:51 2013 -0300

    Simplify debian/copyright.
---
 debian/changelog |    1 +
 debian/copyright |   28 +++++++++++++++-------------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 939c731..c722664 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtquickcontrols-opensource-src (5.1.0-2) UNRELEASED; urgency=low
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Add missing copyright holder.
+  * Simplify debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 23 Aug 2013 15:36:05 -0300
 
diff --git a/debian/copyright b/debian/copyright
index b4c5897..16e6a60 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -17,6 +17,20 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
            2013 Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
 License: LGPL-2.1
 
+Files: examples/*
+       src/quickcontrols/doc/snippets/*
+Copyright: 2012-2013 Digia Plc and/or its subsidiary(-ies)
+License: BSD-3-clause
+
+Files: src/quickcontrols/parser/qquerytransformparser.cpp
+Copyright: 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc
+           2012 Digia Plc and/or its subsidiary(-ies).
+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
@@ -79,9 +93,6 @@ 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/quickcontrols/doc/snippets/*
-Copyright: 2012-2013 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:
  .
@@ -110,16 +121,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: src/quickcontrols/parser/qquerytransformparser.cpp
-Copyright: 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc
-           2012 Digia Plc and/or its subsidiary(-ies).
-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

-- 
qtquickcontrols packaging