NSIS: Make the licensing page match reality.

The NSIS licensing page is centered around making the user agree to
a EULA. We don't have one of those. Replace the "you must accept" and
"I agree" text with something more neutral.

We could alternatively omit with the licensing page altogether, but
the GPL is an important aspect of the project and deserves some sort
of mention.

Bug: 1115
Change-Id: I5fd5beac2188b61a90c2842de7d7547aa815ff4f
Reviewed-on: https://code.wireshark.org/review/35624
Reviewed-by: Anders Broman <a.broman58@gmail.com>

diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 710042b391ee6f65de7432307b4c4acc90bd1e30..c29282dbd52884974a16904c9b84bf9cb6936930 100644 (file)
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -83,7 +83,12 @@ BrandingText "Wireshark${U+00ae} Installer"
 ; ============================================================================
 
 !insertmacro MUI_PAGE_WELCOME
+
+!define MUI_LICENSEPAGE_TEXT_TOP "Wireshark is distributed under the GNU General Public License."
+!define MUI_LICENSEPAGE_TEXT_BOTTOM "This is not an end user license agreement (EULA). It is provided here for informational purposes only."
+!define MUI_LICENSEPAGE_BUTTON "Noted"
 !insertmacro MUI_PAGE_LICENSE "${STAGING_DIR}\COPYING.txt"
+
 !insertmacro MUI_PAGE_COMPONENTS
 !ifdef QT_DIR
 Page custom DisplayAdditionalTasksPage LeaveAdditionalTasksPage
@@ -159,12 +164,6 @@ Page custom DisplayUSBPcapPage
 !insertmacro GetParameters
 !insertmacro GetOptions
 
-; ============================================================================
-; License page configuration
-; ============================================================================
-LicenseText "Wireshark is distributed under the GNU General Public License."
-LicenseData "${STAGING_DIR}\COPYING.txt"
-
 ; ============================================================================
 ; Component page configuration
 ; ============================================================================