X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2FWin32%2Fpackaging%2Finstaller%2Fsettings.nsh;h=8fbd9522e352ef8ec7c4d494612ff3b59c996590;hb=9c114d16e649559d5ed1d3f744df099a20d61986;hp=90aa74522e8c14c739593fc71e869656bf4f59fe;hpb=0b791d49f52d0e0271b9f189e0561cbb314f81e1;p=lyx.git

diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh
index 90aa74522e..8fbd9522e3 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -10,11 +10,11 @@ These typically need to be modified for each LyX release
 # Version number
 
 !define APP_VERSION_MAJOR 2
-!define APP_VERSION_MINOR 0
-!define APP_VERSION_REVISION 5
-!define APP_VERSION_EMERGENCY "1" # use "1" for an emergency release of LyX otherwise ""
-!define APP_EMERGENCY_DOT "." # use "." for an emergency release of LyX otherwise ""
-!define APP_VERSION_BUILD 3 # Start with 1 for the installer releases of each version
+!define APP_VERSION_MINOR 1
+!define APP_VERSION_REVISION 4
+!define APP_VERSION_EMERGENCY "" # use "1" for an emergency release of LyX otherwise ""
+!define APP_EMERGENCY_DOT "" # use "." for an emergency release of LyX otherwise ""
+!define APP_VERSION_BUILD 4 # Start with 1 for the installer releases of each version
 
 !define APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}${APP_EMERGENCY_DOT}${APP_VERSION_EMERGENCY}" # Version to display
 
@@ -37,9 +37,9 @@ These typically need to be modified for each LyX release
 # File locations
 # !!! you need to adjust them to the folders in your Windows system !!!
 
-!define FILES_LYX "C:\LyX\LyXPackage\LyX"
-!define FILES_DEPS "C:\LyX\LyX2.0x\lyx-windows-deps-msvc2008"
-!define FILES_QT "C:\LyX\LyXPackage\LyX"
+!define FILES_LYX "D:\LyXPackage2.1\LyX"
+!define FILES_DEPS "D:\LyXGit\Master\lyx-windows-deps-msvc2010"
+!define FILES_QT "C:\Qt\4.8.7"
 !define ClassFileDir "${FILES_LYX}\Resources\tex"
 !define DVIPostFileDir "${FILES_DEPS}\tex"
 
@@ -51,14 +51,14 @@ These typically need to be modified for each LyX release
 !define MiKTeXRepo "http://ftp.fernuni-hagen.de/ftp-dir/pub/mirrors/www.ctan.org/systems/win32/miktex/tm/packages/"
 #!define MiKTeXRepo "ftp://ftp.tu-chemnitz.de/pub/tex/systems/win32/miktex/tm/packages/"
 
-!define JabRefVersion "2.9.2"
+!define JabRefVersion "2.10"
 !define MiKTeXDeliveredVersion "2.9"
-!define ImageMagickVersion "6.8.0"
+!define ImageMagickVersion "6.9.2"
  
 # definitions for the Complete installer
 !if ${SETUPTYPE} == BUNDLE
- !define JabRefInstall "external\JabRef-2.9.2-setup.exe"
+ !define JabRefInstall "external\JabRef-2.10-setup.exe"
  !define SIZE_JABREF 14100
- !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.4757.exe"
+ !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.5721.exe"
 !endif