From 239619c4f014483684aca89b36af708e204a7274 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Wed, 13 Apr 2016 01:31:42 +0200 Subject: [PATCH] installer: updates for the installer for 2.2. final --- development/Win32/packaging/installer/ChangeLog.txt | 5 +++-- development/Win32/packaging/installer/include/init.nsh | 3 +-- development/Win32/packaging/installer/setup/uninstall.nsh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index 02d35fccae..0519755001 100644 --- a/development/Win32/packaging/installer/ChangeLog.txt +++ b/development/Win32/packaging/installer/ChangeLog.txt @@ -1,9 +1,10 @@ Changelog for LyX.220-RC1-1: - installs LyX 2.2.0 RC1 -- updated to Imagemagick 6.9.3-7 +- updated to Ghostscript 9.16 +- updated to Imagemagick 6.9.3-8 +- updated to Perl 5.22.1.3 - updated to Python 2.7.11 - updated to Qt 5.6.0 -- updated to Perl 5.22.1.3 - 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 diff --git a/development/Win32/packaging/installer/include/init.nsh b/development/Win32/packaging/installer/include/init.nsh index 11415db27c..5695bda8fb 100644 --- a/development/Win32/packaging/installer/include/init.nsh +++ b/development/Win32/packaging/installer/include/init.nsh @@ -48,10 +48,9 @@ Section "!${APP_NAME}" SecCore SectionIn RO SectionEnd -# FIXME: set this to true when LyX 2.2.0 final is released Section "$(SecFileAssocTitle)" SecFileAssoc SectionIn RO - StrCpy $CreateFileAssociations "false" + StrCpy $CreateFileAssociations "true" SectionEnd Section "$(SecDesktopTitle)" SecDesktop diff --git a/development/Win32/packaging/installer/setup/uninstall.nsh b/development/Win32/packaging/installer/setup/uninstall.nsh index a3d27aa5eb..496307d487 100644 --- a/development/Win32/packaging/installer/setup/uninstall.nsh +++ b/development/Win32/packaging/installer/setup/uninstall.nsh @@ -58,7 +58,7 @@ Section "un.LyX" un.SecUnProgramFiles #DeleteRegKey SHCTX "Software\Classes\${APP_EXT}16" #DeleteRegKey SHCTX "Software\Classes\${APP_EXT}20" #DeleteRegKey SHCTX "Software\Classes\${APP_EXT}21" - #DeleteRegKey SHCTX "Software\Classes\${APP_EXT}" enable this for LyX 2.2 final! + DeleteRegKey SHCTX "Software\Classes\${APP_EXT}" #DeleteRegKey SHCTX "Software\Classes\${APP_REGNAME_DOC}" ${endif} ${endif} -- 2.39.2