[WINDOWS] Update to GPSBabel 1.5.2

diff --git a/win32/installer.bat b/win32/installer.bat
index 44b8dab490f00f6c7b1112c7456da510e0eb0915..873084d052cb15af980e9a57edbc9effafa6eaa2 100644 (file)
--- a/win32/installer.bat
+++ b/win32/installer.bat
@@ -122,7 +122,7 @@ cache\%GTK_RUNTIME% /sideeffects=no /setpath=no /dllpath=root /translations=no /
 \r
 echo Copying GPSBabel Installer
 mkdir %DESTINATION%\Optional
-%MYCOPY% cache\GPSBabel-1.5.1-Setup.exe %DESTINATION%\Optional
+%MYCOPY% cache\GPSBabel-1.5.2-Setup.exe %DESTINATION%\Optional
 if ERRORLEVEL 1 goto Error
 
 ::\r

diff --git a/win32/installer/translations/english.nsh b/win32/installer/translations/english.nsh
index f8efcc11be35ebe7cc277569ec78fd72f94c2a59..d76c3f3f4f106b720e23199a91b90b0ca0b9cd39 100644 (file)
--- a/win32/installer/translations/english.nsh
+++ b/win32/installer/translations/english.nsh
@@ -25,7 +25,7 @@
 !insertmacro VIKING_MACRO_DEFAULT_STRING VIKING_DESKTOP_SHORTCUT_SECTION_TITLE "Desktop"
 !insertmacro VIKING_MACRO_DEFAULT_STRING VIKING_STARTMENU_SHORTCUT_SECTION_TITLE       "Start Menu"
 !insertmacro VIKING_MACRO_DEFAULT_STRING VIKING_FILE_ASSOCIATION_SECTION_TITLE "File association"
-!insertmacro VIKING_MACRO_DEFAULT_STRING VIKING_GPSBABEL_SECTION_TITLE "GPSBabel 1.5.1"
+!insertmacro VIKING_MACRO_DEFAULT_STRING VIKING_GPSBABEL_SECTION_TITLE "GPSBabel 1.5.2"
 !insertmacro VIKING_MACRO_DEFAULT_STRING VIKING_SECTION_DESCRIPTION            "Core Viking files and dlls"
 !insertmacro VIKING_MACRO_DEFAULT_STRING GTK_SECTION_DESCRIPTION               "A multi-platform GUI toolkit, used by Viking"
 

diff --git a/win32/installer/translations/french.nsh b/win32/installer/translations/french.nsh
index e394e9f2bfec103029b316e9b359ea264489e307..48372d868c607a50c851cd8f3fdfcf0e5053840d 100644 (file)
--- a/win32/installer/translations/french.nsh
+++ b/win32/installer/translations/french.nsh
@@ -28,7 +28,7 @@
 !define VIKING_STARTMENU_SHORTCUT_SECTION_TITLE        "Menu Démarrer"
 !define VIKING_FILE_ASSOCIATION_SECTION_TITLE  "Extension .gpx"
 !define VIKING_SECTION_DESCRIPTION             "Fichiers et DLLs de base de Viking"
-!define VIKING_GPSBABEL_SECTION_TITLE  "GPSBabel 1.5.1"
+!define VIKING_GPSBABEL_SECTION_TITLE  "GPSBabel 1.5.2"
 
 !define VIKING_SHORTCUTS_SECTION_DESCRIPTION   "Raccourcis pour lancer Viking"
 !define VIKING_DESKTOP_SHORTCUT_DESC           "Créer un raccourci pour Viking sur le bureau"

diff --git a/win32/installer/translations/spanish.nsh b/win32/installer/translations/spanish.nsh
index cc27c48e52cb9015ca838a81ef06cea36f4c5222..6edbc716afbbe06f30564aebffd8a343579369b2 100644 (file)
--- a/win32/installer/translations/spanish.nsh
+++ b/win32/installer/translations/spanish.nsh
@@ -27,7 +27,7 @@
 !define VIKING_STARTMENU_SHORTCUT_SECTION_TITLE        "Menú Inicio"\r
 !define VIKING_FILE_ASSOCIATION_SECTION_TITLE  "Extensión.gpx"\r
 !define VIKING_SECTION_DESCRIPTION             "Ficheros y DLLs de base de Viking"\r
-!define VIKING_GPSBABEL_SECTION_TITLE  "GPSBabel 1.5.1"
+!define VIKING_GPSBABEL_SECTION_TITLE  "GPSBabel 1.5.2"
 \r
 !define VIKING_SHORTCUTS_SECTION_DESCRIPTION   "Accesos directos para lanzar Viking"\r
 !define VIKING_DESKTOP_SHORTCUT_DESC           "Crear un acceso directo a Viking en el escritorio"\r

diff --git a/win32/installer/viking-installer.nsi b/win32/installer/viking-installer.nsi
index 3f5b5e08e147b7c583675b85eaf99516ed1cdad4..7d2540c031fcc2d6705c61f1225d3715884c5f53 100644 (file)
--- a/win32/installer/viking-installer.nsi
+++ b/win32/installer/viking-installer.nsi
@@ -314,9 +314,9 @@ SectionEnd
 ; GPSBabel Install Section
 ;
 Section $(VIKING_GPSBABEL_SECTION_TITLE) SecGPSBabel
-  File "bin\Optional\GPSBabel-1.5.1-Setup.exe"
-  ExecWait '"$INSTDIR\GPSBabel-1.5.1-Setup.exe" /SILENT'
-  Delete "$INSTDIR\GPSBabel-1.5.1-Setup.exe"
+  File "bin\Optional\GPSBabel-1.5.2-Setup.exe"
+  ExecWait '"$INSTDIR\GPSBabel-1.5.2-Setup.exe" /SILENT'
+  Delete "$INSTDIR\GPSBabel-1.5.2-Setup.exe"
 SectionEnd
 
 ;--------------------------------

diff --git a/win32/prepare.bat b/win32/prepare.bat
index 41bfdfd5d735a4157e4843eeaf8de9d8dacfca66..d5a2444dfa7198b59e0ce324ae8d20e1129fb0e3 100644 (file)
--- a/win32/prepare.bat
+++ b/win32/prepare.bat
@@ -466,7 +466,7 @@ if not exist "%MINGW_BIN%\iconv.dll" (
 :: Note GPSBabel can not be directly downloaded via wget\r
 :: ATM get it manually from here:\r
 ::   http://www.gpsbabel.org/download.html\r
-set GPSBABEL_INST=GPSBabel-1.5.1-Setup.exe
+set GPSBABEL_INST=GPSBabel-1.5.2-Setup.exe
 if not exist %GPSBABEL_INST% (
        echo Required %GPSBABEL_INST% not found. Exitting
        exit /b