installer: updates for LyX 1.6rc2

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

diff --git a/development/Win32/packaging/AltInstaller/ChangeLog.txt b/development/Win32/packaging/AltInstaller/ChangeLog.txt
index d2c67d51a5445dd568e3e553a566ab9789336f0b..540c16db608fe460dbfdc022c84025ff8667f621 100644 (file)
--- a/development/Win32/packaging/AltInstaller/ChangeLog.txt
+++ b/development/Win32/packaging/AltInstaller/ChangeLog.txt
@@ -1,4 +1,4 @@
-Version 4.07
+Version 4.08
 - LyX 1.6rc2
   (list of current regressions: http://tinyurl.com/yu4the )
   (list of current crashes and critical bugs: http://tinyurl.com/653prg)

diff --git a/development/Win32/packaging/AltInstaller/Settings.nsh b/development/Win32/packaging/AltInstaller/Settings.nsh
index 846dfc730319dd56a336ff74606dd8152f9f4969..29ce18990986a2e9a6def42b47503ead92f7dcd6 100644 (file)
--- a/development/Win32/packaging/AltInstaller/Settings.nsh
+++ b/development/Win32/packaging/AltInstaller/Settings.nsh
@@ -18,13 +18,14 @@
 !define PRODUCT_ABOUT_URL "http://www.lyx.org/about/"
 !define PRODUCT_INFO_URL "http://www.lyx.org/"
 !define LAUNCHER_EXE "$INSTDIR\bin\LyXLauncher.exe"
+!define INSTALLER_SUBVERSION "08"
 
-BrandingText "LyXWinInstaller v4.08 - ${INSTALLER_VERSION}"
+BrandingText "LyXWinInstaller v4.${INSTALLER_SUBVERSION} - ${INSTALLER_VERSION}"
 
 # to check later if this installer version is running at the same time
-!define INSTALLER_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-08-AltInstaller-${INSTALLER_VERSION}.exe"
-!define INSTALLER2_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-08-AltInstaller-${INSTALLER2_VERSION}.exe"
-!define INSTALLER3_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-08-AltInstaller-${INSTALLER3_VERSION}.exe"
+!define INSTALLER_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-${INSTALLER_SUBVERSION}-AltInstaller-${INSTALLER_VERSION}.exe"
+!define INSTALLER2_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-${INSTALLER_SUBVERSION}-AltInstaller-${INSTALLER2_VERSION}.exe"
+!define INSTALLER3_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-${INSTALLER_SUBVERSION}-AltInstaller-${INSTALLER3_VERSION}.exe"
 !define VERSION_BITMAP "${PRODUCT_DIR}\icons\lyx_logo_vert${PRODUCT_VERSION_SHORT}.bmp"
 
 # Replaced by HKLM or HKCU depending on SetShellVarContext.
@@ -41,7 +42,7 @@ BrandingText "LyXWinInstaller v4.08 - ${INSTALLER_VERSION}"
 !if ${INSTALLER_VERSION} == "Update"
  !define PRODUCT_UNINST_KEY_OLD "Software\Microsoft\Windows\CurrentVersion\Uninstall\LyX16svn3"
  !define PRODUCT_VERSION_OLD "LyX 1.6.0rc1"
- !define PRODUCT_VERSION_SHORT_OLD "16beta4"
+ !define PRODUCT_VERSION_SHORT_OLD "16rc1"
  !define JabRefVersion "2.3.1" # could be an older version
  !define ImageMagickVersion_Old "6.4.2" # could be an older version
  !define GhostscriptVersion_Old "8.62" # could be an older version