This is an automated email from the git hooks/post-receive script. mira-guest pushed a commit to branch master in repository qmapshack.
commit 278fb27d54d25f711ab7dd9915ce1fc0369aadf5 Author: Jaromír Mikeš <mira.mi...@seznam.cz> Date: Sun Aug 17 22:45:29 2014 +0200 Copyright improved again. --- debian/copyright | 67 +++++++++++++++++++++++++++++++------------------------- 1 file changed, 37 insertions(+), 30 deletions(-) diff --git a/debian/copyright b/debian/copyright index 38a75bb..4b9dbcf 100644 --- a/debian/copyright +++ b/debian/copyright @@ -57,12 +57,12 @@ Files: src/animation/* Copyright: *No copyright* -License: WTFPL +License: WTFPL-2 Files: src/helpers/CTextEditWidget.cpp src/helpers/CTextEditWidget.h Copyright: 2012, Digia Plc and/or its subsidiary(-ies) -License: QT_COMMERICIAL or GPL-3 or LGPL-2.1 with Digia Qt LGPL Exception 1.1 +License: QT_COMMERICIAL 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 @@ -140,7 +140,7 @@ Comment: You should have received a copy of the GNU General Public License On Debian systems, the full text of the e Apache License, Version 2.0 can be found in the file `/usr/share/common-licenses/Apache-2.0'. -License: WTFPL +License: WTFPL-2 DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE . Version 2, December 2004 @@ -158,34 +158,41 @@ License: WTFPL . see <http://www.wtfpl.net/>. -License: QT_COMMERICIAL or GPL-3 or LGPL-2.1 with Digia Qt LGPL Exception 1.1 - $QT_BEGIN_LICENSE:LGPL$ - 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. - . - GNU Lesser General Public License Usage - 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. +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. . In addition, as a special exception, Digia gives you certain additional - rights. These rights are described in the Digia Qt LGPL Exception + rights. These rights are described in the Digia Qt LGPL Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this package. . - GNU General Public License Usage - Alternatively, this file may be used under the terms of the GNU - General Public License version 3.0 as published by the Free Software - Foundation and appearing in the file LICENSE.GPL included in the - packaging of this file. Please review the following information to - ensure the GNU General Public License version 3.0 requirements will be - met: http://www.gnu.org/copyleft/gpl.html. - . - $QT_END_LICENSE$ + 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: + 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 _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel