URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=92dd07f222f760b2c5804fd73f51c7472096be43
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-1.10
Repository: wireshark
Commits:
92dd07f 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>
(cherry picked from commit 24350bd6765390cd5547aaf9fd8ae3235a5abfde)
Reviewed-on: https://code.wireshark.org/review/8719
Actions performed:
from 9bf90a5 Get rid of trailing blank line.
adds 92dd07f 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