installer: prepare for LyX 1.6.0

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

diff --git a/development/Win32/packaging/AltInstaller/ChangeLog.txt b/development/Win32/packaging/AltInstaller/ChangeLog.txt
index 698af330f849804c73198eb89a54ac4c19f87b03..d8152225beaa69560b3cb097409acc3b8a9b9bcd 100644 (file)
--- a/development/Win32/packaging/AltInstaller/ChangeLog.txt
+++ b/development/Win32/packaging/AltInstaller/ChangeLog.txt
@@ -1,4 +1,8 @@
-Version 4.12
+Version 4.13
+- LyX 1.6.0
+
+
+Version 4.12
 - add missing Python files after the update to Python 2.6
 
 

diff --git a/development/Win32/packaging/AltInstaller/MissingPrograms.nsh b/development/Win32/packaging/AltInstaller/MissingPrograms.nsh
index e0f4533407632f61ff89bb4081842ebd0e35446f..ccf5001b775bd59672bdfcd27b6d9b6454fddfea 100644 (file)
--- a/development/Win32/packaging/AltInstaller/MissingPrograms.nsh
+++ b/development/Win32/packaging/AltInstaller/MissingPrograms.nsh
@@ -140,6 +140,12 @@ Function MissingPrograms
   ${if} $BibTeXEditorPath == ""
    ReadRegStr $BibTeXEditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef 2.4" "UninstallString"
   ${endif}
+  ${if} $BibTeXEditorPath == ""
+   ReadRegStr $BibTeXEditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef 2.4.1" "UninstallString"
+  ${endif}
+  ${if} $BibTeXEditorPath == ""
+   ReadRegStr $BibTeXEditorPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\JabRef 2.4.2" "UninstallString"
+  ${endif}
   
   # test if Inkscape is installed
   ReadRegStr $SVGPath HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Inkscape" "InstallLocation"

diff --git a/development/Win32/packaging/AltInstaller/Settings.nsh b/development/Win32/packaging/AltInstaller/Settings.nsh
index 916941312fe730cc092819e81c793831d29f85f4..819c8e3787c76f946f43b28fad3a3b800f688c69 100644 (file)
--- a/development/Win32/packaging/AltInstaller/Settings.nsh
+++ b/development/Win32/packaging/AltInstaller/Settings.nsh
@@ -1,11 +1,11 @@
 # installer settings
 # You should need to change only these macros for new releases.
 
-!define INSTALLER_SUBVERSION "12"
+!define INSTALLER_SUBVERSION "13"
 !define PRODUCT_DIR "D:\LyXPackage1.6"
 !define PRODUCT_NAME "LyX"
-!define PRODUCT_VERSION "1.6.0rc5"
-!define PRODUCT_VERSION_SHORT "16rc5"
+!define PRODUCT_VERSION "1.6.0"
+!define PRODUCT_VERSION_SHORT "160"
 !define PRODUCT_SUBFOLDER "lyx16"
 !define PRODUCT_LICENSE_FILE "${PRODUCT_DIR}\License.txt"
 !define PRODUCT_SOURCEDIR "${PRODUCT_DIR}\LyX"
@@ -40,11 +40,11 @@ BrandingText "LyXWinInstaller v4.${INSTALLER_SUBVERSION} - ${INSTALLER_VERSION}"
 
 # definitions for the Update installer
 !if ${INSTALLER_VERSION} == "Update"
- !define PRODUCT_VERSION_SHORT_OLD "16rc4"
+ !define PRODUCT_VERSION_SHORT_OLD "160"
  !define PRODUCT_UNINST_KEY_OLD "Software\Microsoft\Windows\CurrentVersion\Uninstall\LyX${PRODUCT_VERSION_SHORT_OLD}"
- !define PRODUCT_VERSION_OLD "LyX 1.6.0rc4"
- !define JabRefVersion "2.3.1" # could be an older version
- !define ImageMagickVersion_Old "6.4.4" # could be an older version
+ !define PRODUCT_VERSION_OLD "LyX 1.6.0"
+ !define JabRefVersion "2.4.2" # could be an older version
+ !define ImageMagickVersion_Old "6.4.5" # could be an older version
  !define GhostscriptVersion_Old "8.63" # could be an older version
  !define MiKTeXDeliveredVersion "2.7" # could be an older version
 !endif
@@ -58,15 +58,15 @@ BrandingText "LyXWinInstaller v4.${INSTALLER_SUBVERSION} - ${INSTALLER_VERSION}"
 # definitions for the Complete installer
 !if ${INSTALLER_VERSION} == "Complete"
  !define GSviewInstall "external\gsv49w32.exe"
- !define JabRefInstall "external\JabRef-2.4-Setup.exe"
- !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.7.3164.exe"
+ !define JabRefInstall "external\JabRef-2.4.2-Setup.exe"
+ !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.7.3224.exe"
  !define JabRefVersion "2.4"
  !define MiKTeXDeliveredVersion "2.7"
 !endif
 
 !define ClassFileDir "${PRODUCT_SOURCEDIR}\Resources\tex"
 
-!define ImageMagickVersion "6.4.4"
+!define ImageMagickVersion "6.4.5"
 # for some odd reason the ImageMagick folder may not be a subfolder of $INSTDIR\bin!
 !define ImageMagickDir "$INSTDIR\etc\ImageMagick"
 !define GhostscriptDir "$INSTDIR\etc\Ghostscript"