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>

5 files changed, 20 insertions, 8 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
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/
diff --git a/debian/wireshark.docs b/debian/wireshark-gtk.docs
index e174728f54..e174728f54 100644
--- a/debian/wireshark.docs
+++ b/debian/wireshark-gtk.docs
diff --git a/debian/wireshark.install b/debian/wireshark-gtk.install
index b47eab9df5..895676e445 100644
--- a/debian/wireshark.install
+++ b/debian/wireshark-gtk.install
@@ -1,4 +1,4 @@
-usr/bin/wireshark
+usr/bin/wireshark-gtk
 wireshark.desktop usr/share/applications/
 image/wsicon32.xpm usr/share/pixmaps/
 usr/share/icons/
diff --git a/debian/wireshark-qt.install b/debian/wireshark-qt.install
index 39ef302505..d407ff3384 100644
--- a/debian/wireshark-qt.install
+++ b/debian/wireshark-qt.install
@@ -1 +1 @@
-usr/bin/wireshark-qt
\ No newline at end of file
+usr/bin/wireshark
\ No newline at end of file