diff --git a/Makefile.am b/Makefile.am index 665e37e621..57fe846223 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1269,6 +1269,7 @@ EXTRA_DIST = \ text2pcap.h \ services \ wireshark.desktop \ + wireshark-gtk.desktop \ wireshark-mime-package.xml \ wireshark.appdata.xml \ wireshark.pc.in \ @@ -1496,9 +1497,9 @@ if NOT_OS_X install -m 644 $(srcdir)/wireshark.appdata.xml $(DESTDIR)$(datadir)/appdata/wireshark.appdata.xml mkdir -p $(DESTDIR)$(datadir)/applications if test x$(DESKTOP_FILE_INSTALL) != x ; then \ - $(DESKTOP_FILE_INSTALL) --dir $(DESTDIR)$(datadir)/applications $(srcdir)/wireshark.desktop; \ + $(DESKTOP_FILE_INSTALL) --dir $(DESTDIR)$(datadir)/applications $(srcdir)/wireshark.desktop $(srcdir)/wireshark-gtk.desktop ; \ else \ - install -m 644 $(srcdir)/wireshark.desktop $(DESTDIR)$(datadir)/applications/wireshark.desktop; \ + install -m 644 $(srcdir)/wireshark.desktop $(DESTDIR)$(datadir)/applications/wireshark.desktop $(DESTDIR)$(datadir)/applications/wireshark-gtk.desktop; \ fi for size in 16 24 32 48 64 128 256; \ do \ @@ -1517,6 +1518,7 @@ if BUILDING_WIRESHARK if NOT_OS_X rm -f $(DESTDIR)$(datadir)/appdata/wireshark.appdata.xml rm -f $(DESTDIR)$(datadir)/applications/wireshark.desktop + rm -f $(DESTDIR)$(datadir)/applications/wireshark-gtk.desktop rm -f $(DESTDIR)$(datadir)/mime/packages/wireshark.xml for size in 16 24 32 48 64 128 256; \ do \ diff --git a/debian/wireshark-gtk.install b/debian/wireshark-gtk.install index 08564948a6..d3a74709dc 100644 --- a/debian/wireshark-gtk.install +++ b/debian/wireshark-gtk.install @@ -1,4 +1,4 @@ usr/bin/wireshark-gtk -wireshark.desktop usr/share/applications/ +wireshark-gtk.desktop usr/share/applications/ usr/share/icons/ usr/share/mime/packages/ diff --git a/packaging/rpm/SPECS/wireshark.spec.in b/packaging/rpm/SPECS/wireshark.spec.in index 3dc70140b1..a4a4124e25 100644 --- a/packaging/rpm/SPECS/wireshark.spec.in +++ b/packaging/rpm/SPECS/wireshark.spec.in @@ -293,6 +293,7 @@ touch %{buildroot}%{_bindir}/wireshark # Fedora's packaging guidelines (https://fedoraproject.org/wiki/Packaging:Guidelines) # require this (at least if desktop-file-install was not used to install it). desktop-file-validate %{buildroot}%{_datadir}/applications/wireshark.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/wireshark-gtk.desktop %endif %endif @@ -400,6 +401,7 @@ fi %files qt %defattr(-,root,root) %{_datadir}/applications/wireshark.desktop +%{_datadir}/applications/wireshark-gtk.desktop %{_datadir}/appdata/wireshark.appdata.xml %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/icons/hicolor/*/mimetypes/* @@ -413,6 +415,7 @@ fi %files gnome %defattr(-,root,root) %{_datadir}/applications/wireshark.desktop +%{_datadir}/applications/wireshark-gtk.desktop %{_datadir}/appdata/wireshark.appdata.xml %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/icons/hicolor/*/mimetypes/* diff --git a/wireshark-gtk.desktop b/wireshark-gtk.desktop new file mode 100644 index 0000000000..bfffeef913 --- /dev/null +++ b/wireshark-gtk.desktop @@ -0,0 +1,111 @@ +[Desktop Entry] +# The format of this file is specified at +# http://standards.freedesktop.org/desktop-entry-spec/1.0/ +# The entries are in the order they are listed in version 1.0 +Type=Application +# This is the version of the spec for this file, not the application version. +Version=1.0 +Name=Wireshark (GTK+) +Name[vi]=Wireshark (GTK+) +GenericName=Network Analyzer +GenericName[af]=Netwerk Analiseerder +GenericName[az]=Şəbəkə Analiz Proqramı +GenericName[bg]=Анализатор на мрежови трафик +GenericName[bs]=Mrežni analizer +GenericName[ca]=Analitzador de xarxa +GenericName[cs]=Analyzátor sítě +GenericName[da]=Netværksanalyse +GenericName[de]=Programm für die Netzwerk-Analyse +GenericName[el]=Αναλυτής Δικτύων +GenericName[en_GB]=Network Analyser +GenericName[eo]=Retanalizilo +GenericName[es]=Analizador de redes +GenericName[et]=Võrguliikluse analüsaator +GenericName[eu]=Sare ikerketaria +GenericName[fa]=تحلیل‌گر شبکه +GenericName[fi]=Verkkoanalysaattori +GenericName[fr]=Analyseur réseau +GenericName[he]=מאבחן רשת +GenericName[hr]=Program za analiziranje mreža +GenericName[hu]=hálózatanalizáló +GenericName[id]=Analisis jaringan +GenericName[is]=Netskoðunartól +GenericName[it]=Analizzatore di rete +GenericName[ja]=ネットワークアナライザ +GenericName[ko]=네트웍 분석기 +GenericName[lo]=ເຄື່ອງມືວິເຄາະເຄືອຂ່າຍ +GenericName[lt]=Tinklo analizatorius +GenericName[lv]=Tīkla Analizators +GenericName[mk]=Анализатор на мрежи +GenericName[mn]=Сүлжээ-шинжлэлийн програм +GenericName[mt]=Analizzatur tan-network +GenericName[nb]=Nettverksanalysator +GenericName[nl]=netwerkanalyseprogramma +GenericName[nn]=Nettverksanalysator +GenericName[nso]=Moahlaahli wa Kgokagano +GenericName[pl]=Analizator sieci +GenericName[pt]=Analisador de Redes +GenericName[pt_BR]=Analisador de rede +GenericName[ro]=Analizor de reţea +GenericName[ru]=Анализатор сетевого трафика +GenericName[se]=Fierbmeanalysa +GenericName[sk]=Analyzátor siete +GenericName[sl]=Analizator omrežij +GenericName[sr]=Analizatror mreže +GenericName[ss]=Sihlatiyi seluchungechunge +GenericName[sv]=Nätverksanalyserare +GenericName[ta]=Å¨Ä ¬öÅ¡Ç÷ +GenericName[th]=เครื่องมือวิเคราะห์เครือข่าย +GenericName[tr]=Ağ Analiz Programı +GenericName[uk]=Аналізатор мережі +GenericName[ven]=Musengulusi wa Vhukwamani +GenericName[vi]=Trình phân tích mạng +GenericName[xh]=Umcukucezi Womsebenzi womnatha +GenericName[zh_CN]=网络分析程序 +GenericName[zh_TW]=網路分析程式 +GenericName[zu]=Umhloli Woxhumano olusakazekile +Comment=Network traffic analyzer +Comment[fi]=Verkkoliikenne analysaattori +Comment[fr]=Analyseur de trafic réseau +Comment[sv]=Nätverkstrafikanalysator +Comment[af]=Netwerkverkeer analiseerder +Comment[sq]=Analizues i trafikut të rrjetit +Comment[ast]=Analizador de tráficu de rede +Comment[bn]=নেটওয়ার্ক ট্রাফিক বিশ্লেষক +Comment[bg]=Анализатор на мрежовия трафик +Comment[bs]=Analizator mrežnoga prometa +Comment[pt_BR]=Analisador de tráfego de rede +Comment[et]=Võrguliikluse analüüsija +Comment[nl]=Netwerkverkeer analyseren +Comment[da]=Netværkstrafikanalyse +Comment[cs]=Analyzátor síťového přenosu +Comment[gl]=Analizador do tráfico de rede +Comment[el]=Ανάλυση κίνησης δικτύου +Comment[de]=Netzwerkverkehr-Analyseprogramm +Comment[hu]=Hálózatiforgalom-elemző +Comment[it]=Analizzatore del traffico di rete +Comment[ja]=ネットワークトラフィックアナライザー +Comment[ko]=네트워크 트래픽 분석기 +Comment[ky]=Тармактык трафикти анализдөө +Comment[lt]=Tinklo duomenų srauto analizatorius +Comment[ms]=Penganalisa trafik rangkaian +Comment[nb]=Nettverkstrafikk-analysator +Comment[oc]=Analisador de tramas de ret +Comment[pt]=Analisador de tráfego da rede +Comment[pl]=Analizator ruchu sieciowego +Comment[ro]=Analizator trafic de rețea +Comment[ru]=Анализ сетевого трафика +Comment[sk]=Analyzátor sieťovej premávky +Comment[es]=Analizador de tráfico de red +Comment[sl]=Preučevalnik omrežnega prometa +Comment[tr]=Ağ trafiği çözümleyicisi +Comment[vi]=Trình phân tích giao thông mạng +Comment[uk]=Аналізатор мережевого трафіку +Icon=wireshark +TryExec=wireshark-gtk +Exec=wireshark-gtk %f +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;