From: Uwe Stöhr <uwestoehr@lyx.org>
Date: Sat, 29 Mar 2014 00:50:18 +0000 (+0100)
Subject: installer: commit files with which installer for RC1 was built
X-Git-Tag: 2.1.0~95
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=5284488f375d2f3c73101636ce565c9bf2e2f2ac;p=lyx.git

installer: commit files with which installer for RC1 was built

- known problem: if LyX 2.0.x is installed and you install 2.1rc1, the .lyx file associations will not be updated but if LyX 2.1 is installed on a new PC the file associations work (work is in progress)
---

diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt
index 48b8e4a00d..44020a7932 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,8 +1,14 @@
-Changelog for LyX-207-3:
+Changelog for LyX-207-4:
+- downgraded to Qt 4.8.4
+  (there is a bug in the newer Qt 4.8.5 that destroys some shortcuts)
+- updated to JabRef 2.10
+
+
+Changelog for LyX-207-3:
 - fix serious bug that LyX could directly be installed to c:\programs
   the uninstaller would then delete the whole c:\programs folder
 - install a stripped-down version of Perl to be able to use LyX's feature
-  to have several indexe also when LyX is installed without admin privileges
+  to have several indexes also when LyX is installed without admin privileges
 - updated to Qt 4.8.5
 - updated to Perl 5.18
 
diff --git a/development/Win32/packaging/installer/include/init.nsh b/development/Win32/packaging/installer/include/init.nsh
index f69cf81ca5..b58478ad4d 100644
--- a/development/Win32/packaging/installer/include/init.nsh
+++ b/development/Win32/packaging/installer/include/init.nsh
@@ -48,9 +48,8 @@ Section "!${APP_NAME}" SecCore
  SectionIn RO
 SectionEnd
 
-Section /o "$(SecFileAssocTitle)" SecFileAssoc
- SectionIn RO # remove this line LyX 2.1 final!
- #StrCpy $CreateFileAssociations "true" 
+Section "$(SecFileAssocTitle)" SecFileAssoc
+ StrCpy $CreateFileAssociations "true" 
 SectionEnd
 
 Section "$(SecDesktopTitle)" SecDesktop
diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh
index 2beb288b45..cc52db455b 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -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"
  
 # 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.4813.exe"
+ !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.5105.exe"
 !endif
 
diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh
index 67201f7e8d..406aeb6bdf 100644
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -69,7 +69,7 @@ SectionEnd
 
 Section -Configure
 
-  # Associate .lyx files with LyX for current user of all users
+  # Associate .lyx files with LyX for current user or all users
 
   ${if} $CreateFileAssociations == "true"
    WriteRegStr SHCTX "${APP_DIR_REGKEY}" "" "$INSTDIR\${APP_RUN}"