installer: updates for the installer for 2.2. final

diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt
index 02d35fccaee535b7f4ff11ecf8151489654e67c3..051975500149250912f02efa132eff7e7e22e6af 100644 (file)
--- 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 11415db27ca438c3b138b939c40ffc196f685032..5695bda8fbacbe949d2bd8ca80b696222250a0b4 100644 (file)
--- 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 a3d27aa5eb1d2c3c8a94439423e07dba2959ee09..496307d487ee80bba95b8d09d14a5655f8ec145d 100644 (file)
--- 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}