[qmapshack] 04/05: Drop separate Files section for CTextEditWidget.{cpp, h}, now GPL-3+ too.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository qmapshack.

commit eeaea8f29b262900d58237fbd8e7eed97545b0d4
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Jul 14 13:32:34 2016 +0200

    Drop separate Files section for CTextEditWidget.{cpp,h}, now GPL-3+ too.
---
 debian/changelog |  1 +
 debian/copyright | 64 --------------------------------------------------------
 2 files changed, 1 insertion(+), 64 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c5d845b..e4c8c99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 qmapshack (1.6.3-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop separate Files section for CTextEditWidget.{cpp,h}, now GPL-3+ too.
 
  -- Bas Couwenberg <sebastic at debian.org>  Thu, 14 Jul 2016 13:26:49 +0200
 
diff --git a/debian/copyright b/debian/copyright
index a5ee41f..642b390 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -48,11 +48,6 @@ License: public-domain
  .
  see <http://www.rw-designer.com/licenses>.
 
-Files: src/widgets/CTextEditWidget.cpp
- src/widgets/CTextEditWidget.h
-Copyright: 2012, Digia Plc and/or its subsidiary(-ies)
-License: QT-Commercial or GPL-3 or LGPL-2.1 with Digia Qt LGPL Exception 1.1
-
 Files: debian/*
 Copyright: 2014, Jaromír Mikeš <mira.mikes at seznam.cz>
 License: GPL-3+
@@ -72,22 +67,6 @@ License: GPL-3+
  version 3 can be found in the file
  `/usr/share/common-licenses/GPL-3'.
 
-License: GPL-3
- 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.
- .
- 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'.
-
 License: GPL-2+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -138,46 +117,3 @@ 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
- 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.
- .
- 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
- 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.
- .
- Moreover, you may apply this exception to a modified version of the Library,
- provided that such modification does not involve copying material from the
- Library into the modified Library's header files unless such material is
- limited to (i) numerical parameters; (ii) data structure layouts;
- (iii) accessors; and (iv) small macros, templates and inline functions of
- five lines or less in length.
- .
- Furthermore, you are not required to apply this additional permission to a
- modified version of the Library.
-

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