[PATCH 3 of 5] Merged

[Wald Commits]

# HG changeset patch
# User Emanuel Schuetze <emanuel at intevation.de>
# Date 1411566752 -7200
# Node ID 5839d864239c369f2d9df564b239f586751e31f9
# Parent  4a329513ee862b1fc8f7f25fb58beb2fd492c5f0
# Parent  6154d554b3af319956b68de933d4430624f8bc56
Merged.

diff -r 4a329513ee86 -r 5839d864239c packaging/linux-installer.inc
--- a/packaging/linux-installer.inc	Wed Sep 24 15:52:08 2014 +0200
+++ b/packaging/linux-installer.inc	Wed Sep 24 15:52:32 2014 +0200
@@ -43,7 +43,10 @@
 #
 # This file is Free Software under the GNU GPL (v>=2)
 # and comes with ABSOLUTELY NO WARRANTY!
-# See LICENSE.txt for details.
+# For details and the license of TrustBridge
+# see the folder "licenses" after installation
+# check the corresponding revision of it online at
+# https://wald.intevation.org/hg/trustbridge/file/tip/licenses
 
 set -u
 
diff -r 4a329513ee86 -r 5839d864239c ui/aboutdialog.cpp
--- a/ui/aboutdialog.cpp	Wed Sep 24 15:52:08 2014 +0200
+++ b/ui/aboutdialog.cpp	Wed Sep 24 15:52:32 2014 +0200
@@ -61,7 +61,9 @@
 	"<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("You will find the legally binding details in the 'licenses' directory of the "
+    tr("You will find the legally binding details in the 'licenses' directory "
+       "where TrustBridge is installed "
+       "or in the corresponding revision of the"
        "<a href=\"https://wald.intevation.org/hg/trustbridge/file/tip/licenses\">TrustBridge code repository</a>."));
 
     textDesc->setTextFormat(Qt::RichText);