Work in progress
authorMati Aharoni (Kali Linux Developer) <muts@kali.org>
Wed, 5 Dec 2012 13:37:58 +0000 (08:37 -0500)
committerMati Aharoni (Kali Linux Developer) <muts@kali.org>
Wed, 5 Dec 2012 13:37:58 +0000 (08:37 -0500)
debian/kali-wireshark.desktop [new file with mode: 0644]
debian/patches/00list
debian/patches/08_wireshark-desktop-menu.patch [deleted file]
debian/patches/series
debian/rules
debian/wireshark-root.desktop [deleted file]
debian/wireshark.desktop [deleted file]
debian/wireshark.menu [deleted file]

diff --git a/debian/kali-wireshark.desktop b/debian/kali-wireshark.desktop
new file mode 100644 (file)
index 0000000..5b28669
--- /dev/null
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=wireshark
+Encoding=UTF-8
+Exec=sh -c "wireshark"
+Icon=kali-menu.png
+StartupNotify=false
+Terminal=false
+Type=Application
+Categories=07-03-network-sniffers;01-05-network-traffic-analysis;
index 9149b58..837423d 100644 (file)
@@ -5,7 +5,6 @@
 #05_plugin-libdir
 #06_giop-buffer
 #07_gcc4
-#08_wireshark-desktop-menu
 #09_idl2wrs
 #10_wireshark_gen
 #14_disable-cmip
diff --git a/debian/patches/08_wireshark-desktop-menu.patch b/debian/patches/08_wireshark-desktop-menu.patch
deleted file mode 100755 (executable)
index c64e764..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Change Icon and Categories for desktop file
-Forwarded: not-needed
-Author: <fred@candle>
-
-Index: b/wireshark.desktop
-===================================================================
---- a/wireshark.desktop        2010-02-15 17:23:17.000000000 +0100
-+++ b/wireshark.desktop        2010-02-15 17:24:59.000000000 +0100
-@@ -68,11 +68,12 @@
- Comment[fi]=Verkkoliikenne analysaattori
- Comment[fr]=Analyseur de trafic réseau
- Comment[sv]=Nätverkstrafikanalysator
--Icon=wireshark.png
-+Icon=wireshark
- TryExec=wireshark
- Exec=wireshark %f
- Terminal=false
- MimeType=application/vnd.tcpdump.pcap;
- # Categorie entry according to version 1.0 of
- # http://www.freedesktop.org/wiki/Specifications/menu-spec
--Categories=System;Monitor;GTK;
-+Categories=GNOME;Network;
-+Encoding=UTF-8
index 0551cbb..4c1cbe7 100644 (file)
@@ -4,7 +4,6 @@
 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
 17_fix_from_1.8.3_fix_HSRP_crash.patch
index 5ac8f75..e6d033c 100755 (executable)
@@ -77,7 +77,7 @@ install: build
        rm -rf $(CURDIR)/debian/tmp/usr/share/wireshark/COPYING
        cp debian/license-text-about-dialog $(CURDIR)/debian/tmp/usr/share/wireshark/ABOUT.GPL
        mkdir -p $(CURDIR)/debian/tmp/usr/share/applications/
-       cp wireshark.desktop $(CURDIR)/debian/tmp/usr/share/applications/
+       cp kali-wireshark.desktop $(CURDIR)/debian/tmp/usr/share/applications/
        cp tools/idl2wrs $(CURDIR)/debian/tmp/usr/bin/
        # icon for menu system
        mkdir -p $(CURDIR)/debian/tmp/usr/share/pixmaps/
diff --git a/debian/wireshark-root.desktop b/debian/wireshark-root.desktop
deleted file mode 100644 (file)
index fb70a56..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-[Desktop Entry]
-# $Id: wireshark-root.desktop 25408 2008-06-02 07:26:34Z jake $
-# The format of this file is specified at
-# http://freedesktop.org/Standards/desktop-entry-spec
-# The entries are in the order they are listed in version 1.0
-Type=Application
-Version=1.0
-Name=Wireshark (as root)
-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
-Icon=hi48-app-wireshark.png
-TryExec=su-to-root
-Exec=su-to-root -X -c /usr/bin/wireshark
-Terminal=false
-# Categorie entry according to version 1.0 of
-# http://www.freedesktop.org/wiki/Specifications/menu-spec
-Categories=System;Monitor;GTK;
diff --git a/debian/wireshark.desktop b/debian/wireshark.desktop
deleted file mode 100644 (file)
index 8af9875..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-[Desktop Entry]
-# $Id: wireshark.desktop 25408 2008-06-02 07:26:34Z jake $
-# The format of this file is specified at
-# http://freedesktop.org/Standards/desktop-entry-spec
-# The entries are in the order they are listed in version 1.0
-Type=Application
-Version=1.0
-Name=Wireshark
-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
-Icon=hi48-app-wireshark.png
-Exec=wireshark
-Terminal=false
-# Categorie entry according to version 1.0 of
-# http://www.freedesktop.org/wiki/Specifications/menu-spec
-Categories=System;Monitor;GTK;
diff --git a/debian/wireshark.menu b/debian/wireshark.menu
deleted file mode 100644 (file)
index 4cd16e6..0000000
+++ /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"
-