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/rules | |
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/rules')
-rwxr-xr-x | debian/rules | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/rules b/debian/rules index 50842c52e3..a3511f1468 100755 --- a/debian/rules +++ b/debian/rules @@ -40,8 +40,8 @@ override_dh_auto_install: $(CURDIR)/debian/tmp/usr/share/mime/packages/ install -m 644 image/wsicon.svg $(CURDIR)/debian/tmp/usr/share/icons/hicolor/scalable/apps/wireshark.svg install -m 644 wireshark-mime-package.xml $(CURDIR)/debian/tmp/usr/share/mime/packages/wireshark.xml - # upstream uses qtshark for binary's name - mv $(CURDIR)/debian/tmp/usr/bin/qtshark $(CURDIR)/debian/tmp/usr/bin/wireshark-qt + # upstream uses wireshark for binary's name + # mv $(CURDIR)/debian/tmp/usr/bin/wireshark $(CURDIR)/debian/tmp/usr/bin/wireshark-qt mkdir -p $(CURDIR)/debian/tmp/etc/wireshark/ mv $(CURDIR)/debian/tmp/usr/share/wireshark/init.lua \ $(CURDIR)/debian/tmp/etc/wireshark/ |