aboutsummaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorBalint Reczey <balint@balintreczey.hu>2015-11-08 22:02:47 +0400
committerBalint Reczey <balint@balintreczey.hu>2015-11-11 04:40:42 +0000
commit18a54fcaa4071afb33c393b1270c1488e7a95131 (patch)
tree99a6f39fb6cc418c71f2e5c1a847a62de8406cd2 /debian
parent886de6b91fcc18f6a1b3e275bd0566b27600252f (diff)
debian: Drop menu support
Debian is migrating away from the Debian Menu system to adopt Freedesktop Desktop Entry Specification instead. (.desktop files) Packages providing .desktop files should not provide menu files. https://lists.debian.org/debian-devel-announce/2015/09/msg00000.html Change-Id: I862deee870e9697c590a8323ba8ae2da892b7bb1 Reviewed-on: https://code.wireshark.org/review/11691 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Diffstat (limited to 'debian')
-rwxr-xr-xdebian/rules2
-rw-r--r--debian/wireshark-gtk.install1
-rw-r--r--debian/wireshark.menu5
3 files changed, 0 insertions, 8 deletions
diff --git a/debian/rules b/debian/rules
index 596a738aa5..1189ab2208 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,8 +27,6 @@ override_dh_auto_build:
# some architectures may not support all hardening options but at least
# log the build's hardening results
-$(MAKE) hardening-check
- # create menu icon
- convert image/wsicon32.png image/wsicon32.xpm
# fix links in documentation
sed -i "s|$(CURDIR)/docbook|..|" obj-*/docbook/ws*g_html_chunked/*.html
diff --git a/debian/wireshark-gtk.install b/debian/wireshark-gtk.install
index 895676e445..08564948a6 100644
--- a/debian/wireshark-gtk.install
+++ b/debian/wireshark-gtk.install
@@ -1,5 +1,4 @@
usr/bin/wireshark-gtk
wireshark.desktop usr/share/applications/
-image/wsicon32.xpm usr/share/pixmaps/
usr/share/icons/
usr/share/mime/packages/
diff --git a/debian/wireshark.menu b/debian/wireshark.menu
deleted file mode 100644
index 4cd16e67a4..0000000000
--- a/debian/wireshark.menu
+++ /dev/null
@@ -1,5 +0,0 @@
-?package(wireshark):needs="X11" section="Applications/Network/Monitoring" \
- title="Wireshark" \
- command="/usr/bin/wireshark" \
- icon="/usr/share/pixmaps/wsicon32.xpm"
-