From acff0b1b63a56c01ebc573a7062dd151fc43791c Mon Sep 17 00:00:00 2001
From: timlinux <timlinux@c8812cc2-4d05-0410-92ff-de0c093fc19c>
Date: Wed, 30 Mar 2011 13:27:32 +0000
Subject: [PATCH] nsi updates: commented out reboot which causes nsis to fail
 for me. Updated quickpackage to set version name to 1.7

git-svn-id: http://svn.osgeo.org/qgis/trunk@15642 c8812cc2-4d05-0410-92ff-de0c093fc19c
---
 ms-windows/QGIS-Installer.nsi | 2 +-
 ms-windows/quickpackage.sh    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ms-windows/QGIS-Installer.nsi b/ms-windows/QGIS-Installer.nsi
index ccc42c6c7d4..3bd3ddd226f 100644
--- a/ms-windows/QGIS-Installer.nsi
+++ b/ms-windows/QGIS-Installer.nsi
@@ -427,7 +427,7 @@ Section "Quantum GIS" SecQGIS
 	nsExec::ExecToLog '"$0" /c "$INSTALL_DIR\postinstall.bat"'
 
 !if ${INSTALLER_TYPE} == "OSGeo4W"
-	IfFileExists "$INSTALL_DIR\etc\reboot" SetRebootFlag true
+	;IfFileExists "$INSTALL_DIR\etc\reboot" SetRebootFlag true
 
         Delete "$DESKTOP\Quantum GIS (${VERSION_NUMBER}).lnk"
         CreateShortCut "$DESKTOP\Quantum GIS (${VERSION_NUMBER}).lnk" "$INSTALL_DIR\bin\nircmd.exe" 'exec hide "$INSTALL_DIR\bin\qgis.bat"' \
diff --git a/ms-windows/quickpackage.sh b/ms-windows/quickpackage.sh
index 8368aca01f6..ea325ae5527 100755
--- a/ms-windows/quickpackage.sh
+++ b/ms-windows/quickpackage.sh
@@ -12,12 +12,12 @@
 # Tim Sutton November 2010
 
 makensis \
--DVERSION_NUMBER='1.6.0' \
--DVERSION_NAME='Copiapo' \
+-DVERSION_NUMBER='1.7.0' \
+-DVERSION_NAME='Wroclaw' \
 -DSVN_REVISION='0' \
 -DQGIS_BASE='Quantum GIS' \
--DINSTALLER_NAME='QGIS-1-6-0-Setup.exe' \
--DDISPLAYED_NAME='Quantum GIS 1.6.0' \
+-DINSTALLER_NAME='QGIS-1-7-0-Setup.exe' \
+-DDISPLAYED_NAME='Quantum GIS 1.7.0' \
 -DBINARY_REVISION=1 \
 -DINSTALLER_TYPE=OSGeo4W \
 -DPACKAGE_FOLDER=osgeo4w/unpacked \