# HG changeset patch
# User Andre Heinecke <andre.heinecke@intevation.de>
# Date 1432211456 -7200
# Node ID 508a71328d1f557cfa53d01815c714f221f697e8
# Parent  1129d49b9baf93159fba0b5f2e3b91a1d2ebee4b
Update install / icon documentation

diff -r 1129d49b9baf -r 508a71328d1f INSTALL
--- a/INSTALL	Tue May 19 16:50:44 2015 +0200
+++ b/INSTALL	Thu May 21 14:30:56 2015 +0200
@@ -7,9 +7,9 @@
 Tested development platform: Ubuntu 14.4 amd64.
 
 Build dependencies are:
+
     build-essential cmake libqt5core5a qttools5-dev-tools qt5-default \
-    qtbase-dev qtbase5-dev-tools qttools5-dev inkscape
-
+    qtbase-dev qtbase5-dev-tools qttools5-dev inkscape mercurial
 
 This document expects the following setup for build and installation.
 It is recommended to set a custom installation prefix to avoid root
@@ -19,8 +19,19 @@
     mkdir -p $CUSTOM_PREFIX/bin
     export PATH=$CUSTOM_PREFIX/bin:$PATH
 
+Configure the according Root CA if necessary:
+
+    echo "[web]" >> ~/.hgrc
+    echo "cacerts=~/wald-ca.pem" >>  ~/.hgrc
+    curl https://ssl.intevation.de/Intevation-Root-CA-2010.crt > ~/wald-ca.pem
+
+Checkout retraceit sources:
+
+    hg clone https://wald.intevation.org/hg/retraceit/
+
 Building the Software:
-    cd <PATH_TO_REPO>
+
+    cd retraceit
     mkdir build-native
     cd build-native
     cmake .. -DCMAKE_PREFIX_PATH=$CUSTOM_PREFIX
@@ -34,7 +45,7 @@
 
 Dependencies on the Host system:
 
-    apt-get install git autoconf automake bash bison bzip2 \
+    git autoconf automake bash bison bzip2 \
     cmake flex gettext git g++ intltool \
     libffi-dev libtool libltdl-dev libssl-dev \
     libxml-parser-perl make openssl patch perl \
@@ -57,7 +68,7 @@
 
 Compile the software:
 
-    cd repo
+    cd retraceit
     mkdir build-windows
     cd build-windows
     MXETARGET=$MXEPATH/usr/i686-w64-mingw32.static/
@@ -65,18 +76,26 @@
         -DCMAKE_PREFIX_PATH="$MXETARGET/qt5;$MXETARGET;" \
         -DCMAKE_TOOLCHAIN_FILE="$MXETARGET/share/cmake/mxe-conf.cmake" \
         -DCMAKE_VERBOSE_MAKEFILE=True
+    make
+
+The binary is created under:
+
+    build-windows/src/retraceit.exe
+
+This binary can be compressed with UPX or directly used. Without further
+dependencies.
 
 For MacOSX
 ==========
 Install the usual development tools / xcode.
 
 Define some paths for the build environment:
-export CUSTOM_PREFIX=~/retraceit
 
-export PATH=$CUSTOM_PREFIX/bin:$PATH
-export DYLD_LIBRARY_PATH=$CUSTOM_PREFIX/lib:$DYLD_LIBRARY_PATH
-export PKG_CONFIG_PATH=$CUSTOM_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH
+    export CUSTOM_PREFIX=~/retraceit
 
+    export PATH=$CUSTOM_PREFIX/bin:$PATH
+    export DYLD_LIBRARY_PATH=$CUSTOM_PREFIX/lib:$DYLD_LIBRARY_PATH
+    export PKG_CONFIG_PATH=$CUSTOM_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH
 
 Download qt:
 
@@ -102,6 +121,7 @@
     make install
 
 Download mercurial:
+
     wget https://mercurial.selenic.com/mac/binaries/Mercurial-3.4-py2.7-macosx10.10.zip
     shasum Mercurial-3.4-py2.7-macosx10.10.zip
 
@@ -109,9 +129,10 @@
 
     unzip  Mercurial-3.4-py2.7-macosx10.10.zip
 
-Install the .mpkg 
+Install the .mpkg
 
-Configure to be usable with wald certificate
+Configure to be usable with wald certificate:
+
     echo "[web]" >> ~/.hgrc
     echo "cacerts=~/wald-ca.pem" >>  ~/.hgrc
     curl https://ssl.intevation.de/Intevation-Root-CA-2010.crt > ~/wald-ca.pem
@@ -141,7 +162,8 @@
 The make install will create a retraceit.app in your $CUSTOM_PREFIX directory.
 This is the deployable application bundle
 
-You can now create a distirbution variant
+You can now create a .dmg image for distribution:
+
     mv $CUSTOM_PREFIX/retraceit.app $CUSTOM_PREFIX/RetraceIT.app
     hdiutil create -ov -format UDZO -volname RetraceIT -srcfolder RetraceIT.app \
         -o RetraceIT.dmg -imagekey zlib-level=9
diff -r 1129d49b9baf -r 508a71328d1f src/icons/README.txt
--- a/src/icons/README.txt	Tue May 19 16:50:44 2015 +0200
+++ b/src/icons/README.txt	Thu May 21 14:30:56 2015 +0200
@@ -8,4 +8,8 @@
 Tools: Debian Package: inkscape Version: 0.48.3.1-1.3
  Debian Package: imagemagick Version: 8:6.7.7.10-5+deb7u3
  Debian Package: icnsutils Version 0.8.1-1
+ Debian Pacakge: gimp
 
+The ico file was created with gimp.
+The Macos icon was created with:
+png2icns icon.icons 16_icon.png 32_icon.png 48_icon.png 128_icon.png 256_icon.png