From 718daae56a29a3e8c8e85e0b4ee6e8b5d8831501 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20St=C3=B6hr?= <uwestoehr@lyx.org>
Date: Sun, 3 Apr 2016 18:30:54 +0200
Subject: [PATCH] installer: prepare for a RC1 release

---
 .../Win32/packaging/installer/ChangeLog.txt       | 15 +++++++++++++--
 .../Win32/packaging/installer/lyx-bundle.nsi      |  2 +-
 .../Win32/packaging/installer/lyx-standard.nsi    |  4 ++--
 .../Win32/packaging/installer/settings.nsh        |  6 +++---
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt
index 0a82b88b43..d0ff9b2d13 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,5 +1,16 @@
-Changelog for LyX.220-beta-1-1:
-- installs lyX 2.2.0 beta1
+Changelog for LyX.220-RC1-1:
+- installs LyX 2.2.0 RC1
+- updated to Imagemagick 6.9.3-7
+- updated to Python 2.7.11
+- updated to Qt 5.6.0
+- updated thesaurus for Italian
+- updated spell-checker dictionary for Italian
+  (To benefit from it you must uninstall an already installed LyX 2.2.0 and
+   then use this installer.)
+
+
+Changelog for LyX.220-beta-2-1:
+- installs lyX 2.2.0 beta2
 - new support for the document converter program Pandoc (http://pandoc.org/),
   see http://wiki.lyx.org/LyX/NewInLyX22#converters
 - new support to use Krita (https://krita.org/) as image editor from within LyX
diff --git a/development/Win32/packaging/installer/lyx-bundle.nsi b/development/Win32/packaging/installer/lyx-bundle.nsi
index 19ba4de3bb..824debb11c 100644
--- a/development/Win32/packaging/installer/lyx-bundle.nsi
+++ b/development/Win32/packaging/installer/lyx-bundle.nsi
@@ -2,7 +2,7 @@
 
 NSIS Script - LyX 2.2 Installer for Windows
 Authors: Joost Verburg, Angus Leeming, Uwe Stöhr
-Compatible with NSIS 2.46
+Compatible with NSIS 2.51
 
 */
 
diff --git a/development/Win32/packaging/installer/lyx-standard.nsi b/development/Win32/packaging/installer/lyx-standard.nsi
index 2f366c11c9..3cbce02174 100644
--- a/development/Win32/packaging/installer/lyx-standard.nsi
+++ b/development/Win32/packaging/installer/lyx-standard.nsi
@@ -1,7 +1,7 @@
 /*
 NSIS Script - LyX 2.2 Installer for Windows
 Authors: Joost Verburg, Angus Leeming, Uwe Stöhr
-Compatible with NSIS 2.46
+Compatible with NSIS 2.51
 */
 
 # Do a Cyclic Redundancy Check to make sure the installer
@@ -9,7 +9,7 @@ Compatible with NSIS 2.46
 CRCCheck force
 #
 # Make the installer as small as possible.
-#SetCompressor /SOLID lzma
+SetCompressor /SOLID lzma
 
 !ifndef SETUPTYPE
  !define SETUPTYPE STANDARD
diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh
index e3a73f0fac..9838ba5038 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -12,7 +12,7 @@ These typically need to be modified for each LyX release
 !define APP_VERSION_MAJOR 2
 !define APP_VERSION_MINOR 2
 !define APP_VERSION_REVISION 0
-!define APP_VERSION_EMERGENCY "beta-1" # use "1" for an emergency release of LyX otherwise ""
+!define APP_VERSION_EMERGENCY "RC1" # 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 1 # Start with 1 for the installer releases of each version
 
@@ -21,7 +21,7 @@ These typically need to be modified for each LyX release
 #--------------------------------
 # Installer file name
 
-# Typical names for the release are "LyX-201-Installer-1.exe" etc.
+# Typical names for the release are "LyX-211-Installer-1.exe" etc.
 
 !ifndef ExeFile
   !define ExeFile "LyX-${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}${APP_VERSION_EMERGENCY}-Installer-${APP_VERSION_BUILD}.exe"
@@ -39,7 +39,7 @@ These typically need to be modified for each LyX release
 
 !define FILES_LYX "D:\LyXPackage2.2\LyX"
 !define FILES_DEPS "D:\LyXGit\Master\lyx-windows-deps-msvc2010"
-!define FILES_QT "C:\Qt\Qt5-5-1-2010\5.5\msvc2010"
+!define FILES_QT "C:\Qt\Qt5.6.0-MSVC2015\5.6\msvc2015"
 !define ClassFileDir "${FILES_LYX}\Resources\tex"
 !define DVIPostFileDir "${FILES_DEPS}\tex"