Fix items pointed out by Guy in bug 5756.

svn path=/trunk/; revision=37129

7 files changed, 7 insertions, 7 deletions

diff --git a/packaging/macosx/Scripts/cli-postinstall.sh b/packaging/macosx/Scripts/cli-postinstall.sh
index 96c9693449..d145532c93 100644
--- a/packaging/macosx/Scripts/cli-postinstall.sh
+++ b/packaging/macosx/Scripts/cli-postinstall.sh
@@ -21,6 +21,6 @@ mv utility-launcher wireshark
 chmod 755 wireshark
 
 for BIN in $BINARIES ; do
-    rm -rf ./"$BIN"
+    rm -f ./"$BIN"
     ln -sn ./wireshark "$BIN"
 done
diff --git a/packaging/macosx/Wireshark package.pmdoc/01wireshark-contents.xml b/packaging/macosx/Wireshark package.pmdoc/01wireshark-contents.xml
index 11150ca728..bc1e5a791f 100644
--- a/packaging/macosx/Wireshark package.pmdoc/01wireshark-contents.xml
+++ b/packaging/macosx/Wireshark package.pmdoc/01wireshark-contents.xml
@@ -1 +1 @@
-<pkg-contents spec="1.12"><f n="Wireshark.app" o="gcombs" g="staff" p="16877" pt="/Users/gcombs/Development/wireshark/packaging/macosx/Wireshark.app" m="false" t="file"><f n="Contents" o="gcombs" g="staff" p="16877"><f n="Info.plist" o="gcombs" g="staff" p="33188"/><f n="MacOS" o="gcombs" g="staff" p="16877"><f n="Wireshark" o="gcombs" g="staff" p="33261"/></f><f n="PkgInfo" o="gcombs" g="staff" p="33188"/><f n="Resources" o="gcombs" g="staff" p="16877"><f n="bin" o="gcombs" g="staff" p="16877"><f n="capinfos" o="gcombs" g="staff" p="41453"/><f n="capinfos-bin" o="gcombs" g="staff" p="33261"/><f n="dftest" o="gcombs" g="staff" p="41453"/><f n="dftest-bin" o="gcombs" g="staff" p="33261"/><f n="dumpcap" o="gcombs" g="staff" p="41453"/><f n="dumpcap-bin" o="gcombs" g="staff" p="33261"/><f n="editcap" o="gcombs" g="staff" p="41453"/><f n="editcap-bin" o="gcombs" g="staff" p="33261"/><f n="getdisplay.sh" o="gcombs" g="staff" p="33261"/><f n="idl2wrs" o="gcombs" g="staff" p="41453"/><f n="idl2wrs-bin" o="gcombs" g="staff" p="33261"/><f n="mergecap" o="gcombs" g="staff" p="41453"/><f n="mergecap-bin" o="gcombs" g="staff" p="33261"/><f n="randpkt" o="gcombs" g="staff" p="41453"/><f n="randpkt-bin" o="gcombs" g="staff" p="33261"/><f n="rawshark" o="gcombs" g="staff" p="41453"/><f n="rawshark-bin" o="gcombs" g="staff" p="33261"/><f n="text2pcap" o="gcombs" g="staff" p="41453"/><f n="text2pcap-bin" o="gcombs" g="staff" p="33261"/><f n="tshark" o="gcombs" g="staff" p="41453"/><f n="tshark-bin" o="gcombs" g="staff" p="33261"/><f n="wireshark" o="gcombs" g="staff" p="33261"/><f n="wireshark-bin" o="gcombs" g="staff" p="33261"/></f><f n="etc" o="gcombs" g="staff" p="16877"><f n="fonts" o="gcombs" g="staff" p="16877"><f n="conf.avail" o="gcombs" g="staff" p="16877"><f n="10-autohint.conf" o="gcombs" g="staff" p="33188"/><f n="10-no-sub-pixel.conf" o="gcombs" g="staff" p="33188"/><f n="10-sub-pixel-bgr.conf" o="gcombs" g="staff" p="33188"/><f n="10-sub-pixel-rgb.conf" o="gcombs" g="staff" p="33188"/><f n="10-sub-pixel-vbgr.conf" o="gcombs" g="staff" p="33188"/><f n="10-sub-pixel-vrgb.conf" o="gcombs" g="staff" p="33188"/><f n="10-unhinted.conf" o="gcombs" g="staff" p="33188"/><f n="20-fix-globaladvance.conf" o="gcombs" g="staff" p="33188"/><f n="20-unhint-small-vera.conf" o="gcombs" g="staff" p="33188"/><f n="25-unhint-nonlatin.conf" o="gcombs" g="staff" p="33188"/><f n="30-metric-aliases.conf" o="gcombs" g="staff" p="33188"/><f n="30-urw-aliases.conf" o="gcombs" g="staff" p="33188"/><f n="40-nonlatin.conf" o="gcombs" g="staff" p="33188"/><f n="45-latin.conf" o="gcombs" g="staff" p="33188"/><f n="49-sansserif.conf" o="gcombs" g="staff" p="33188"/><f n="50-user.conf" o="gcombs" g="staff" p="33188"/><f n="51-local.conf" o="gcombs" g="staff" p="33188"/><f n="60-latin.conf" o="gcombs" g="staff" p="33188"/><f n="65-fonts-persian.conf" o="gcombs" g="staff" p="33188"/><f n="65-khmer.conf" o="gcombs" g="staff" p="33188"/><f n="65-nonlatin.conf" o="gcombs" g="staff" p="33188"/><f n="69-unifont.conf" o="gcombs" g="staff" p="33188"/><f n="70-no-bitmaps.conf" o="gcombs" g="staff" p="33188"/><f n="70-yes-bitmaps.conf" o="gcombs" g="staff" p="33188"/><f n="80-delicious.conf" o="gcombs" g="staff" p="33188"/><f n="90-synthetic.conf" o="gcombs" g="staff" p="33188"/></f><f n="conf.d" o="gcombs" g="staff" p="16877"><f n="20-fix-globaladvance.conf" o="gcombs" g="staff" p="33188"/><f n="20-unhint-small-vera.conf" o="gcombs" g="staff" p="33188"/><f n="30-metric-aliases.conf" o="gcombs" g="staff" p="33188"/><f n="30-urw-aliases.conf" o="gcombs" g="staff" p="33188"/><f n="40-nonlatin.conf" o="gcombs" g="staff" p="33188"/><f n="45-latin.conf" o="gcombs" g="staff" p="33188"/><f n="49-sansserif.conf" o="gcombs" g="staff" p="33188"/><f n="50-user.conf" o="gcombs" g="staff" p="33188"/><f n="51-local.conf" o="gcombs" g="staff" p="33188"/><f n="60-latin.conf" o="gcombs" g="staff" p="33188"/><f n="65-fonts-persian.conf" o="gcombs" g="staff" p="33188"/><f n="65-nonlatin.conf" o="gcombs" g="staff" p="33188"/><f n="69-unifont.conf" o="gcombs" g="staff" p="33188"/><f n="80-delicious.conf" o="gcombs" g="staff" p="33188"/><f n="90-synthetic.conf" o="gcombs" g="staff" p="33188"/><f n="README" o="gcombs" g="staff" p="33188"/></f><f n="fonts.conf" o="gcombs" g="staff" p="33188"/><f n="fonts.dtd" o="gcombs" g="staff" p="33188"/></f><f n="gtk-2.0" o="gcombs" g="staff" p="16877"><f n="gdk-pixbuf.loaders" o="gcombs" g="staff" p="33188"/><f n="gtk.immodules" o="gcombs" g="staff" p="33188"/></f><f n="pango" o="gcombs" g="staff" p="16877"><f n="pango.modules" o="gcombs" g="staff" p="33188"/><f n="pangorc" o="gcombs" g="staff" p="33188"/><f n="pangox.aliases" o="gcombs" g="staff" p="33188"/></f></f><f n="lib" o="gcombs" g="staff" p="16877"><f n="gdk-pixbuf-2.0" o="gcombs" g="staff" p="16877"><f n="2.10.0" o="gcombs" g="staff" p="16877"><f n="loaders" o="gcombs" g="staff" p="16877"><f n="libpixbufloader-ani.la" o="gcombs" g="staff" p="33261"/><f n="libpixbufloader-ani.so" o="gcombs" g="staff" p="33261"/><f n="libpixbufloader-bmp.la" o="gcombs" g="staff" p="33261"/><f n="libpixbufloader-bmp.so" o="gcombs" g="staff" p="33261"/><f n="libpixbufloader-gif.la" o="gcombs" g="staff" p="33261"/><f n="libpixbufloader-gif.so" o="gcombs" g="staff" p="33261"/><f n="libpixbufloader-icns.la" o="gcombs" g="staff" p="33261"/><f n="libpixbufloader-icns.so" o="gcombs" g="staff" p="33261"/><f n="libpixbufloader-ico.la" o="gcombs" g="staff" p="33261"/><f n="libpixbufloader-ico.so" o="gcombs" g="staff" p="33261"/><f n="libpixbufloader-jasper.la" o="gcombs" g="staff" p="33261"/><f n="libpixbufloader-jasper.so" o="gcombs" g="staff" p="33261"/><f n="libpixbufloader-jpeg.la" o="gcombs" g="staff" p="33261"/><f n="libpixbufloader-jpeg.so" o="gcombs" g="staff" p="33261"/><f n="libpixbufloader-pcx.la" o="gcombs" g="staff" p="33261"/><f n="libpixbufloader-pcx.so" o="gcombs" g="staff" p="33261"/><f n="libpixbufloader-png.la" o="gcombs" g="staff" p="33261"/><f n="libpixbufloader-png.so" o="gcombs" g="staff" p="33261"/><f n="libpixbufloader-pnm.la" o="gcombs" g="staff" p="33261"/><f n="libpixbufloader-pnm.so" o="gcombs" g="staff" p="33261"/><f n="libpixbufloader-qtif.la" o="gcombs" g="staff" p="33261"/><f n="libpixbufloader-qtif.so" o="gcombs" g="staff" p="33261"/><f n="libpixbufloader-ras.la" o="gcombs" g="staff" p="33261"/><f n="libpixbufloader-ras.so" o="gcombs" g="staff" p="33261"/><f n="libpixbufloader-tga.la" o="gcombs" g="staff" p="33261"/><f n="libpixbufloader-tga.so" o="gcombs" g="staff" p="33261"/><f n="libpixbufloader-tiff.la" o="gcombs" g="staff" p="33261"/><f n="libpixbufloader-tiff.so" o="gcombs" g="staff" p="33261"/><f n="libpixbufloader-wbmp.la" o="gcombs" g="staff" p="33261"/><f n="libpixbufloader-wbmp.so" o="gcombs" g="staff" p="33261"/><f n="libpixbufloader-xbm.la" o="gcombs" g="staff" p="33261"/><f n="libpixbufloader-xbm.so" o="gcombs" g="staff" p="33261"/><f n="libpixbufloader-xpm.la" o="gcombs" g="staff" p="33261"/><f n="libpixbufloader-xpm.so" o="gcombs" g="staff" p="33261"/></f></f></f><f n="gtk-2.0" o="gcombs" g="staff" p="16877"><f n="2.10.0" o="gcombs" g="staff" p="16877"><f n="engines" o="gcombs" g="staff" p="16877"><f n="libclearlooks.la" o="gcombs" g="staff" p="33261"/><f n="libclearlooks.so" o="gcombs" g="staff" p="33261"/><f n="libcrux-engine.la" o="gcombs" g="staff" p="33261"/><f n="libcrux-engine.so" o="gcombs" g="staff" p="33261"/><f n="libglide.la" o="gcombs" g="staff" p="33261"/><f n="libglide.so" o="gcombs" g="staff" p="33261"/><f n="libhcengine.la" o="gcombs" g="staff" p="33261"/><f n="libhcengine.so" o="gcombs" g="staff" p="33261"/><f n="libindustrial.la" o="gcombs" g="staff" p="33261"/><f n="libindustrial.so" o="gcombs" g="staff" p="33261"/><f n="libmist.la" o="gcombs" g="staff" p="33261"/><f n="libmist.so" o="gcombs" g="staff" p="33261"/><f n="libpixmap.a" o="gcombs" g="staff" p="33188"/><f n="libpixmap.la" o="gcombs" g="staff" p="33261"/><f n="libpixmap.so" o="gcombs" g="staff" p="33261"/><f n="libredmond95.la" o="gcombs" g="staff" p="33261"/><f n="libredmond95.so" o="gcombs" g="staff" p="33261"/><f n="libthinice.la" o="gcombs" g="staff" p="33261"/><f n="libthinice.so" o="gcombs" g="staff" p="33261"/></f><f n="immodules" o="gcombs" g="staff" p="16877"><f n="im-am-et.a" o="gcombs" g="staff" p="33188"/><f n="im-am-et.la" o="gcombs" g="staff" p="33261"/><f n="im-am-et.so" o="gcombs" g="staff" p="33261"/><f n="im-cedilla.a" o="gcombs" g="staff" p="33188"/><f n="im-cedilla.la" o="gcombs" g="staff" p="33261"/><f n="im-cedilla.so" o="gcombs" g="staff" p="33261"/><f n="im-cyrillic-translit.a" o="gcombs" g="staff" p="33188"/><f n="im-cyrillic-translit.la" o="gcombs" g="staff" p="33261"/><f n="im-cyrillic-translit.so" o="gcombs" g="staff" p="33261"/><f n="im-inuktitut.a" o="gcombs" g="staff" p="33188"/><f n="im-inuktitut.la" o="gcombs" g="staff" p="33261"/><f n="im-inuktitut.so" o="gcombs" g="staff" p="33261"/><f n="im-ipa.a" o="gcombs" g="staff" p="33188"/><f n="im-ipa.la" o="gcombs" g="staff" p="33261"/><f n="im-ipa.so" o="gcombs" g="staff" p="33261"/><f n="im-multipress.a" o="gcombs" g="staff" p="33188"/><f n="im-multipress.la" o="gcombs" g="staff" p="33261"/><f n="im-multipress.so" o="gcombs" g="staff" p="33261"/><f n="im-thai.a" o="gcombs" g="staff" p="33188"/><f n="im-thai.la" o="gcombs" g="staff" p="33261"/><f n="im-thai.so" o="gcombs" g="staff" p="33261"/><f n="im-ti-er.a" o="gcombs" g="staff" p="33188"/><f n="im-ti-er.la" o="gcombs" g="staff" p="33261"/><f n="im-ti-er.so" o="gcombs" g="staff" p="33261"/><f n="im-ti-et.a" o="gcombs" g="staff" p="33188"/><f n="im-ti-et.la" o="gcombs" g="staff" p="33261"/><f n="im-ti-et.so" o="gcombs" g="staff" p="33261"/><f n="im-viqr.a" o="gcombs" g="staff" p="33188"/><f n="im-viqr.la" o="gcombs" g="staff" p="33261"/><f n="im-viqr.so" o="gcombs" g="staff" p="33261"/><f n="im-xim.a" o="gcombs" g="staff" p="33188"/><f n="im-xim.la" o="gcombs" g="staff" p="33261"/><f n="im-xim.so" o="gcombs" g="staff" p="33261"/></f><f n="loaders" o="gcombs" g="staff" p="16877"/><f n="printbackends" o="gcombs" g="staff" p="16877"><f n="libprintbackend-cups.a" o="gcombs" g="staff" p="33188"/><f n="libprintbackend-cups.la" o="gcombs" g="staff" p="33261"/><f n="libprintbackend-cups.so" o="gcombs" g="staff" p="33261"/><f n="libprintbackend-file.a" o="gcombs" g="staff" p="33188"/><f n="libprintbackend-file.la" o="gcombs" g="staff" p="33261"/><f n="libprintbackend-file.so" o="gcombs" g="staff" p="33261"/><f n="libprintbackend-lpr.a" o="gcombs" g="staff" p="33188"/><f n="libprintbackend-lpr.la" o="gcombs" g="staff" p="33261"/><f n="libprintbackend-lpr.so" o="gcombs" g="staff" p="33261"/></f></f></f><f n="libatk-1.0.0.dylib" o="gcombs" g="staff" p="33261"/><f n="libcairo.2.dylib" o="gcombs" g="staff" p="33261"/><f n="libcares.2.dylib" o="gcombs" g="staff" p="33261"/><f n="libcrypto.1.0.0.dylib" o="gcombs" g="staff" p="33261"/><f n="libexpat.1.dylib" o="gcombs" g="staff" p="33261"/><f n="libfontconfig.1.dylib" o="gcombs" g="staff" p="33261"/><f n="libfreetype.6.dylib" o="gcombs" g="staff" p="33261"/><f n="libgcrypt.11.dylib" o="gcombs" g="staff" p="33261"/><f n="libgdk-x11-2.0.0.dylib" o="gcombs" g="staff" p="33261"/><f n="libgdk_pixbuf-2.0.0.dylib" o="gcombs" g="staff" p="33261"/><f n="libGeoIP.1.dylib" o="gcombs" g="staff" p="33261"/><f n="libgio-2.0.0.dylib" o="gcombs" g="staff" p="33261"/><f n="libglib-2.0.0.dylib" o="gcombs" g="staff" p="33261"/><f n="libgmodule-2.0.0.dylib" o="gcombs" g="staff" p="33261"/><f n="libgnutls.26.dylib" o="gcombs" g="staff" p="33261"/><f n="libgobject-2.0.0.dylib" o="gcombs" g="staff" p="33261"/><f n="libgpg-error.0.dylib" o="gcombs" g="staff" p="33261"/><f n="libgthread-2.0.0.dylib" o="gcombs" g="staff" p="33261"/><f n="libgtk-x11-2.0.0.dylib" o="gcombs" g="staff" p="33261"/><f n="libiconv.2.dylib" o="gcombs" g="staff" p="33188"/><f n="libintl.8.dylib" o="gcombs" g="staff" p="33188"/><f n="libjasper.1.dylib" o="gcombs" g="staff" p="33261"/><f n="libjpeg.8.dylib" o="gcombs" g="staff" p="33261"/><f n="libpango-1.0.0.dylib" o="gcombs" g="staff" p="33261"/><f n="libpangocairo-1.0.0.dylib" o="gcombs" g="staff" p="33261"/><f n="libpangoft2-1.0.0.dylib" o="gcombs" g="staff" p="33261"/><f n="libpangox-1.0.0.dylib" o="gcombs" g="staff" p="33261"/><f n="libpcap.A.dylib" o="gcombs" g="staff" p="33261"/><f n="libpixman-1.0.dylib" o="gcombs" g="staff" p="33261"/><f n="libpng12.0.dylib" o="gcombs" g="staff" p="33261"/><f n="libportaudio.2.dylib" o="gcombs" g="staff" p="33261"/><f n="libsmi.2.dylib" o="gcombs" g="staff" p="33261"/><f n="libtasn1.3.dylib" o="gcombs" g="staff" p="33261"/><f n="libtiff.3.dylib" o="gcombs" g="staff" p="33261"/><f n="libwireshark.0.dylib" o="gcombs" g="staff" p="33261"/><f n="libwireshark.dylib" o="gcombs" g="staff" p="41453"/><f n="libwireshark.la" o="gcombs" g="staff" p="33261"/><f n="libwiretap.0.dylib" o="gcombs" g="staff" p="33261"/><f n="libwiretap.dylib" o="gcombs" g="staff" p="41453"/><f n="libwiretap.la" o="gcombs" g="staff" p="33261"/><f n="libwsutil.0.dylib" o="gcombs" g="staff" p="33261"/><f n="libwsutil.dylib" o="gcombs" g="staff" p="41453"/><f n="libwsutil.la" o="gcombs" g="staff" p="33261"/><f n="libX11.6.dylib" o="gcombs" g="staff" p="33261"/><f n="libXau.6.dylib" o="gcombs" g="staff" p="33261"/><f n="libxcb.1.dylib" o="gcombs" g="staff" p="33261"/><f n="libXcomposite.1.dylib" o="gcombs" g="staff" p="33261"/><f n="libXcursor.1.dylib" o="gcombs" g="staff" p="33261"/><f n="libXdamage.1.dylib" o="gcombs" g="staff" p="33261"/><f n="libXdmcp.6.dylib" o="gcombs" g="staff" p="33261"/><f n="libXext.6.dylib" o="gcombs" g="staff" p="33261"/><f n="libXfixes.3.dylib" o="gcombs" g="staff" p="33261"/><f n="libXi.6.dylib" o="gcombs" g="staff" p="33261"/><f n="libXinerama.1.dylib" o="gcombs" g="staff" p="33261"/><f n="libXrandr.2.dylib" o="gcombs" g="staff" p="33261"/><f n="libXrender.1.dylib" o="gcombs" g="staff" p="33261"/><f n="libz.1.dylib" o="gcombs" g="staff" p="33261"/><f n="pango" o="gcombs" g="staff" p="16877"><f n="1.6.0" o="gcombs" g="staff" p="16877"><f n="modules" o="gcombs" g="staff" p="16877"><f n="pango-arabic-fc.so" o="gcombs" g="staff" p="33261"/><f n="pango-arabic-lang.so" o="gcombs" g="staff" p="33261"/><f n="pango-basic-fc.so" o="gcombs" g="staff" p="33261"/><f n="pango-basic-x.so" o="gcombs" g="staff" p="33261"/><f n="pango-hangul-fc.so" o="gcombs" g="staff" p="33261"/><f n="pango-hebrew-fc.so" o="gcombs" g="staff" p="33261"/><f n="pango-indic-fc.so" o="gcombs" g="staff" p="33261"/><f n="pango-indic-lang.so" o="gcombs" g="staff" p="33261"/><f n="pango-khmer-fc.so" o="gcombs" g="staff" p="33261"/><f n="pango-syriac-fc.so" o="gcombs" g="staff" p="33261"/><f n="pango-thai-fc.so" o="gcombs" g="staff" p="33261"/><f n="pango-tibetan-fc.so" o="gcombs" g="staff" p="33261"/></f></f></f><f n="wireshark" o="gcombs" g="staff" p="16877"><f n="plugins" o="gcombs" g="staff" p="16877"><f n="asn1.la" o="gcombs" g="staff" p="33261"/><f n="asn1.so" o="gcombs" g="staff" p="33261"/><f n="coseventcomm.la" o="gcombs" g="staff" p="33261"/><f n="coseventcomm.so" o="gcombs" g="staff" p="33261"/><f n="cosnaming.la" o="gcombs" g="staff" p="33261"/><f n="cosnaming.so" o="gcombs" g="staff" p="33261"/><f n="docsis.la" o="gcombs" g="staff" p="33261"/><f n="docsis.so" o="gcombs" g="staff" p="33261"/><f n="ethercat.la" o="gcombs" g="staff" p="33261"/><f n="ethercat.so" o="gcombs" g="staff" p="33261"/><f n="gryphon.la" o="gcombs" g="staff" p="33261"/><f n="gryphon.so" o="gcombs" g="staff" p="33261"/><f n="interlink.la" o="gcombs" g="staff" p="33261"/><f n="interlink.so" o="gcombs" g="staff" p="33261"/><f n="irda.la" o="gcombs" g="staff" p="33261"/><f n="irda.so" o="gcombs" g="staff" p="33261"/><f n="m2m.la" o="gcombs" g="staff" p="33261"/><f n="m2m.so" o="gcombs" g="staff" p="33261"/><f n="mate.la" o="gcombs" g="staff" p="33261"/><f n="mate.so" o="gcombs" g="staff" p="33261"/><f n="opcua.la" o="gcombs" g="staff" p="33261"/><f n="opcua.so" o="gcombs" g="staff" p="33261"/><f n="parlay.la" o="gcombs" g="staff" p="33261"/><f n="parlay.so" o="gcombs" g="staff" p="33261"/><f n="profinet.la" o="gcombs" g="staff" p="33261"/><f n="profinet.so" o="gcombs" g="staff" p="33261"/><f n="sercosiii.la" o="gcombs" g="staff" p="33261"/><f n="sercosiii.so" o="gcombs" g="staff" p="33261"/><f n="stats_tree.la" o="gcombs" g="staff" p="33261"/><f n="stats_tree.so" o="gcombs" g="staff" p="33261"/><f n="tango.la" o="gcombs" g="staff" p="33261"/><f n="tango.so" o="gcombs" g="staff" p="33261"/><f n="unistim.la" o="gcombs" g="staff" p="33261"/><f n="unistim.so" o="gcombs" g="staff" p="33261"/><f n="wimax.la" o="gcombs" g="staff" p="33261"/><f n="wimax.so" o="gcombs" g="staff" p="33261"/><f n="wimaxasncp.la" o="gcombs" g="staff" p="33261"/><f n="wimaxasncp.so" o="gcombs" g="staff" p="33261"/></f><f n="python" o="gcombs" g="staff" p="16877"/></f></f><f n="MenuBar.nib" o="gcombs" g="staff" p="16877"><f n="classes.nib" o="gcombs" g="staff" p="33188"/><f n="info.nib" o="gcombs" g="staff" p="33188"/><f n="objects.xib" o="gcombs" g="staff" p="33188"/></f><f n="openDoc" o="gcombs" g="staff" p="33261"/><f n="ProgressWindow.nib" o="gcombs" g="staff" p="16877"><f n="classes.nib" o="gcombs" g="staff" p="33188"/><f n="info.nib" o="gcombs" g="staff" p="33188"/><f n="objects.xib" o="gcombs" g="staff" p="33188"/></f><f n="script" o="gcombs" g="staff" p="33261"/><f n="share" o="gcombs" g="staff" p="16877"><f n="man" o="gcombs" g="staff" p="16877"><f n="man1" o="gcombs" g="staff" p="16877"><f n="capinfos.1" o="gcombs" g="staff" p="33188"/><f n="dftest.1" o="gcombs" g="staff" p="33188"/><f n="dumpcap.1" o="gcombs" g="staff" p="33188"/><f n="editcap.1" o="gcombs" g="staff" p="33188"/><f n="idl2wrs.1" o="gcombs" g="staff" p="33188"/><f n="mergecap.1" o="gcombs" g="staff" p="33188"/><f n="randpkt.1" o="gcombs" g="staff" p="33188"/><f n="rawshark.1" o="gcombs" g="staff" p="33188"/><f n="text2pcap.1" o="gcombs" g="staff" p="33188"/><f n="tshark.1" o="gcombs" g="staff" p="33188"/><f n="wireshark.1" o="gcombs" g="staff" p="33188"/></f><f n="man4" o="gcombs" g="staff" p="16877"><f n="wireshark-filter.4" o="gcombs" g="staff" p="33188"/></f></f><f n="wireshark" o="gcombs" g="staff" p="16877"><f n="AUTHORS-SHORT" o="gcombs" g="staff" p="33188"/><f n="capinfos.html" o="gcombs" g="staff" p="33188"/><f n="cfilters" o="gcombs" g="staff" p="33188"/><f n="colorfilters" o="gcombs" g="staff" p="33188"/><f n="console.lua" o="gcombs" g="staff" p="33188"/><f n="COPYING" o="gcombs" g="staff" p="33188"/><f n="dfilters" o="gcombs" g="staff" p="33188"/><f n="dftest.html" o="gcombs" g="staff" p="33188"/><f n="diameter" o="gcombs" g="staff" p="16877"><f n="chargecontrol.xml" o="gcombs" g="staff" p="33188"/><f n="dictionary.dtd" o="gcombs" g="staff" p="33188"/><f n="dictionary.xml" o="gcombs" g="staff" p="33188"/><f n="eap.xml" o="gcombs" g="staff" p="33188"/><f n="Ericsson.xml" o="gcombs" g="staff" p="33188"/><f n="etsie2e4.xml" o="gcombs" g="staff" p="33188"/><f n="gqpolicy.xml" o="gcombs" g="staff" p="33188"/><f n="imscxdx.xml" o="gcombs" g="staff" p="33188"/><f n="mobileipv4.xml" o="gcombs" g="staff" p="33188"/><f n="mobileipv6.xml" o="gcombs" g="staff" p="33188"/><f n="nasreq.xml" o="gcombs" g="staff" p="33188"/><f n="sip.xml" o="gcombs" g="staff" p="33188"/><f n="sunping.xml" o="gcombs" g="staff" p="33188"/><f n="TGPPGmb.xml" o="gcombs" g="staff" p="33188"/><f n="TGPPRx.xml" o="gcombs" g="staff" p="33188"/><f n="TGPPSh.xml" o="gcombs" g="staff" p="33188"/></f><f n="dtd_gen.lua" o="gcombs" g="staff" p="33188"/><f n="dtds" o="gcombs" g="staff" p="16877"><f n="dc.dtd" o="gcombs" g="staff" p="33188"/><f n="itunes.dtd" o="gcombs" g="staff" p="33188"/><f n="mscml.dtd" o="gcombs" g="staff" p="33188"/><f n="pocsettings.dtd" o="gcombs" g="staff" p="33188"/><f n="presence.dtd" o="gcombs" g="staff" p="33188"/><f n="reginfo.dtd" o="gcombs" g="staff" p="33188"/><f n="rlmi.dtd" o="gcombs" g="staff" p="33188"/><f n="rss.dtd" o="gcombs" g="staff" p="33188"/><f n="smil.dtd" o="gcombs" g="staff" p="33188"/><f n="watcherinfo.dtd" o="gcombs" g="staff" p="33188"/><f n="xcap-caps.dtd" o="gcombs" g="staff" p="33188"/><f n="xcap-error.dtd" o="gcombs" g="staff" p="33188"/></f><f n="dumpcap.html" o="gcombs" g="staff" p="33188"/><f n="editcap.html" o="gcombs" g="staff" p="33188"/><f n="help" o="gcombs" g="staff" p="16877"><f n="capture_filters.txt" o="gcombs" g="staff" p="33188"/><f n="capturing.txt" o="gcombs" g="staff" p="33188"/><f n="display_filters.txt" o="gcombs" g="staff" p="33188"/><f n="faq.txt" o="gcombs" g="staff" p="33188"/><f n="getting_started.txt" o="gcombs" g="staff" p="33188"/><f n="overview.txt" o="gcombs" g="staff" p="33188"/><f n="toc" o="gcombs" g="staff" p="33188"/></f><f n="idl2wrs.html" o="gcombs" g="staff" p="33188"/><f n="init.lua" o="gcombs" g="staff" p="33188"/><f n="ipmap.html" o="gcombs" g="staff" p="33188"/><f n="manuf" o="gcombs" g="staff" p="33188"/><f n="mergecap.html" o="gcombs" g="staff" p="33188"/><f n="radius" o="gcombs" g="staff" p="16877"><f n="dictionary" o="gcombs" g="staff" p="33188"/><f n="dictionary.3com" o="gcombs" g="staff" p="33188"/><f n="dictionary.3gpp" o="gcombs" g="staff" p="33188"/><f n="dictionary.3gpp2" o="gcombs" g="staff" p="33188"/><f n="dictionary.acc" o="gcombs" g="staff" p="33188"/><f n="dictionary.airespace" o="gcombs" g="staff" p="33188"/><f n="dictionary.alcatel" o="gcombs" g="staff" p="33188"/><f n="dictionary.alteon" o="gcombs" g="staff" p="33188"/><f n="dictionary.altiga" o="gcombs" g="staff" p="33188"/><f n="dictionary.alvarion" o="gcombs" g="staff" p="33188"/><f n="dictionary.apc" o="gcombs" g="staff" p="33188"/><f n="dictionary.aptis" o="gcombs" g="staff" p="33188"/><f n="dictionary.aruba" o="gcombs" g="staff" p="33188"/><f n="dictionary.ascend" o="gcombs" g="staff" p="33188"/><f n="dictionary.asn" o="gcombs" g="staff" p="33188"/><f n="dictionary.avaya" o="gcombs" g="staff" p="33188"/><f n="dictionary.azaire" o="gcombs" g="staff" p="33188"/><f n="dictionary.bay" o="gcombs" g="staff" p="33188"/><f n="dictionary.bintec" o="gcombs" g="staff" p="33188"/><f n="dictionary.bristol" o="gcombs" g="staff" p="33188"/><f n="dictionary.cablelabs" o="gcombs" g="staff" p="33188"/><f n="dictionary.cabletron" o="gcombs" g="staff" p="33188"/><f n="dictionary.chillispot" o="gcombs" g="staff" p="33188"/><f n="dictionary.cisco" o="gcombs" g="staff" p="33188"/><f n="dictionary.cisco.bbsm" o="gcombs" g="staff" p="33188"/><f n="dictionary.cisco.vpn3000" o="gcombs" g="staff" p="33188"/><f n="dictionary.cisco.vpn5000" o="gcombs" g="staff" p="33188"/><f n="dictionary.clavister" o="gcombs" g="staff" p="33188"/><f n="dictionary.colubris" o="gcombs" g="staff" p="33188"/><f n="dictionary.columbia_university" o="gcombs" g="staff" p="33188"/><f n="dictionary.compat" o="gcombs" g="staff" p="33188"/><f n="dictionary.cosine" o="gcombs" g="staff" p="33188"/><f n="dictionary.dhcp" o="gcombs" g="staff" p="33188"/><f n="dictionary.digium" o="gcombs" g="staff" p="33188"/><f n="dictionary.eltex" o="gcombs" g="staff" p="33188"/><f n="dictionary.epygi" o="gcombs" g="staff" p="33188"/><f n="dictionary.ericsson" o="gcombs" g="staff" p="33188"/><f n="dictionary.erx" o="gcombs" g="staff" p="33188"/><f n="dictionary.extreme" o="gcombs" g="staff" p="33188"/><f n="dictionary.fortinet" o="gcombs" g="staff" p="33188"/><f n="dictionary.foundry" o="gcombs" g="staff" p="33188"/><f n="dictionary.freeradius" o="gcombs" g="staff" p="33188"/><f n="dictionary.freeradius.internal" o="gcombs" g="staff" p="33188"/><f n="dictionary.freeswitch" o="gcombs" g="staff" p="33188"/><f n="dictionary.gandalf" o="gcombs" g="staff" p="33188"/><f n="dictionary.garderos" o="gcombs" g="staff" p="33188"/><f n="dictionary.gemtek" o="gcombs" g="staff" p="33188"/><f n="dictionary.h3c" o="gcombs" g="staff" p="33188"/><f n="dictionary.hp" o="gcombs" g="staff" p="33188"/><f n="dictionary.huawei" o="gcombs" g="staff" p="33188"/><f n="dictionary.infonet" o="gcombs" g="staff" p="33188"/><f n="dictionary.ipunplugged" o="gcombs" g="staff" p="33188"/><f n="dictionary.issanni" o="gcombs" g="staff" p="33188"/><f n="dictionary.itk" o="gcombs" g="staff" p="33188"/><f n="dictionary.jradius" o="gcombs" g="staff" p="33188"/><f n="dictionary.juniper" o="gcombs" g="staff" p="33188"/><f n="dictionary.karlnet" o="gcombs" g="staff" p="33188"/><f n="dictionary.lancom" o="gcombs" g="staff" p="33188"/><f n="dictionary.livingston" o="gcombs" g="staff" p="33188"/><f n="dictionary.localweb" o="gcombs" g="staff" p="33188"/><f n="dictionary.lucent" o="gcombs" g="staff" p="33188"/><f n="dictionary.manzara" o="gcombs" g="staff" p="33188"/><f n="dictionary.merit" o="gcombs" g="staff" p="33188"/><f n="dictionary.microsoft" o="gcombs" g="staff" p="33188"/><f n="dictionary.mikrotik" o="gcombs" g="staff" p="33188"/><f n="dictionary.motorola" o="gcombs" g="staff" p="33188"/><f n="dictionary.navini" o="gcombs" g="staff" p="33188"/><f n="dictionary.netscreen" o="gcombs" g="staff" p="33188"/><f n="dictionary.networkphysics" o="gcombs" g="staff" p="33188"/><f n="dictionary.nexans" o="gcombs" g="staff" p="33188"/><f n="dictionary.nokia" o="gcombs" g="staff" p="33188"/><f n="dictionary.nokia.conflict" o="gcombs" g="staff" p="33188"/><f n="dictionary.nomadix" o="gcombs" g="staff" p="33188"/><f n="dictionary.nortel" o="gcombs" g="staff" p="33188"/><f n="dictionary.ntua" o="gcombs" g="staff" p="33188"/><f n="dictionary.openser" o="gcombs" g="staff" p="33188"/><f n="dictionary.packeteer" o="gcombs" g="staff" p="33188"/><f n="dictionary.patton" o="gcombs" g="staff" p="33188"/><f n="dictionary.propel" o="gcombs" g="staff" p="33188"/><f n="dictionary.prosoft" o="gcombs" g="staff" p="33188"/><f n="dictionary.quiconnect" o="gcombs" g="staff" p="33188"/><f n="dictionary.quintum" o="gcombs" g="staff" p="33188"/><f n="dictionary.redback" o="gcombs" g="staff" p="33188"/><f n="dictionary.redcreek" o="gcombs" g="staff" p="33188"/><f n="dictionary.rfc2865" o="gcombs" g="staff" p="33188"/><f n="dictionary.rfc2866" o="gcombs" g="staff" p="33188"/><f n="dictionary.rfc2867" o="gcombs" g="staff" p="33188"/><f n="dictionary.rfc2868" o="gcombs" g="staff" p="33188"/><f n="dictionary.rfc2869" o="gcombs" g="staff" p="33188"/><f n="dictionary.rfc3162" o="gcombs" g="staff" p="33188"/><f n="dictionary.rfc3576" o="gcombs" g="staff" p="33188"/><f n="dictionary.rfc3580" o="gcombs" g="staff" p="33188"/><f n="dictionary.rfc4072" o="gcombs" g="staff" p="33188"/><f n="dictionary.rfc4372" o="gcombs" g="staff" p="33188"/><f n="dictionary.rfc4675" o="gcombs" g="staff" p="33188"/><f n="dictionary.rfc4679" o="gcombs" g="staff" p="33188"/><f n="dictionary.rfc4818" o="gcombs" g="staff" p="33188"/><f n="dictionary.rfc4849" o="gcombs" g="staff" p="33188"/><f n="dictionary.rfc5090" o="gcombs" g="staff" p="33188"/><f n="dictionary.rfc5176" o="gcombs" g="staff" p="33188"/><f n="dictionary.riverstone" o="gcombs" g="staff" p="33188"/><f n="dictionary.roaringpenguin" o="gcombs" g="staff" p="33188"/><f n="dictionary.shasta" o="gcombs" g="staff" p="33188"/><f n="dictionary.shiva" o="gcombs" g="staff" p="33188"/><f n="dictionary.slipstream" o="gcombs" g="staff" p="33188"/><f n="dictionary.sofaware" o="gcombs" g="staff" p="33188"/><f n="dictionary.sonicwall" o="gcombs" g="staff" p="33188"/><f n="dictionary.springtide" o="gcombs" g="staff" p="33188"/><f n="dictionary.starent" o="gcombs" g="staff" p="33188"/><f n="dictionary.t_systems_nova" o="gcombs" g="staff" p="33188"/><f n="dictionary.telebit" o="gcombs" g="staff" p="33188"/><f n="dictionary.telkom" o="gcombs" g="staff" p="33188"/><f n="dictionary.trapeze" o="gcombs" g="staff" p="33188"/><f n="dictionary.tropos" o="gcombs" g="staff" p="33188"/><f n="dictionary.tunnel" o="gcombs" g="staff" p="33188"/><f n="dictionary.unisphere" o="gcombs" g="staff" p="33188"/><f n="dictionary.unix" o="gcombs" g="staff" p="33188"/><f n="dictionary.usr" o="gcombs" g="staff" p="33188"/><f n="dictionary.utstarcom" o="gcombs" g="staff" p="33188"/><f n="dictionary.valemount" o="gcombs" g="staff" p="33188"/><f n="dictionary.versanet" o="gcombs" g="staff" p="33188"/><f n="dictionary.vqp" o="gcombs" g="staff" p="33188"/><f n="dictionary.walabi" o="gcombs" g="staff" p="33188"/><f n="dictionary.waverider" o="gcombs" g="staff" p="33188"/><f n="dictionary.wimax" o="gcombs" g="staff" p="33188"/><f n="dictionary.wispr" o="gcombs" g="staff" p="33188"/><f n="dictionary.xedia" o="gcombs" g="staff" p="33188"/><f n="dictionary.xylan" o="gcombs" g="staff" p="33188"/><f n="dictionary.zyxel" o="gcombs" g="staff" p="33188"/><f n="README.radius_dictionary" o="gcombs" g="staff" p="33188"/></f><f n="randpkt.html" o="gcombs" g="staff" p="33188"/><f n="rawshark.html" o="gcombs" g="staff" p="33188"/><f n="services" o="gcombs" g="staff" p="33188"/><f n="smi_modules" o="gcombs" g="staff" p="33188"/><f n="text2pcap.html" o="gcombs" g="staff" p="33188"/><f n="tpncp" o="gcombs" g="staff" p="16877"><f n="tpncp.dat" o="gcombs" g="staff" p="33188"/></f><f n="tshark.html" o="gcombs" g="staff" p="33188"/><f n="wimaxasncp" o="gcombs" g="staff" p="16877"><f n="dictionary.dtd" o="gcombs" g="staff" p="33188"/><f n="dictionary.xml" o="gcombs" g="staff" p="33188"/></f><f n="wireshark-filter.html" o="gcombs" g="staff" p="33188"/><f n="wireshark.html" o="gcombs" g="staff" p="33188"/><f n="ws.css" o="gcombs" g="staff" p="33188"/></f></f><f n="themes" o="gcombs" g="staff" p="16877"><f n="Clearlooks-Quicksilver-OSX" o="gcombs" g="staff" p="16877"><f n="gtk-2.0" o="gcombs" g="staff" p="16877"><f n="gtkrc" o="gcombs" g="staff" p="33188"/><f n="pre_gtkrc" o="gcombs" g="staff" p="33188"/><f n="Scrollbars" o="gcombs" g="staff" p="16877"><f n="stepper-down.png" o="gcombs" g="staff" p="33188"/><f n="stepper-left.png" o="gcombs" g="staff" p="33188"/><f n="stepper-right.png" o="gcombs" g="staff" p="33188"/><f n="stepper-up.png" o="gcombs" g="staff" p="33188"/><f n="trough-scrollbar-horiz.png" o="gcombs" g="staff" p="33188"/><f n="trough-scrollbar-vert.png" o="gcombs" g="staff" p="33188"/></f><f n="Scrollbars_1" o="gcombs" g="staff" p="16877"><f n="copy-slider.sh" o="gcombs" g="staff" p="33261"/><f n="slider-horiz-prelight.png" o="gcombs" g="staff" p="33188"/><f n="slider-horiz.png" o="gcombs" g="staff" p="33188"/><f n="slider-vert-prelight.png" o="gcombs" g="staff" p="33188"/><f n="slider-vert.png" o="gcombs" g="staff" p="33188"/></f><f n="Scrollbars_6" o="gcombs" g="staff" p="16877"><f n="copy-slider.sh" o="gcombs" g="staff" p="33261"/><f n="slider-horiz-prelight.png" o="gcombs" g="staff" p="33188"/><f n="slider-horiz.png" o="gcombs" g="staff" p="33188"/><f n="slider-vert-prelight.png" o="gcombs" g="staff" p="33188"/><f n="slider-vert.png" o="gcombs" g="staff" p="33188"/></f><f n="sync_osx_look.sh" o="gcombs" g="staff" p="33261"/></f></f></f><f n="Wireshark.icns" o="gcombs" g="staff" p="33188"/><f n="Wiresharkdoc.icns" o="gcombs" g="staff" p="33188"/></f></f></f></pkg-contents>
\ No newline at end of file
+<pkg-contents spec="1.12"/>
\ No newline at end of file
diff --git a/packaging/macosx/Wireshark package.pmdoc/01wireshark.xml b/packaging/macosx/Wireshark package.pmdoc/01wireshark.xml
index ed839b4faf..1c7f2427b0 100644
--- a/packaging/macosx/Wireshark package.pmdoc/01wireshark.xml
+++ b/packaging/macosx/Wireshark package.pmdoc/01wireshark.xml
@@ -1 +1 @@
-<pkgref spec="1.12" uuid="0B0ABFF7-3A3D-4F37-B998-DC99734E0EFC"><config><identifier>org.wireshark.Wireshark.pkg</identifier><version>0.0.0.0</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true" includeRoot="true">Wireshark.app</installFrom><installTo>/Applications</installTo><flags><followSymbolicLinks/><allowRevert/><mod>allowRevert</mod></flags><packageStore type="internal"></packageStore><mod>scripts.scriptsDirectoryPath.isAbsoluteType</mod><mod>scripts.scriptsDirectoryPath.isRelativeType</mod><mod>installTo</mod><mod>scripts.postinstall.path</mod><mod>includeRoot</mod><mod>scripts.postinstall.isRelativeType</mod><mod>installFrom.isRelativeType</mod><mod>version</mod><mod>parent</mod><mod>scripts.scriptsDirectoryPath.path</mod><mod>identifier</mod><mod>relocatable</mod><mod>requireAuthorization</mod><mod>extraFiles</mod><mod>postInstall</mod></config><scripts><postinstall relative="true" mod="true">Scripts/wireshark-postinstall.sh</postinstall><scripts-dir relative="true" mod="true">Scripts</scripts-dir><scripts-element/></scripts><contents><file-list>01wireshark-contents.xml</file-list><component id="org.wireshark.Wireshark" path="/Users/gcombs/Development/wireshark/packaging/macosx/Wireshark.app" version="1.5.2" isRelocatable="true"><locator-info><token title="pkmk-token-8"><search-rule><combo identifier="org.wireshark.Wireshark" default-path="/Applications/Wireshark.app"/></search-rule></token></locator-info></component><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents><extra-files/></pkgref>
\ No newline at end of file
+<pkgref spec="1.12" uuid="0B0ABFF7-3A3D-4F37-B998-DC99734E0EFC"><config><identifier>org.wireshark.Wireshark.pkg</identifier><version>0.0.0.0</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true" includeRoot="true">Wireshark.app</installFrom><installTo>/Applications</installTo><flags><followSymbolicLinks/><allowRevert/><mod>allowRevert</mod></flags><packageStore type="internal"></packageStore><mod>scripts.scriptsDirectoryPath.isAbsoluteType</mod><mod>scripts.scriptsDirectoryPath.isRelativeType</mod><mod>installTo</mod><mod>scripts.postinstall.path</mod><mod>installFrom.isRelativeType</mod><mod>includeRoot</mod><mod>scripts.postinstall.isRelativeType</mod><mod>version</mod><mod>parent</mod><mod>scripts.scriptsDirectoryPath.path</mod><mod>identifier</mod><mod>relocatable</mod><mod>requireAuthorization</mod><mod>extraFiles</mod><mod>postInstall</mod></config><scripts><postinstall relative="true" mod="true">Scripts/wireshark-postinstall.sh</postinstall><scripts-dir relative="true" mod="true">Scripts</scripts-dir><scripts-element/></scripts><extra-files/></pkgref>
\ No newline at end of file
diff --git a/packaging/macosx/Wireshark package.pmdoc/02chmodbpf.xml b/packaging/macosx/Wireshark package.pmdoc/02chmodbpf.xml
index 8d5aa4f35b..c795f60f9a 100644
--- a/packaging/macosx/Wireshark package.pmdoc/02chmodbpf.xml
+++ b/packaging/macosx/Wireshark package.pmdoc/02chmodbpf.xml
@@ -1 +1 @@
-<pkgref spec="1.12" uuid="67B4E446-7EE6-4D65-9616-CECAA7FB2094"><config><identifier>org.wireshark.wireshark.ChmodBPF.pkg</identifier><version>1.0</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" includeRoot="true">ChmodBPF</installFrom><installTo mod="true">/Library/StartupItems</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo</mod><mod>scripts.postinstall.path</mod><mod>includeRoot</mod><mod>installFrom.isRelativeType</mod><mod>version</mod><mod>parent</mod><mod>scripts.scriptsDirectoryPath.path</mod><mod>requireAuthorization</mod><mod>identifier</mod><mod>extraFiles</mod><mod>installTo.path</mod><mod>postInstall</mod></config><scripts><postinstall relative="true" mod="true">Scripts/chmodbpf-postinstall.sh</postinstall><scripts-dir relative="true" mod="true">Scripts</scripts-dir><scripts-element/></scripts><extra-files/><additionalPkgInfoXML><pkg-info><scripts><postinstall file="./postinstall"/></scripts></pkg-info></additionalPkgInfoXML></pkgref>
\ No newline at end of file
+<pkgref spec="1.12" uuid="67B4E446-7EE6-4D65-9616-CECAA7FB2094"><config><identifier>org.wireshark.ChmodBPF.pkg</identifier><version>1.0</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" includeRoot="true">ChmodBPF</installFrom><installTo mod="true">/Library/StartupItems</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo</mod><mod>scripts.postinstall.path</mod><mod>includeRoot</mod><mod>installFrom.isRelativeType</mod><mod>version</mod><mod>parent</mod><mod>scripts.scriptsDirectoryPath.path</mod><mod>requireAuthorization</mod><mod>identifier</mod><mod>extraFiles</mod><mod>installTo.path</mod><mod>postInstall</mod></config><scripts><postinstall relative="true" mod="true">Scripts/chmodbpf-postinstall.sh</postinstall><scripts-dir relative="true" mod="true">Scripts</scripts-dir><scripts-element/></scripts><extra-files/><additionalPkgInfoXML><pkg-info><scripts><postinstall file="./postinstall"/></scripts></pkg-info></additionalPkgInfoXML></pkgref>
\ No newline at end of file
diff --git a/packaging/macosx/Wireshark package.pmdoc/03utility-contents.xml b/packaging/macosx/Wireshark package.pmdoc/03utility-contents.xml
index bc1e5a791f..708bcaeb25 100644
--- a/packaging/macosx/Wireshark package.pmdoc/03utility-contents.xml
+++ b/packaging/macosx/Wireshark package.pmdoc/03utility-contents.xml
@@ -1 +1 @@
-<pkg-contents spec="1.12"/>
\ No newline at end of file
+<pkg-contents spec="1.12"><f n="utility-launcher" o="root" g="wheel" p="33261" pt="/Users/gcombs/Development/wireshark/packaging/macosx/utility-launcher" m="false" t="file"><mod>group</mod><mod>owner</mod></f></pkg-contents>
\ No newline at end of file
diff --git a/packaging/macosx/Wireshark package.pmdoc/03utility.xml b/packaging/macosx/Wireshark package.pmdoc/03utility.xml
index 7880890e22..169a298bf8 100644
--- a/packaging/macosx/Wireshark package.pmdoc/03utility.xml
+++ b/packaging/macosx/Wireshark package.pmdoc/03utility.xml
@@ -1 +1 @@
-<pkgref spec="1.12" uuid="F7F04C41-A94E-4CCA-A8F5-8B774B8D9151"><config><identifier>org.wireshark.cli.pkg</identifier><version>1.0</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true">utility-launcher</installFrom><installTo mod="true" relocatable="true">/Library/Wireshark</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo</mod><mod>relocatable</mod><mod>scripts.scriptsDirectoryPath.isRelativeType</mod><mod>identifier</mod><mod>parent</mod><mod>installTo.path</mod><mod>installFrom.isRelativeType</mod><mod>scripts.postinstall.isRelativeType</mod></config><scripts><postinstall relative="true" mod="true">Scripts/cli-postinstall.sh</postinstall><scripts-dir relative="true" mod="true">Scripts</scripts-dir></scripts></pkgref>
\ No newline at end of file
+<pkgref spec="1.12" uuid="F7F04C41-A94E-4CCA-A8F5-8B774B8D9151"><config><identifier>org.wireshark.cli.pkg</identifier><version>1.0</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true">utility-launcher</installFrom><installTo mod="true" relocatable="true">/usr/local/bin</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo</mod><mod>relocatable</mod><mod>scripts.scriptsDirectoryPath.isRelativeType</mod><mod>identifier</mod><mod>parent</mod><mod>installTo.path</mod><mod>installFrom.isRelativeType</mod><mod>scripts.postinstall.isRelativeType</mod></config><scripts><postinstall relative="true" mod="true">Scripts/cli-postinstall.sh</postinstall><scripts-dir relative="true" mod="true">Scripts</scripts-dir></scripts><contents><file-list>03utility-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
\ No newline at end of file
diff --git a/packaging/macosx/Wireshark package.pmdoc/index.xml b/packaging/macosx/Wireshark package.pmdoc/index.xml
index 282d44351b..a05d1414fa 100644
--- a/packaging/macosx/Wireshark package.pmdoc/index.xml
+++ b/packaging/macosx/Wireshark package.pmdoc/index.xml
@@ -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 (requires X11) 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 startup item and add an access_bpf group" description="This installs a startup item (ChmodBPF) 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.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="'10.5.5'"><message-title>Failure</message-title><message>This package requires Mac OS X 10.5.5 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>properties.systemDomain</mod><mod>postinstallActions.actions</mod></pkmkdoc>
\ No newline at end of file
+<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 (requires X11) 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 startup item and add an access_bpf group" description="This installs a startup item (ChmodBPF) 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="'10.5.5'"><message-title>Failure</message-title><message>This package requires Mac OS X 10.5.5 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>
\ No newline at end of file