Wireshark-commits: [Wireshark-commits] master-1.12 24350bd: Make the XQuartz fixer a separate subpa

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Fri, 29 May 2015 04:08:20 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=24350bd6765390cd5547aaf9fd8ae3235a5abfde
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

24350bd by Guy Harris (guy@xxxxxxxxxxxx):

    Make the XQuartz fixer a separate subpackage.
    
    That appears to be what PackageMaker or whatever it's called wants.
    Make it a hidden package that gets installed by default.
    
    Change-Id: Ib834f0dd8914b768fa2c26d45c3faf69c1494941
    Bug-Ping: 10640
    Reviewed-on: https://code.wireshark.org/review/8680
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  e08aa73   is_linux_bonding_device() is only used if we HAVE_PCAP_CREATE so only define it if we HAVE_PCAP_CREATE.
    adds  24350bd   Make the XQuartz fixer a separate subpackage.


Summary of changes:
 packaging/macosx/Makefile.am                       |    3 +++
 packaging/macosx/Scripts/wireshark-postinstall.sh  |   17 -----------------
 .../macosx/Scripts/xquartzfixer-postinstall.sh     |   18 ++++++++++++++++++
 .../04xquartzfixer-contents.xml                    |    1 +
 .../Wireshark_package.pmdoc/04xquartzfixer.xml     |    1 +
 .../macosx/Wireshark_package.pmdoc/index.xml.in    |    2 +-
 6 files changed, 24 insertions(+), 18 deletions(-)
 create mode 100755 packaging/macosx/Scripts/xquartzfixer-postinstall.sh
 create mode 100644 packaging/macosx/Wireshark_package.pmdoc/04xquartzfixer-contents.xml
 create mode 100644 packaging/macosx/Wireshark_package.pmdoc/04xquartzfixer.xml