Wireshark · Wireshark-commits: [Wireshark-commits] master b7fb116: Qt → wireshark. GTK+ → wireshark-gtk.

[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=b7fb1167e319ed2b1d1fd37f9844b8bc852ccb0d
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

b7fb116 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Qt → wireshark. GTK+ → wireshark-gtk.
    
    Make sure the Qt UI is named "Wireshark" and its executable is named
    "wireshark" or "wireshark.exe". Make sure the GTK+ UI is named
    "Wireshark 1" or "Wireshark (GTK+)" depending on how much the target
    audience is likely to care about UI toolkits. Make sure the GTK+
    executable is named "wireshark-gtk" or "wireshark-gtk.exe".
    
    It looks like moving to Qt 5.3 (g978faf3) broke the PortableApps
    package. It's likely even more broken now.
    
    Autotools out-of-tree builds also broke on Ubuntu 12.02 (automake
    1.11.3) at some point. The first attempt to compile in ui/qt returns
    "error: source_file.cpp: No such file or directory". The second attempt
    works. Out-of-tree builds work fine on Ubuntu 14.04 (automake 1.14.1).
    
    Tested:
    
    - Nmake builds
    
    - NSIS packaging
    
    - CMake builds (Windows, OS X)
    
    - Autotools build and distcheck
    
    - RPM packaging
    
    To do:
    
    - Test Debian packaging
    
    - Fix PortableApps
    
    Change-Id: I66429870e05fd2d6fc901942477959ed6164fce2
    Reviewed-on: https://code.wireshark.org/review/3919
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  b9e61be   RTPS: added new PIDs and included minor improvements - (Updated) Fixed code review issues - (Updated) Fixed whitespaces and code review issues - Representing now some NTP times as duration (not as date) - Added some vendor specific PIDs (RTI) - Added dissect_APP_ACK_CONF, dissect_APP_ACK and   dissect_HEARTBEAT_VIRTUAL - Added is_discovery to dissect_serialize_data to avoid malformed   packets when using mutable types (Wireshark assumes serialized   data with CDR-PL en [...]
    adds  b7fb116   Qt → wireshark. GTK+ → wireshark-gtk.


Summary of changes:
 CMakeLists.txt                                     |   46 ++++----
 CMakeOptions.txt                                   |   35 +++---
 Makefile.am                                        |   55 +++++-----
 Makefile.nmake                                     |   26 ++---
 config.nmake                                       |    1 +
 configure.ac                                       |   16 +--
 debian/control                                     |   20 +++-
 debian/rules                                       |    4 +-
 debian/{wireshark.docs => wireshark-gtk.docs}      |    0
 .../{wireshark.install => wireshark-gtk.install}   |    2 +-
 debian/wireshark-qt.install                        |    2 +-
 doc/README.qt                                      |    2 +-
 image/Makefile.nmake                               |    1 +
 packaging/nsis/Makefile.nmake                      |    6 +-
 packaging/nsis/common.nsh                          |    8 +-
 packaging/nsis/wireshark.nsi                       |    2 +-
 packaging/portableapps/win32/Makefile.nmake        |    3 +-
 packaging/rpm/SPECS/wireshark.spec.in              |  114 +++++++++++---------
 test/config.sh                                     |    2 +-
 test/suite-capture.sh                              |    6 +-
 test/suite-io.sh                                   |    6 +-
 test/test.sh                                       |    2 +-
 ui/qt/CMakeLists.txt                               |   13 ++-
 ui/qt/Makefile.am                                  |    2 +-
 ui/qt/Makefile.common                              |   26 ++---
 ui/qt/{QtShark.pro => Wireshark.pro}               |   22 ++--
 ui/qt/i18n.qrc                                     |   18 ++--
 ui/qt/{qtshark_de.qm => wireshark_de.qm}           |  Bin 1383 -> 1383 bytes
 ui/qt/{qtshark_de.ts => wireshark_de.ts}           |    0
 ui/qt/{qtshark_en.qm => wireshark_en.qm}           |  Bin 725 -> 725 bytes
 ui/qt/{qtshark_en.ts => wireshark_en.ts}           |    0
 ui/qt/{qtshark_fr.qm => wireshark_fr.qm}           |  Bin 140018 -> 140018 bytes
 ui/qt/{qtshark_fr.ts => wireshark_fr.ts}           |    0
 ui/qt/{qtshark_ja_JP.qm => wireshark_ja_JP.qm}     |  Bin 19047 -> 19047 bytes
 ui/qt/{qtshark_ja_JP.ts => wireshark_ja_JP.ts}     |    0
 ui/qt/{qtshark_pl.qm => wireshark_pl.qm}           |  Bin 31 -> 31 bytes
 ui/qt/{qtshark_pl.ts => wireshark_pl.ts}           |    0
 ui/qt/{qtshark_zh_CN.qm => wireshark_zh_CN.qm}     |  Bin 47918 -> 47918 bytes
 ui/qt/{qtshark_zh_CN.ts => wireshark_zh_CN.ts}     |    0
 39 files changed, 229 insertions(+), 211 deletions(-)
 rename debian/{wireshark.docs => wireshark-gtk.docs} (100%)
 rename debian/{wireshark.install => wireshark-gtk.install} (84%)
 rename ui/qt/{QtShark.pro => Wireshark.pro} (98%)
 rename ui/qt/{qtshark_de.qm => wireshark_de.qm} (100%)
 rename ui/qt/{qtshark_de.ts => wireshark_de.ts} (100%)
 rename ui/qt/{qtshark_en.qm => wireshark_en.qm} (100%)
 rename ui/qt/{qtshark_en.ts => wireshark_en.ts} (100%)
 rename ui/qt/{qtshark_fr.qm => wireshark_fr.qm} (100%)
 rename ui/qt/{qtshark_fr.ts => wireshark_fr.ts} (100%)
 rename ui/qt/{qtshark_ja_JP.qm => wireshark_ja_JP.qm} (100%)
 rename ui/qt/{qtshark_ja_JP.ts => wireshark_ja_JP.ts} (100%)
 rename ui/qt/{qtshark_pl.qm => wireshark_pl.qm} (100%)
 rename ui/qt/{qtshark_pl.ts => wireshark_pl.ts} (100%)
 rename ui/qt/{qtshark_zh_CN.qm => wireshark_zh_CN.qm} (100%)
 rename ui/qt/{qtshark_zh_CN.ts => wireshark_zh_CN.ts} (100%)