From: Uwe Stöhr <uwestoehr@lyx.org>
Date: Sat, 19 Nov 2016 15:35:42 +0000 (+0100)
Subject: Win installer: prepare for next release
X-Git-Tag: 2.3.0alpha1~735
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=cb6c40a07b275f62cb641f02f377c54a821837fb;p=features.git

Win installer: prepare for next release

- see ChangeLog.txt file for changes
---

diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt
index b1d75fbc2c..b954c80fee 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,8 +1,17 @@
 Changelog for LyX-222-3:
-- updated Swedish and Ukrainian translation of the installer
+- updated to MiKTeX 2.9 build 6161
+  (should fix all compilation errors you might have encountered recently
+   with your LyX files)
+- new spell checker for Tibetan
 - correct Arabic translation of the installer (was acidentally in Farsi before)
 - automatically install LaTeX package necessary for XeTeX in combintions with
   document languages like e.g. Georgian
+- updated Norwegian, Swedish and Ukrainian translation of the installer
+- updated to JabRef 3.7
+- updated to Imagemagick 7.0.3-7
+- updated spell checker dictionary for English (GB)
+  (To benefit from it you must uninstall an already installed LyX 2.2.x and
+   then use this installer.)
 
 
 Changelog for LyX-222-2:
diff --git a/development/Win32/packaging/installer/HunspellDictionaryNames.txt b/development/Win32/packaging/installer/HunspellDictionaryNames.txt
index aba877cc7e..ff7b1039b8 100644
--- a/development/Win32/packaging/installer/HunspellDictionaryNames.txt
+++ b/development/Win32/packaging/installer/HunspellDictionaryNames.txt
@@ -6,6 +6,8 @@ be_BY.aff
 be_BY.dic
 bg_BG.aff
 bg_BG.dic
+bo_CN.aff
+bo_CN.dic
 br_FR.aff
 br_FR.dic
 ca_ES.aff
diff --git a/development/Win32/packaging/installer/include/init.nsh b/development/Win32/packaging/installer/include/init.nsh
index 53f8b21706..db4a9ef1da 100644
--- a/development/Win32/packaging/installer/include/init.nsh
+++ b/development/Win32/packaging/installer/include/init.nsh
@@ -180,7 +180,7 @@ Section "English (GB)" SecDEnglishGB
  # already installed by default
  SectionIn RO
  #StrCpy $DictCodes "en_GB,$DictCodes"
- AddSize 760
+ AddSize 735
 SectionEnd
 
 Section /o "English (NZ)" SecDEnglishNZ
@@ -416,6 +416,11 @@ Section /o "Thai" SecDThai
  AddSize 351
 SectionEnd
 
+Section /o "Tibetan" SecDTibetan
+ StrCpy $DictCodes "bo_CN,$DictCodes"
+ AddSize 7
+SectionEnd
+
 Section /o "Türkmençe" SecDTurkmen
  StrCpy $DictCodes "tk_TM,$DictCodes"
  AddSize 950
@@ -1186,6 +1191,13 @@ Function .onInit
    SectionSetFlags ${SecDThai} $0
    SectionSetSize ${SecDThai} 0
   ${endif}
+  StrCpy $Search "bo_CN"
+  Call StrPoint
+  ${if} $Pointer != "-1"
+   IntOp $0 ${SF_SELECTED} | ${SF_RO}
+   SectionSetFlags ${SecDTibetan} $0
+   SectionSetSize ${SecDTibetan} 0
+  ${endif}
   StrCpy $Search "tk_TM"
   Call StrPoint
   ${if} $Pointer != "-1"
diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh
index 72f25e4ec6..58de627365 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -55,8 +55,8 @@ These typically need to be modified for each LyX release
  
 # definitions for the Complete installer
 !if ${SETUPTYPE} == BUNDLE
- !define JabRefInstall "external\JabRef_windows_3_6.exe"
- !define SIZE_JABREF 26668 # size in KB
- !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6069.exe"
+ !define JabRefInstall "external\JabRef_windows_3_7.exe"
+ !define SIZE_JABREF 36502 # size in KB 
+ !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6161.exe"
 !endif