From 97377547a7cdd7fd51e252729ad916bee5f47967 Mon Sep 17 00:00:00 2001
From: Guy Harris <guy@alum.mit.edu>
Date: Wed, 5 Apr 2017 12:26:26 -0700
Subject: More OS name cleanups.

Use macOS when not referring to a particular release; use the
appropriate name when referring to a particular release.

Change-Id: I9293d4db7c91d7c859d7c067c0f0b3c9c482fcc5
Reviewed-on: https://code.wireshark.org/review/20935
Reviewed-by: Guy Harris <guy@alum.mit.edu>
---
 packaging/macosx/Read_me_first.rtf                    |   2 +-
 packaging/macosx/Wireshark_package.pmdoc/index.xml.in |   2 +-
 packaging/macosx/dmg_set_style.scpt                   | Bin 7078 -> 7968 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'packaging')

diff --git a/packaging/macosx/Read_me_first.rtf b/packaging/macosx/Read_me_first.rtf
index 2bcce62b47..6ecc0d5421 100644
--- a/packaging/macosx/Read_me_first.rtf
+++ b/packaging/macosx/Read_me_first.rtf
@@ -15,7 +15,7 @@
 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
 
-\f1\b0\fs24 \cf0 This release of Wireshark requires Macintosh OS X 10.5.5 or later. If you are running OS X 10.5.4 or older you can install using another packaging system such as MacPorts or Homebrew.
+\f1\b0\fs24 \cf0 This release of Wireshark requires Mac OS X 10.5.5 or later. If you are running Mac OS X 10.5.4 or older you can install using another packaging system such as MacPorts or Homebrew.
 \f0\b\fs28 \
 \
 Quick Setup\
diff --git a/packaging/macosx/Wireshark_package.pmdoc/index.xml.in b/packaging/macosx/Wireshark_package.pmdoc/index.xml.in
index ebd42c20fb..b03781d7dd 100644
--- a/packaging/macosx/Wireshark_package.pmdoc/index.xml.in
+++ b/packaging/macosx/Wireshark_package.pmdoc/index.xml.in
@@ -1 +1 @@
-<pkmkdoc spec="1.12"><properties><title>Wireshark</title><build>Wireshark.pkg</build><organization>org.wireshark</organization><userSees ui="both"/><min-target os="3"/><domain anywhere="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><description>Wireshark and associated command line utilities.</description><contents><choice title="Wireshark" id="wireshark" tooltip="The Wireshark network protocol analyzer" description="The main Wireshark application" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.wireshark.Wireshark.pkg"/></choice><choice title="Set capture permissions at startup" id="chmodbpf" tooltip="Install the ChmodBPF launch daemon and add an access_bpf group" description="This installs a launch daemon (org.wireshark.ChmodBPF.plist) that changes the group permissions of each BPF device to allow access for the &quot;access_bpf&quot; group. It creates the &quot;access_bpf&quot; group if it doesn't exist and adds the current user to the group." starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.wireshark.ChmodBPF.pkg"/></choice><choice title="Command line utilities" id="cli" tooltip="Command line utilities associated with Wireshark" description="Various utilities associated with Wireshark including TShark, dumpcap, mergecap, capinfos, and editcap." starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.wireshark.cli.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"><resource relative="true" type="license">COPYING.txt</resource></locale></resources><requirements><requirement id="tosv" operator="ge" value="'@OSX_MIN_VERSION@'"><message-title>Failure</message-title><message>This package requires OS X @OSX_MIN_VERSION@ or later. If you cannot upgrade you might try installing using MacPorts or Fink.</message></requirement></requirements><flags/><extra-files/><item type="file">01wireshark.xml</item><item type="file">02chmodbpf.xml</item><item type="file">03utility.xml</item><mod>description</mod><mod>properties.title</mod><mod>properties.anywhereDomain</mod><mod>properties.userDomain</mod><mod>properties.customizeOption</mod><mod>extraFiles</mod><mod>postinstallActions.actions</mod><mod>properties.systemDomain</mod></pkmkdoc>
+<pkmkdoc spec="1.12"><properties><title>Wireshark</title><build>Wireshark.pkg</build><organization>org.wireshark</organization><userSees ui="both"/><min-target os="3"/><domain anywhere="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><description>Wireshark and associated command line utilities.</description><contents><choice title="Wireshark" id="wireshark" tooltip="The Wireshark network protocol analyzer" description="The main Wireshark application" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.wireshark.Wireshark.pkg"/></choice><choice title="Set capture permissions at startup" id="chmodbpf" tooltip="Install the ChmodBPF launch daemon and add an access_bpf group" description="This installs a launch daemon (org.wireshark.ChmodBPF.plist) that changes the group permissions of each BPF device to allow access for the &quot;access_bpf&quot; group. It creates the &quot;access_bpf&quot; group if it doesn't exist and adds the current user to the group." starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.wireshark.ChmodBPF.pkg"/></choice><choice title="Command line utilities" id="cli" tooltip="Command line utilities associated with Wireshark" description="Various utilities associated with Wireshark including TShark, dumpcap, mergecap, capinfos, and editcap." starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.wireshark.cli.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"><resource relative="true" type="license">COPYING.txt</resource></locale></resources><requirements><requirement id="tosv" operator="ge" value="'@OSX_MIN_VERSION@'"><message-title>Failure</message-title><message>This package requires macOS @OSX_MIN_VERSION@ or later. If you cannot upgrade you might try installing using MacPorts or Fink.</message></requirement></requirements><flags/><extra-files/><item type="file">01wireshark.xml</item><item type="file">02chmodbpf.xml</item><item type="file">03utility.xml</item><mod>description</mod><mod>properties.title</mod><mod>properties.anywhereDomain</mod><mod>properties.userDomain</mod><mod>properties.customizeOption</mod><mod>extraFiles</mod><mod>postinstallActions.actions</mod><mod>properties.systemDomain</mod></pkmkdoc>
diff --git a/packaging/macosx/dmg_set_style.scpt b/packaging/macosx/dmg_set_style.scpt
index d51df0884c..a5e17b776a 100755
Binary files a/packaging/macosx/dmg_set_style.scpt and b/packaging/macosx/dmg_set_style.scpt differ
-- 
cgit v1.2.3