[Pkg-gnupg-commit] [gpgme] 68/412: Qt: Fix license mentioned in README

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch master
in repository gpgme.

commit 11ff8d5964bf66f905818514f6a51fc881ea1a56
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri May 6 14:41:22 2016 +0200

    Qt: Fix license mentioned in README
    
    * lang/qt/README: License is GPLv2+ and not LGPL.
    --
    The only part under lgpl is the QByteArray dataprovider.
---
 lang/qt/README | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/lang/qt/README b/lang/qt/README
index a6b133f..f624f60 100644
--- a/lang/qt/README
+++ b/lang/qt/README
@@ -2,20 +2,30 @@ Qt API bindings/wrapper for gpgme
 ----------------------------------------
 Based on KF5gpgmepp QGpgme and libkleo/backends/qgpgme
 
-QGpgme is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
+QGpgME is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
 
-QGpgme is distributed in the hope that it will be useful,
+QGpgME 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 Library General Public License for more details.
+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 Library General Public License
-along with GPGME++; see the file COPYING.LIB.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+In addition, as a special exception, the copyright holders give
+permission to link the code of this program with any edition of
+the Qt library by Trolltech AS, Norway (or with modified versions
+of Qt that use the same license as Qt), and distribute linked
+combinations including the two.  You must obey the GNU General
+Public License in all respects for all of the code used other than
+Qt.  If you modify this file, you may extend this exception to
+your version of the file, but you are not obligated to do so.  If
+you do not wish to do so, delete this exception statement from
+your version.
 
 Overview
 --------

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