From 54bcdd2468b02bf9efe5e1191b471a6494bb74a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Wed, 20 Jul 2016 23:44:11 +0200 Subject: [PATCH] prepare installer for 2.2.1 --- development/Win32/packaging/installer/ChangeLog.txt | 9 ++++++--- development/Win32/packaging/installer/settings.nsh | 10 +++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index 9004980dd5..d4f71b54f7 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -1,8 +1,11 @@ -Changelog for LyX-220-4: +Changelog for LyX-221-1: +- installs LyX 2.2.1 - recompiled LyX using MSVC 2015 update 3 +- updated to Qt 5.6.1-1 - updated to MiKTeX 2.9 build 6022 -- updated to Imagemagick 6.9.x - +- updated to Imagemagick 6.9.5 +- updated to Python 2.7.12 +- updated to JabRef 3.5 Changelog for LyX-220-3: diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh index 09e58b1367..25ca141379 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 2 -!define APP_VERSION_REVISION 0 +!define APP_VERSION_REVISION 1 !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 4 # 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 @@ -51,12 +51,12 @@ These typically need to be modified for each LyX release !define MiKTeXRepo "ftp://ftp.fernuni-hagen.de/pub/mirrors/www.ctan.org/systems/win32/miktex/tm/packages/" !define MiKTeXDeliveredVersion "2.9" -!define ImageMagickVersion "6.9.4" +!define ImageMagickVersion "6.9.5" # definitions for the Complete installer !if ${SETUPTYPE} == BUNDLE - !define JabRefInstall "external\JabRef_windows_3_4.exe" - !define SIZE_JABREF 25700 # size in KB + !define JabRefInstall "external\JabRef_windows_3_5.exe" + !define SIZE_JABREF 26252 # size in KB !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.6022.exe" !endif