From: Uwe Stöhr Date: Tue, 10 May 2016 22:32:58 +0000 (+0200) Subject: Win installer: return to IM 6 X-Git-Tag: 2.2.0~39 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=d4c07e107db2628be0127a3cf05c66f500c79598;p=features.git Win installer: return to IM 6 --- diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index b60f73d862..90f738c947 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -1,6 +1,8 @@ -Changelog for LyX.220-RC2-1: +Todo: add lyx.de to mirror list + +Changelog for LyX.220-RC2-1: - installs LyX 2.2.0 RC2 -- updated to Imagemagick 7.0.1-1 +- updated to Imagemagick 6.9.4-1 - updated to JabRef 3.3 diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh index 5dd614d206..9fb8dea8ae 100644 --- a/development/Win32/packaging/installer/settings.nsh +++ b/development/Win32/packaging/installer/settings.nsh @@ -14,7 +14,7 @@ These typically need to be modified for each LyX release !define APP_VERSION_REVISION 0 !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 +!define APP_VERSION_BUILD 2 # 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,14 +51,13 @@ These typically need to be modified for each LyX release !define MiKTeXRepo "http://sunsite.informatik.rwth-aachen.de/ftp/pub/mirror/ctan/systems/win32/miktex/tm/packages/" #!define MiKTeXRepo "ftp://ftp.tu-chemnitz.de/pub/tex/systems/win32/miktex/tm/packages/" -!define JabRefVersion "2.11.1" !define MiKTeXDeliveredVersion "2.9" -!define ImageMagickVersion "7.0.1" +!define ImageMagickVersion "6.9.4" # definitions for the Complete installer !if ${SETUPTYPE} == BUNDLE - !define JabRefInstall "external\JabRef-2.11.1-setup.exe" - !define SIZE_JABREF 18514 + !define JabRefInstall "external\JabRef_windows_3_3.exe" + !define SIZE_JABREF 25730 !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.9.5872.exe" !endif