# HG changeset patch
# User Bernhard Reiter <bernhard@intevation.de>
# Date 1411550234 -7200
# Node ID 5f59344dbd13161120382ab5d0823e037ce9eb93
# Parent  bebbbc956cf348e89c767be070aba83e75a14a9b
(issue68) License corrections:
* the overall package is GNU GPL v==3.
* Qt has to be used as GNU GPL, so mention it.
* Oxygen is GNU LGPL v>=3.
* minor corrections like typos, better phrasing for freedom protection, use GNU consistently.

diff -r bebbbc956cf3 -r 5f59344dbd13 README
--- a/README	Wed Sep 24 11:03:00 2014 +0200
+++ b/README	Wed Sep 24 11:17:14 2014 +0200
@@ -41,10 +41,10 @@
 
 License
 -------
-The TrustBridge source code is licensed under GPL v>=2.
+The TrustBridge source code is licensed under GNU GPL v>=2.
 
 The full TrustBridge software package (with all integrated Free
-Software components) is licensed under GNU GPL v>=3.
+Software components) is licensed under GNU GPL v==3.
 
 See licenses/README.txt for more information.
 
diff -r bebbbc956cf3 -r 5f59344dbd13 licenses/README.txt
--- a/licenses/README.txt	Wed Sep 24 11:03:00 2014 +0200
+++ b/licenses/README.txt	Wed Sep 24 11:17:14 2014 +0200
@@ -1,29 +1,30 @@
 License of TrustBridge and their used Free Software components
 ==============================================================
 
-The TrustBridge source code is licensed under GPL v>=2.
+The TrustBridge source code itself is licensed under GNU GPL v>=2.
 
-The most restrictive requirements of all used packages (see below) and
-their licenses is the GPL v==3. Thus:
+Additional software components are need to build the resulting binaries,
+which are all Free Software. Their licenses are all compatible 
+under the GNU GPL v==3. Thus:
 
 +++ The TrustBridge software package (with client and administrator
     application and all integrated components) is licensed under
-    GNU GPL v>=3 (see GPLv3.txt). +++
+    GNU GPL v==3 (see GPLv3.txt). +++
 
 
 TrustBridge integrates the following Free Software components:
 
     - Qt
       URL: http://qt-project.org
-      License: LGPL v==2.1
+      License: GNU LGPL v==2.1 or GNU GPL v==3
 
     - PolarSSL
       URL: https://polarssl.org
-      License: GPL v>=2
+      License: GNU GPL v>=2
 
     - Oxygen-Icons
       URL: http://www.oxygen-icons.org
-      Lizenz: LGPL v==3
+      Lizenz: GNU LGPL v>=3
 
     - Mozilla NSS
       URL: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS
@@ -38,15 +39,15 @@
 
     - Qt
       URL: http://qt-project.org
-      License: LGPL v==2.1
+      License: GNU LGPL v==2.1 or GNU GPL v==3
 
     - PolarSSL
       URL: https://polarssl.org
-      License: GPL v>=2
+      License: GNU GPL v>=2
 
     - Oxygen-Icons
       URL: http://www.oxygen-icons.org
-      Lizenz: LGPL v==3
+      Lizenz: GNU LGPL v>=3
 
     - OpenSSL-based signcode utility
       URL: http://osslsigncode.sourceforge.net
@@ -58,7 +59,7 @@
 
     - NSIS
       URL: http://nsis.sourceforge.net
-      Licsense: zlib/libpng license and Common Public License version 1.0
+      License: zlib/libpng license and Common Public License version 1.0
       (only LZMA compression module)
   
 
@@ -68,19 +69,19 @@
 
 Qt
 ==
-    Licsense: GPL v==3
-    (see GPLv3.txt)    
+    License: GNU LGPL v==2 or GNU GPL v==3
+    (see LGPLv2.txt or GPLv3.txt)
 
 
 PolarSSL
 ========
-    Licsense: GPL v>=2
+    License: GPL v>=2
     (see GPLv2.txt)
 
 
 Oxygen-Icons
 ============
-    Licsene: LGPL v==3
+    License: LGPL v>=3
     (see LGPLv3.txt)
 
 
@@ -183,7 +184,7 @@
 
 NSIS
 ====
-    Licsense: 
+    License:
     * zlib/libpng license and 
     * Common Public License version 1.0 (only LZMA compression module)
 
diff -r bebbbc956cf3 -r 5f59344dbd13 ui/aboutdialog.cpp
--- a/ui/aboutdialog.cpp	Wed Sep 24 11:03:00 2014 +0200
+++ b/ui/aboutdialog.cpp	Wed Sep 24 11:17:14 2014 +0200
@@ -51,17 +51,17 @@
         " <a href=\"http://www.dn-systems.de\">DN-Systems GmbH</a>, <br>"
         " contracted by the BSI.<br/><br/>") +
     tr("TrustBridge is Free Software licensed"
-        " under GNU GPL v>=3.<br/>Copyright (C) 2014 by Bundesamt für Sicherheit"
+        " under GNU GPL v==3.<br/>Copyright (C) 2014 by Bundesamt für Sicherheit"
         " in der Informationstechnik<br/><br/>") +
     tr("TrustBridge Administrator uses several Free Software components with different licenses:") +
-	"<ul><li>TrustBridge source code (GPL v>=2)" +
-	"<li>Qt (LGPL v==2.1)" +
-	"<li>PolarSSL (GPL v>=2)" +
-	"<li>Oxygen-Icons (LGPL v==3)" +
-	"<li>OpenSSL-based signcode utility (GPL v==3)" +
+	"<ul><li>TrustBridge source code (GNU GPL v>=2)" +
+	"<li>Qt (GNU LGPL v==2.1 | GNU GPL v==3)" +
+	"<li>PolarSSL (GNU GPL v>=2)" +
+	"<li>Oxygen-Icons (GNU LGPL v>=3)" +
+	"<li>OpenSSL-based signcode utility (GNU GPL v==3)" +
 	"<li>OpenSSL (OpenSSL License)" +
 	"<li>NSIS (zlib/libpng license & Common Public License version 1.0)</ul>" +
-    tr("Read more about the license information in the 'licenses' directory in the "
+    tr("You will find the legally binding details in the 'licenses' directory of the "
        "<a href=\"https://wald.intevation.org/hg/trustbridge/file/tip/licenses\">TrustBridge code repository</a>."));
 
     textDesc->setTextFormat(Qt::RichText);