From: Uwe Stöhr <uwestoehr@web.de>
Date: Mon, 30 Jan 2012 21:13:00 +0000 (+0000)
Subject: installer:
X-Git-Tag: 2.1.0beta1~2084
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=cd765d1d021f5eff8414712306e4b0047a778d1d;p=features.git

installer:
- fix a bug in detection of Gnumeric
- update to latest third-party products

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40688 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/development/Win32/packaging/installer/include/detection.nsh b/development/Win32/packaging/installer/include/detection.nsh
index 730c35ccf1..7801423daa 100644
--- a/development/Win32/packaging/installer/include/detection.nsh
+++ b/development/Win32/packaging/installer/include/detection.nsh
@@ -136,6 +136,7 @@ Function MissingPrograms
   ReadRegStr $0 HKLM "Software\Classes\Applications\gnumeric.exe\shell\Open\command" ""
   ${if} $0 != ""
    StrCpy $0 $0 -18 # remove "gnumeric.exe" "%1""
+   StrCpy $0 $0 "" 1 # remove the leading quote
    StrCpy $GnumericPath $0
   ${endif}
 
diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh
index df7cb4d6c3..3502709bbb 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -12,7 +12,7 @@ These typically need to be modified for each LyX release
 !define APP_VERSION_MAJOR 2
 !define APP_VERSION_MINOR 0
 !define APP_VERSION_REVISION 2
-!define APP_VERSION_BUILD 4 # Start with 1 for the installer releases of each version
+!define APP_VERSION_BUILD 5 # Start with 1 for the installer releases of each version
 
 !define APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}" # Version to display
 
@@ -50,12 +50,12 @@ These typically need to be modified for each LyX release
 
 !define JabRefVersion "2.7"
 !define MiKTeXDeliveredVersion "2.9"
-!define ImageMagickVersion "6.7.4"
+!define ImageMagickVersion "6.7.5"
  
 # definitions for the Complete installer
 !if ${SETUPTYPE} == BUNDLE
  !define JabRefInstall "external\JabRef-2.7-setup.exe"
- !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.4250.exe"
+ !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.4407.exe"
  !define SIZE_DOWNLOAD_LATEX 160106
  !define SIZE_LATEX 380000
 !endif