Hello Guy, I'll have a look at both wireshark.desktop files. Any file for Debian packaging purposes *must* be in the debian/ directory, that's 'the Debian way'. The one in the top I'm not sure of, yet.
I also considered the status of wireshark-root.desktop. First of all it's not used by default in the package build. The required command is commented out in rules. Still I kept the file available for inclusion if, for some reason, the package builder needs it for a particular configuration. Thanx, Jaap -----Original Message----- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Guy Harris Sent: 2008-May-31 21:07 To: [email protected] Subject: [Wireshark-dev] Two versions of wireshark.desktop? [EMAIL PROTECTED] wrote: > http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=25406 > > User: jake > Date: 2008/05/31 09:44 AM > > Log: > Update Debian packaging files for Wireshark 1.0. > These files build the package with all features and minimum changes > from the released sources. We now have two wireshark.desktop files, one in the top-level directory and one in the debian directory; the differences between them are: $ diff wireshark.desktop debian 2c2 < # $Id: wireshark.desktop 23928 2007-12-20 14:16:13Z stig $ --- > # $Id: wireshark.desktop 25406 2008-05-31 16:44:02Z jake $ 4,5c4,5 < # http://freedesktop.org/Standards/desktop-entry-spec < # The entries are in the order they are listed in version 1.0 --- > # http://freedesktop.org/Standards/desktop-entry-spec/ > # The entries are in the order they are listed in version 0.9.4 9d8 < Name[vi]=Wireshark 42c41 < GenericName[nb]=Nettverksanalysator --- > GenericName[nb]=Nettverksanalyse 44c43 < GenericName[nn]=Nettverksanalysator --- > GenericName[nn]=Nettverksanalyse 68d66 < Comment[fi]=Verkkoliikenne analysaattori 69a68 > Comment[fi]=Verkkoliikenne analysaattori 71,73c70,72 < Icon=wireshark.png < TryExec=wireshark < Exec=wireshark --- > Icon=hi48-app-wireshark.png > Exec=/usr/bin/wireshark > Path= 75,77c74,82 < # Categorie entry according to version 1.0 of < # http://www.freedesktop.org/wiki/Specifications/menu-spec < Categories=System;Monitor;GTK; --- > MimeType= > Categories=GNOME;Network; > # Found in Suse 9.1: > # X-KDE-SubstituteUID=true > # Deprecated: > # TerminalOptions= > # BinaryPattern=wireshark > # MapNotify=true > # Protocols= Is there a reason not to have just one "wireshark.desktop" file? If not, can it be in the top-level directory, or does the way Debian packaging is done require that it be in the "debian" directory? Also, given that Wireshark 1.0 is not supposed to be run as root (only dumpcap needs privileges), is there any reason to have a wireshark-root.desktop file? _______________________________________________ Wireshark-dev mailing list [email protected] http://www.wireshark.org/mailman/listinfo/wireshark-dev _______________________________________________ Wireshark-dev mailing list [email protected] http://www.wireshark.org/mailman/listinfo/wireshark-dev
