[PATCH 2 of 2] Merge

[Wald Commits]

# HG changeset patch
# User Emanuel Schuetze <emanuel at intevation.de>
# Date 1406732403 -7200
# Node ID 5a4fc27db446ff628746f031cce34c589b93eaf8
# Parent  ecc6aa4332539007170e8bde7997360188205647
# Parent  57b32e354e862120ed1906902ed36c08579a0383
Merge

diff -r ecc6aa433253 -r 5a4fc27db446 INSTALL
--- a/INSTALL	Wed Jul 30 16:59:48 2014 +0200
+++ b/INSTALL	Wed Jul 30 17:00:03 2014 +0200
@@ -3,7 +3,7 @@
 
 For Debian based GNU / Linux
 ============================
-Tested development platform: Ubuntu 13.10.
+Tested development platform: Ubuntu 14.4.
 
 The following commands build qt5 and polarssl which are dependencies of the Software.
 For build dependencies please refer to the Qt documentation 
@@ -148,3 +148,10 @@
         -DCMAKE_PREFIX_PATH="$MXETARGET/qt5;$MXETARGET;" \
         -DCMAKE_TOOLCHAIN_FILE="$MXETARGET/share/cmake/mxe-conf.cmake" \
         -DCMAKE_VERBOSE_MAKEFILE=True
+
+Runtime Depdendencies
+=====================
+The Admin tool needs some additional software to be able to create installtion
+packages:
+
+    apt-get install nsis wine sharutils
diff -r ecc6aa433253 -r 5a4fc27db446 ui/CMakeLists.txt
--- a/ui/CMakeLists.txt	Wed Jul 30 16:59:48 2014 +0200
+++ b/ui/CMakeLists.txt	Wed Jul 30 17:00:03 2014 +0200
@@ -95,8 +95,7 @@
    set(WINDOWS_EXTRA_LIBS
         -L${_qtpath}
         -lwinspool -lshlwapi -lfreetype -lbz2 -lpng16
-        -lQt5PlatformSupport -lQt5Gui -lcomdlg32 -loleaut32 -limm32
-        -lharfbuzz -lglib-2.0 -lintl -liconv -lwinmm
+        -lQt5PlatformSupport -lQt5Gui -lcomdlg32 -loleaut32 -limm32 -lwinmm
         -lglu32 -lopengl32 -lgdi32 -ljpeg -lpng -lQt5Core -lole32 -lmstask -luuid -lws2_32
         -ladvapi32 -lshell32 -luser32 -lkernel32 -lz -lsicuin -lsicuuc -lsicudt -lpcre16)