[SCM] qtxmlpatterns packaging branch, master, updated. 47cf7c38537b29ac0ca0a2d50a53c1c08c7a2c77

[Timo Jyrinki]

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

The following commit has been merged in the master branch:
commit 47cf7c38537b29ac0ca0a2d50a53c1c08c7a2c77
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Mar 4 13:49:59 2013 +0000

    debian/copyright: fixes
---
 debian/copyright |   29 +++++++++++++++++++++++------
 1 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 3a1c181..b734bab 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,8 +4,6 @@ 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.
 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/*
+Files: examples/* src/xmlpatterns/doc/snippets/*
 Copyright: 2012-2013 Digia Plc and/or its subsidiary(-ies)
-           2008-2012 Nokia Corporation and/or its subsidiary(-ies)
-           1994-2008 Trolltech ASA.
 License: BSD-3-clause
  You may use this file under the terms of the BSD license as follows:
  .
@@ -111,3 +107,24 @@ 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/xmlpatterns/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
+ 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`,
+

-- 
qtxmlpatterns packaging