diff options
author | Gerald Combs <gerald@wireshark.org> | 2014-08-28 16:48:53 -0700 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2014-09-02 15:39:17 +0000 |
commit | b7fb1167e319ed2b1d1fd37f9844b8bc852ccb0d (patch) | |
tree | 4fe0e3ab63d6a6f4644daa82165ca035dd20cd30 /debian/control | |
parent | b9e61becffc42f4b2d7981a0f468effbe9fa4b12 (diff) |
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@wireshark.org>
Diffstat (limited to 'debian/control')
-rw-r--r-- | debian/control | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/debian/control b/debian/control index 009bdbf1bc..1db850ba86 100644 --- a/debian/control +++ b/debian/control @@ -42,15 +42,15 @@ Description: network traffic analyzer - common files Package: wireshark Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, wireshark-common (= ${binary:Version}), xdg-utils +Depends: wireshark-qt Replaces: ethereal (<< 1.0.0-3) Conflicts: ethereal (<< 1.0.0-3) -Description: network traffic analyzer - GTK+ version +Description: network traffic analyzer - meta-package Wireshark is a network "sniffer" - a tool that captures and analyzes packets off the wire. Wireshark can decode too many protocols to list here. . - This package provides the GTK+ version of wireshark. + This is a meta-package for Wireshark. Package: wireshark-qt Architecture: any @@ -62,7 +62,19 @@ Description: network traffic analyzer - Qt version packets off the wire. Wireshark can decode too many protocols to list here. . - This package provides the Qt version of wireshark. + This package provides the Qt version of Wireshark. + +Package: wireshark-gtk +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, wireshark-common (= ${binary:Version}), xdg-utils +Replaces: ethereal (<< 1.0.0-3) +Conflicts: ethereal (<< 1.0.0-3) +Description: network traffic analyzer - GTK+ version + Wireshark is a network "sniffer" - a tool that captures and analyzes + packets off the wire. Wireshark can decode too many protocols to list + here. + . + This package provides the GTK+ version of Wireshark. Package: tshark Architecture: any |