Enforce inclusion of directory and program group pages

markisch · markisch · commit 265fb79a21f0 · 2016-07-26T21:53:13.000+02:00
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2016-07-26  Bastian Maerkisch  <bmaerkisch@web.de>
+
+	* win/gnuplot.iss:  Enforce inclusion of directory and program group
+	pages since the default changed in Inno setup version 5.5.7.
+	Bug #1831
+
 2016-07-25  Bastian Maerkisch  <bmaerkisch@web.de>
 
 	* src/win/wgraph.c src/win/wmenu.c:  Use the "large" icon set for the
@@ -20,6 +26,7 @@
 	(system) DPI aware so that Windows no longer scales automatically
 	(at least in the most common case).  Window sizes in wgnuplot.ini are
 	(still) interpreted to be given in the default resolution of 96dpi.
+	See also bug #1807.
 
 	* src/win/wtext.c (DoLine):  Fix off-by-one error which caused the
 	area below the last line to contain garbage in some cases. 
diff --git a/win/gnuplot.iss b/win/gnuplot.iss
@@ -1,5 +1,5 @@
 &#65279;;
-; $Id: gnuplot.iss,v 1.13 2016/04/11 03:16:32 sfeam Exp $
+; $Id: gnuplot.iss,v 1.14 2016/04/21 23:48:12 sfeam Exp $
 ;
 ; GNUPLOT - gnuplot.iss
 ;
@@ -90,6 +90,8 @@ AlwaysShowDirOnReadyPage=true
 ChangesAssociations=true
 ArchitecturesAllowed=
 ArchitecturesInstallIn64BitMode=
+DisableDirPage=no
+DisableProgramGroupPage=no
 
 [Languages]
 Name: "en"; MessagesFile: "compiler:Default.isl"

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`;`
`2`		`-; $Id: gnuplot.iss,v 1.13 2016/04/11 03:16:32 sfeam Exp $`
	`2`	`+; $Id: gnuplot.iss,v 1.14 2016/04/21 23:48:12 sfeam Exp $`
`3`	`3`	`;`
`4`	`4`	`; GNUPLOT - gnuplot.iss`
`5`	`5`	`;`
`@@ -90,6 +90,8 @@ AlwaysShowDirOnReadyPage=true`
`90`	`90`	`ChangesAssociations=true`
`91`	`91`	`ArchitecturesAllowed=`
`92`	`92`	`ArchitecturesInstallIn64BitMode=`
	`93`	`+DisableDirPage=no`
	`94`	`+DisableProgramGroupPage=no`
`93`	`95`
`94`	`96`	`[Languages]`
`95`	`97`	`Name: "en"; MessagesFile: "compiler:Default.isl"`