Change "System" category to "Network" in desktop files

Change-Id: I39346deaa9265f9684804688c36ab42ab4eee621
Reviewed-on: https://code.wireshark.org/review/14241
Petri-Dish: Balint Reczey <balint@balintreczey.hu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>

4 files changed, 2 insertions, 25 deletions

diff --git a/debian/patches/08_wireshark-desktop-menu.patch b/debian/patches/08_wireshark-desktop-menu.patch
deleted file mode 100755
index e23a5032cd..0000000000
--- a/debian/patches/08_wireshark-desktop-menu.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Change Icon and Categories for desktop file
-Forwarded: not-needed
-Author: <fred@candle>
-
---- a/wireshark.desktop
-+++ b/wireshark.desktop
-@@ -108,4 +108,5 @@
- MimeType=application/vnd.tcpdump.pcap;application/x-pcapng;application/x-snoop;application/x-iptrace;application/x-lanalyzer;application/x-nettl;application/x-radcom;application/x-etherpeek;application/x-visualnetworks;application/x-netinstobserver;application/x-5view;application/x-tektronix-rf5;
- # Category entry according to:
- # http://standards.freedesktop.org/menu-spec/1.0/
--Categories=System;Monitor;Qt;
-+Categories=Network;
-+Encoding=UTF-8
---- a/wireshark-gtk.desktop
-+++ b/wireshark-gtk.desktop
-@@ -108,4 +108,5 @@
- MimeType=application/vnd.tcpdump.pcap;application/x-pcapng;application/x-snoop;application/x-iptrace;application/x-lanalyzer;application/x-nettl;application/x-radcom;application/x-etherpeek;application/x-visualnetworks;application/x-netinstobserver;application/x-5view;application/x-tektronix-rf5;
- # Category entry according to:
- # http://standards.freedesktop.org/menu-spec/1.0/
--Categories=System;Monitor;GTK;
-+Categories=Network;
-+Encoding=UTF-8
diff --git a/debian/patches/series b/debian/patches/series
index 2224742cb3..1c2ddbf31c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,5 @@
 04_asn2wrs_ply.patch
 05_note-README-when-running-as-root.patch
 06_release-version.patch
-08_wireshark-desktop-menu.patch
 09_idl2wrs.patch
 16_licence_about_location.patch
diff --git a/wireshark-gtk.desktop b/wireshark-gtk.desktop
index 026db73fc2..50668fd648 100644
--- a/wireshark-gtk.desktop
+++ b/wireshark-gtk.desktop
@@ -108,4 +108,4 @@ Terminal=false
 MimeType=application/vnd.tcpdump.pcap;application/x-pcapng;application/x-snoop;application/x-iptrace;application/x-lanalyzer;application/x-nettl;application/x-radcom;application/x-etherpeek;application/x-visualnetworks;application/x-netinstobserver;application/x-5view;application/x-tektronix-rf5;
 # Category entry according to:
 # http://standards.freedesktop.org/menu-spec/1.0/
-Categories=System;Monitor;GTK;
+Categories=Network;Monitor;GTK;
diff --git a/wireshark.desktop b/wireshark.desktop
index 4868c20634..e985f98cba 100644
--- a/wireshark.desktop
+++ b/wireshark.desktop
@@ -108,4 +108,4 @@ Terminal=false
 MimeType=application/vnd.tcpdump.pcap;application/x-pcapng;application/x-snoop;application/x-iptrace;application/x-lanalyzer;application/x-nettl;application/x-radcom;application/x-etherpeek;application/x-visualnetworks;application/x-netinstobserver;application/x-5view;application/x-tektronix-rf5;
 # Category entry according to:
 # http://standards.freedesktop.org/menu-spec/1.0/
-Categories=System;Monitor;Qt;
+Categories=Network;Monitor;Qt;