[qmapshack] 01/01: Another copyright improvement.

[Jaromír Mikeš]

This is an automated email from the git hooks/post-receive script.

mira-guest pushed a commit to branch master
in repository qmapshack.

commit 2129bb2fe2d389f527ba703f62004e75e580d84c
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Mon Aug 18 20:38:55 2014 +0200

    Another copyright improvement.
---
 debian/copyright | 61 +++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 40 insertions(+), 21 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 959a26c..fb9d787 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -67,7 +67,7 @@ License: Public Domain
 Files: src/helpers/CTextEditWidget.cpp
  src/helpers/CTextEditWidget.h
 Copyright: 2012, Digia Plc and/or its subsidiary(-ies)
-License: GPL-3.0+ or LGPL-2.1 with Digia Qt LGPL Exception 1.1
+License: QT-Commercial or GPL-3.0 or LGPL-2.1 with Digia Qt LGPL Exception 1.1
 
 License: GPL-3.0+
  This program is free software: you can redistribute it and/or modify
@@ -163,33 +163,38 @@ License: WTFPL-2
  .
  see <http://www.wtfpl.net/>.
 
+License: QT-Commercial
+ Commercial License Usage
+ Licensees holding valid commercial Qt licenses may use this file in
+ accordance with the commercial license agreement provided with the
+ Software or, alternatively, in accordance with the terms contained in
+ a written agreement between you and Digia. For licensing terms and
+ conditions see http://qt.digia.com/licensing. For further information
+ use the contact form at http://qt.digia.com/contact-us.
+
 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
- 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.
+ Alternatively, 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.
  .
  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`.
- .
- Digia Qt LGPL Exception version 1.1:
+ Digia Qt LGPL Exception version 1.1
  As an additional permission to the GNU Lesser General Public License version
  2.1, the object code form of a "work that uses the Library" may incorporate
- material from a header file that is part of the Library.  You may distribute
+ material from a header file that is part of the Library. You may distribute
  such object code under terms of your choice, provided that:
-     (i)   the header files of the Library have not been modified; and
-     (ii)  the incorporated material is limited to numerical parameters, data
-           structure layouts, accessors, macros, inline functions and
-           templates; and
-     (iii) you comply with the terms of Section 6 of the GNU Lesser General
-           Public License version 2.1.
+ (i) the header files of the Library have not been modified; and
+ (ii) the incorporated material is limited to numerical parameters, data
+ structure layouts, accessors, macros, inline functions and
+ templates; and
+ (iii) you comply with the terms of Section 6 of the GNU Lesser General
+ Public License version 2.1.
  .
  Moreover, you may apply this exception to a modified version of the Library,
  provided that such modification does not involve copying material from the
@@ -205,7 +210,21 @@ License: Public Domain
  Released to Public Domain
  .
  You are free:
- .
  To use this work for any legal purpose.
- --------------------------------------------
+ .
  see <http://www.rw-designer.com/licenses>.
+
+License: GPL-3.0
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 3 as published
+ by the Free Software Foundation.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+Comment: You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-3'.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git