Merge remote-tracking branch 'origin/dev'

baasgeo · Sep 15, 2015 · f84ea49 · f84ea49
2 parents fec456b + 84f7409
commit f84ea49
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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}"
@@ -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"