From cd55012be4bcd679dd0323070c80ca8dec147a3a Mon Sep 17 00:00:00 2001
From: Bart Baas <info@baasgeo.com>
Date: Wed, 24 Jun 2015 12:44:03 +0200
Subject: [PATCH 1/2] Update installer for MapProxy version 1.8

---
 SetupMapProxy.nsi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/SetupMapProxy.nsi b/SetupMapProxy.nsi
index 8fce6ab..3752294 100755
--- a/SetupMapProxy.nsi
+++ b/SetupMapProxy.nsi
@@ -21,8 +21,8 @@
 ; Define your application name
 !define APPNAME "MapProxy"
 !define COMPANY "Baas geo-information"
-!define VERSION 1.7.1
-!define SEQ 1
+!define VERSION 1.8.0
+!define SEQ 0
 !define APPNAMEANDVERSION "${APPNAME} ${VERSION}"
 !define GITPAGE "http://github.com/bartbaas/mapproxywindows"
 !define SETTINGSREGPATH "Software\Baasgeo\${APPNAME}"
@@ -32,7 +32,7 @@
 Name "${APPNAMEANDVERSION}"
 BrandingText "${GITPAGE}"
 InstallDir "$PROGRAMFILES\${APPNAME}-${VERSION}"
-OutFile "${APPNAME}-${VERSION}.${SEQ}.exe"
+OutFile "${APPNAME}-${VERSION}-RC1.exe"
 
 ; Compression options
 CRCCheck on
@@ -524,7 +524,7 @@ Section "Main" SectionMain
   File /r PortablePython\App
   
   ; Install mapproxy
-  nsExec::ExecToLog '"$INSTDIR\App\Scripts\easy_install.exe" -f "eggs" mapproxy==${VERSION} Shapely==1.2.17 pyproj==1.9.3 cherrypy==3.5.0'
+  nsExec::ExecToLog '"$INSTDIR\App\Scripts\easy_install.exe" -f "eggs" mapproxy==${VERSION} Shapely==1.2.17 pyproj==1.9.3 cherrypy==3.7.0'
   nsExec::ExecToLog '"$INSTDIR\App\Scripts\mapproxy-util.exe" --version'
   ${If} $IsExisting == 1
     Detailprint "Using existing data directory: $\r$\n$DataDir"

From 84f7409e087e9b5fa665bada2fe4a7d2375f8261 Mon Sep 17 00:00:00 2001
From: Bart Baas <info@baasgeo.com>
Date: Tue, 15 Sep 2015 09:29:02 +0200
Subject: [PATCH 2/2] Change filename to release version

---
 SetupMapProxy.nsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SetupMapProxy.nsi b/SetupMapProxy.nsi
index 3752294..5f0523d 100755
--- a/SetupMapProxy.nsi
+++ b/SetupMapProxy.nsi
@@ -32,7 +32,7 @@
 Name "${APPNAMEANDVERSION}"
 BrandingText "${GITPAGE}"
 InstallDir "$PROGRAMFILES\${APPNAME}-${VERSION}"
-OutFile "${APPNAME}-${VERSION}-RC1.exe"
+OutFile "${APPNAME}-${VERSION}.${SEQ}.exe"
 
 ; Compression options
 CRCCheck on