[SCM] qbs packaging branch, master, updated. debian/1.3.3+dfsg-1-3-g4d21d23

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 4d21d23bba4e09b8345eeae8186b107de5bd829c
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Dec 27 20:29:01 2014 +0300

    Update debian/copyright.
---
 debian/changelog |  1 +
 debian/copyright | 37 ++++++++++++++++++++-----------------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 69f1a48..a5aae25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qbs (1.3.3+dfsg-2) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Re-add skip_test.diff, seems to be still needed.
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 27 Dec 2014 20:20:34 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 1fc72ac..2de32e7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,22 +5,22 @@ Files-Excluded: doc/templates/scripts/jquery.js
 
 Files: *
 Copyright: 2014, Digia Plc and/or its subsidiary(-ies)
-License: LGPL-2.1 with Digia-1.1 exception
+License: LGPL-2.1-or-3 with Digia-1.1 exception
 
 Files: src/lib/corelib/jsextensions/domxml.*
 Copyright: 2014, BogDan Vatra <bogdan at kde.org>
-License: LGPL-2.1 with Digia-1.1 exception
+License: LGPL-2.1-or-3 with Digia-1.1 exception
 
 Files: src/plugins/scanner/cpp/*
 Copyright: 2014, Digia Plc and/or its subsidiary(-ies)
            2008, Roberto Raggi <roberto.raggi at gmail.com>
-License: LGPL-2.1 with Digia-1.1 exception and Expat
+License: LGPL-2.1-or-3 with Digia-1.1 exception and Expat
 
 Files: doc/reference/*
        examples/cocoa-touch-application/*
 Copyright: 2014, Digia Plc and/or its subsidiary(-ies)
            2014, Petroules Corporation
-License: LGPL-2.1 with Digia-1.1 exception
+License: LGPL-2.1-or-3 with Digia-1.1 exception
 
 Files: examples/helloworld-*/*
 Copyright: 2014, Digia Plc and/or its subsidiary(-ies)
@@ -28,23 +28,25 @@ License: BSD-3-clause
 
 Files: debian/*
 Copyright: 2014, Dmitry Shachnev <mitya57 at debian.org>
-License: LGPL-2.1
+License: LGPL-2.1+
 
-License: LGPL-2.1 with Digia-1.1 exception
- GNU Lesser General Public License version 2.1:
+License: LGPL-2.1-or-3 with Digia-1.1 exception
+ GNU Lesser General Public License:
  This file may be used under the terms of the GNU Lesser General Public
- License version 2.1 as published by the Free Software Foundation and
- appearing in the file LICENSE.LGPL included in the packaging of this
- file. Please review the following information to ensure the GNU Lesser
- General Public License version 2.1 requirements will be met:
- http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ License version 2.1 or version 3 as published by the Free Software
+ Foundation and appearing in the file LICENSE.LGPLv21 and LICENSE.LGPLv3
+ included in the packaging of this file. Please review the following
+ information to ensure the GNU Lesser General Public License requirements
+ will be met: https://www.gnu.org/licenses/lgpl.html.
  .
  In addition, as a special exception, Digia gives you certain additional
  rights. These rights are described in the Digia Qt LGPL Exception
  version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
  .
- On Debian systems, the complete text of the GNU Lesser General Public License
- can be found in `/usr/share/common-licenses/LGPL-2.1`.
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1`.
+ The complete text of the GNU Lesser General Public License version 3 can be
+ found in `/usr/share/common-licenses/LGPL-3`.
  .
  Digia Qt LGPL Exception version 1.1:
  As an additional permission to the GNU Lesser General Public License version
@@ -68,14 +70,15 @@ License: LGPL-2.1 with Digia-1.1 exception
  Furthermore, you are not required to apply this additional permission to a
  modified version of the Library.
 
-License: LGPL-2.1
+License: LGPL-2.1+
  This file may be used under the terms of the GNU Lesser General Public
- License version 2.1 as published by the Free Software Foundation.
+ License as published by the Free Software Foundation, either version 2.1
+ of the License, or (at your opinion) any later version.
  .
  On Debian systems, the complete text of the GNU Lesser General Public
  License can be found in `/usr/share/common-licenses/LGPL-2.1`.
 
-License: EXPAT
+License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights

-- 
qbs packaging