From c1b746dbab1f9324ec0d9956d44be1b2f68bf52b Mon Sep 17 00:00:00 2001 From: Rob Norris Date: Sun, 8 Mar 2015 11:27:18 +0000 Subject: [PATCH 1/1] [WINDOWS] Update to GPSBabel 1.5.2 --- win32/installer.bat | 2 +- win32/installer/translations/english.nsh | 2 +- win32/installer/translations/french.nsh | 2 +- win32/installer/translations/spanish.nsh | 2 +- win32/installer/viking-installer.nsi | 6 +++--- win32/prepare.bat | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/win32/installer.bat b/win32/installer.bat index 44b8dab4..873084d0 100644 --- a/win32/installer.bat +++ b/win32/installer.bat @@ -122,7 +122,7 @@ cache\%GTK_RUNTIME% /sideeffects=no /setpath=no /dllpath=root /translations=no / 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 :: diff --git a/win32/installer/translations/english.nsh b/win32/installer/translations/english.nsh index f8efcc11..d76c3f3f 100644 --- 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 e394e9f2..48372d86 100644 --- 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 cc27c48e..6edbc716 100644 --- a/win32/installer/translations/spanish.nsh +++ b/win32/installer/translations/spanish.nsh @@ -27,7 +27,7 @@ !define VIKING_STARTMENU_SHORTCUT_SECTION_TITLE "Menú Inicio" !define VIKING_FILE_ASSOCIATION_SECTION_TITLE "Extensión.gpx" !define VIKING_SECTION_DESCRIPTION "Ficheros y 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 "Accesos directos para lanzar Viking" !define VIKING_DESKTOP_SHORTCUT_DESC "Crear un acceso directo a Viking en el escritorio" diff --git a/win32/installer/viking-installer.nsi b/win32/installer/viking-installer.nsi index 3f5b5e08..7d2540c0 100644 --- 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 41bfdfd5..d5a2444d 100644 --- 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 :: ATM get it manually from here: :: http://www.gpsbabel.org/download.html -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 -- 2.39.5