[SCM] qtlocation packaging branch, master, updated. 88b66f27ef91dc91aa6dc7002e33389155930d90

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit be2bbbb166e0f13228971074b2f5af83f594c6dc
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Feb 26 23:24:29 2014 -0300

    Put files listing above.
    
    Also use NIV for the GFDL.
---
 debian/copyright | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 1abcfc6..8986702 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,6 +8,18 @@ Copyright: 2012-2013 Digia Plc and/or its subsidiary(-ies)
            1994-2008 Trolltech ASA.
 License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
 
+Files: examples/* doc/src/snippets/* tests/applications/declarative_map/*
+Copyright: 2012 Digia Plc and/or its subsidiary(-ies)
+License: BSD-3-clause
+
+Files: src/3rdparty/poly2tri/*
+Copyright: 2009-2010, Poly2Tri Contributors
+License: BSD-3-clause
+
+Files: *.qdoc
+Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
+License: GFDL-NIV-1.3
+
 Files: debian/*
 Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
            2007-2012 Sune Vuorela <debian at pusling.com>
@@ -84,14 +96,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/* doc/src/snippets/* tests/applications/declarative_map/*
-Copyright: 2012 Digia Plc and/or its subsidiary(-ies)
-License: BSD-3-clause
-
-Files: src/3rdparty/poly2tri/*
-Copyright: 2009-2010, Poly2Tri Contributors
-License: BSD-3-clause
-
 License: BSD-3-clause
  You may use this file under the terms of the BSD license as follows:
  .
@@ -120,11 +124,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: *.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

-- 
qtlocation packaging