From: Uwe Stöhr <uwestoehr@lyx.org>
Date: Sat, 18 Nov 2017 14:25:38 +0000 (+0100)
Subject: Win installer: backport recent changes
X-Git-Tag: 2.3.0rc2~257
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=467ae50e6db13ed59ce033d16f9877da4d0aa01d;p=features.git

Win installer: backport recent changes
---

diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt
index 3e8d9b5c70..d1c358025a 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,5 +1,6 @@
 Changelog for LyX-230-RC1:
 - installs LyX 2.3.0 RC1
+- enable high display resolution support for the installer
 - correct display of installer text for many languages 
 - fix bug that the BibTeX editor Jabref and the image editor Krita
   were not detected as 64bit application
diff --git a/development/Win32/packaging/installer/Packages.txt b/development/Win32/packaging/installer/Packages.txt
index 6a8491a252..29584f4a4b 100644
--- a/development/Win32/packaging/installer/Packages.txt
+++ b/development/Win32/packaging/installer/Packages.txt
@@ -84,6 +84,7 @@ framed
 greek-inputenc
 harvard
 hyphenat
+inlinedef
 iftex
 jurabib
 lettrine
@@ -262,7 +263,10 @@ mptopdf
 pgfopts
 elocalloc
 datetime2
+datetime2-english
+datetime2-french
 datetime2-german
+datetime2-spanish
 tracklang
 acrotex
 zhmetrics
diff --git a/development/Win32/packaging/installer/lyx-bundle.nsi b/development/Win32/packaging/installer/lyx-bundle.nsi
index 0844f4d629..9490f035f7 100644
--- a/development/Win32/packaging/installer/lyx-bundle.nsi
+++ b/development/Win32/packaging/installer/lyx-bundle.nsi
@@ -16,6 +16,9 @@ SetCompressor /SOLID lzma
 # make it a Unicode installer
 Unicode true
 
+# enable support for high DPI resolution
+ManifestDPIAware true
+
 !ifndef SETUPTYPE
  !define SETUPTYPE BUNDLE
 !endif
diff --git a/development/Win32/packaging/installer/lyx-standard.nsi b/development/Win32/packaging/installer/lyx-standard.nsi
index e9b259bfa1..5c943b2426 100644
--- a/development/Win32/packaging/installer/lyx-standard.nsi
+++ b/development/Win32/packaging/installer/lyx-standard.nsi
@@ -14,6 +14,9 @@ SetCompressor /SOLID lzma
 # make it a Unicode installer
 Unicode true
 
+# enable support for high DPI resolution
+ManifestDPIAware true
+
 !ifndef SETUPTYPE
  !define SETUPTYPE STANDARD
 !endif
diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh
index 5f36bdcfc1..a0079c688d 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 "RC-1" # 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 5 # 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