From: Uwe Stöhr <uwestoehr@lyx.org>
Date: Fri, 24 Apr 2015 21:53:15 +0000 (+0200)
Subject: installer: preparation and updates for upcoming LyX 2.1.4 release
X-Git-Tag: 2.2.0alpha1~974
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=758e27c61168579c90b1c262240088f60954bf62;p=features.git

installer: preparation and updates for upcoming LyX 2.1.4 release
---

diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt
index 56d64250a4..c847cd7717 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,4 +1,20 @@
-Changelog for LyX-212-2:
+Changelog for LyX-214-1:
+- installs LyX 2.1.4
+- updated Slovak translation
+- updated to Ghostscript 9.16
+- updated spell-checker dictionaries for English (GB), English (US), Portuguese,
+  Spanish, Spanish (MX) and Turkish
+  (To benefit from them you must uninstall an already installed LyX 2.1.x and
+   then use this installer.)
+- updated thesaurus for English (US), Portuguese and Spanish
+  (you need to reinstall LyX to benefit from this)
+
+
+Changelog for LyX-213-1:
+- installs LyX 2.1.3
+
+
+Changelog for LyX-212-2:
 - fix problem that some LaTeX language packages were not installed automatically
   leading to LaTeX errors when compiling LyX documents 
 - new spell checker for Turkish
diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh
index 56b2b7bb37..292c3736d4 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -11,10 +11,10 @@ These typically need to be modified for each LyX release
 
 !define APP_VERSION_MAJOR 2
 !define APP_VERSION_MINOR 1
-!define APP_VERSION_REVISION 2
+!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 2 # Start with 1 for the installer releases of each version
+!define APP_VERSION_BUILD 1 # 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.6"
 !define ClassFileDir "${FILES_LYX}\Resources\tex"
 !define DVIPostFileDir "${FILES_DEPS}\tex"