[PATCH 2 of 2] Merge

[Wald Commits]

# HG changeset patch
# User Andre Heinecke <andre.heinecke at intevation.de>
# Date 1406734605 -7200
# Node ID 08065bb5de7cb557a408425eb68684d847fc1fe2
# Parent  5a4fc27db446ff628746f031cce34c589b93eaf8
# Parent  637948e9e32d0091a5df842228637590a48dbfcd
Merge

diff -r 5a4fc27db446 -r 08065bb5de7c packaging/create-dist-package.sh.in
--- a/packaging/create-dist-package.sh.in	Wed Jul 30 17:00:03 2014 +0200
+++ b/packaging/create-dist-package.sh.in	Wed Jul 30 17:36:45 2014 +0200
@@ -27,7 +27,7 @@
 echo "version_number=@PROJECT_VERSION@" >>  $TMPDIR/meta.ini
 echo "setupname=%1TrustBridge- at PROJECT_VERSION@.exe" >> $TMPDIR/meta.ini
 echo "productname=TrustBridge" >> $TMPDIR/meta.ini
-echo "info_url=https://wald.intevation.org/projects/trustbridge/" >> $TMPDIR/meta.ini
+echo "info_url=http://wald.intevation.org/projects/trustbridge/" >> $TMPDIR/meta.ini
 echo "productname_short=TrustBridge" >> $TMPDIR/meta.ini
 echo "description=TrustBridge" >> $TMPDIR/meta.ini
 echo "size=$EST_SIZE" >> $TMPDIR/meta.ini
@@ -39,7 +39,7 @@
     -Dsetupname="$TMPDIR/TrustBridge- at PROJECT_VERSION@-uni.exe" \
     -Dproductname="TrustBridge" \
     -Dpath_sep="/" \
-    -Dinfo_url="https://wald.intevation.org/projects/trustbridge/" \
+    -Dinfo_url="http://wald.intevation.org/projects/trustbridge/" \
     -Dsize=$EST_SIZE \
     -DWRITE_UNINSTALLER \
     -Dproductname_short="TrustBridge" @CMAKE_SOURCE_DIR@/packaging/trustbridge.nsi
diff -r 5a4fc27db446 -r 08065bb5de7c packaging/tmp-createpackage.sh.in
--- a/packaging/tmp-createpackage.sh.in	Wed Jul 30 17:00:03 2014 +0200
+++ b/packaging/tmp-createpackage.sh.in	Wed Jul 30 17:36:45 2014 +0200
@@ -25,7 +25,7 @@
     -Dsetupname="@CMAKE_BINARY_DIR@/TrustBridge- at PROJECT_VERSION@.exe" \
     -Dproductname="TrustBridge" \
     -Dpath_sep="/" \
-    -Dinfo_url="https://wald.intevation.org/projects/trustbridge/" \
+    -Dinfo_url="http://wald.intevation.org/projects/trustbridge/" \
     -Dsize=$EST_SIZE \
     -Dproductname_short="TrustBridge" @CMAKE_SOURCE_DIR@/packaging/trustbridge.nsi
 rm -r $TMPDIR
diff -r 5a4fc27db446 -r 08065bb5de7c ui/createinstallerdialog.cpp
--- a/ui/createinstallerdialog.cpp	Wed Jul 30 17:00:03 2014 +0200
+++ b/ui/createinstallerdialog.cpp	Wed Jul 30 17:36:45 2014 +0200
@@ -31,7 +31,7 @@
 #define SIGN_HASH "sha256"
 #endif
 #ifndef SIGN_URL
-#define SIGN_URL "https://wald.intevation.org/projects/trustbridge/"
+#define SIGN_URL "http://wald.intevation.org/projects/trustbridge/"
 #endif
 #ifndef SIGN_PUBLISHER
 #define SIGN_PUBLISHER "TrustBridge Test with ümlaut"