Michael Biebl wrote: > Dan Williams wrote: >> Hi, >> >> In order to start the 0.6.6 release cycle, I've tagged 0.6.5.98 (0.6.6 >> rc1) and uploaded the tarball to: >> >> http://people.redhat.com/dcbw/NetworkManager/0.6.6/NetworkManager-0.6.5.98.tar.gz >> >> Please test and report major issues (crashers, build system issues, etc) >> but _not_ feature requests. There will be one more release candidate, >> versioned 0.6.5.99, before the actual 0.6.6 release. >> > > Hi, > > here are a couple of smaller patches Two more patches: nm-applet 0.6 1.) nm-editor-fdo-categories.patch Use fdo compliant [1] categories Network;Settings; SystemSetup is not defined by the fdo menu spec 2.) nm-applet-makefile.am.patch Install nm-disconnect-wireless-on-exit.sh as SCRIPT, so it is executable by default (It has a #!/bin/sh after all) Install the nm-applet autostart file according to the fdo spec (we already do that for nm-applet 0.7, so I'm just syncing this change) Cheers, Michael [1]http://standards.freedesktop.org/menu-spec/latest/apa.html -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
Index: editor/nm-editor.desktop =================================================================== --- editor/nm-editor.desktop (Revision 525) +++ editor/nm-editor.desktop (Arbeitskopie) @@ -6,7 +6,7 @@ Exec=nm-editor Terminal=false Type=Application -Categories=System;SystemSetup; +Categories=Network;Settings; OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=NetworkManager
Index: Makefile.am =================================================================== --- Makefile.am (Revision 525) +++ Makefile.am (Arbeitskopie) @@ -11,14 +11,14 @@ dbusservice_DATA = nm-applet.conf toolsdir = $(datadir)/nm-applet -tools_DATA = nm-disconnect-wireless-on-exit.sh +tools_SCRIPTS = nm-disconnect-wireless-on-exit.sh EXTRA_DIST += \ $(dbusservice_DATA) \ - nm-applet.desktop \ + $(autostart_DATA) \ $(tools_DATA) DISTCLEANFILES = intltool-extract intltool-merge intltool-update -autostartdir = $(datadir)/gnome/autostart +autostartdir = $(sysconfdir)/xdg/autostart autostart_DATA = nm-applet.desktop
Attachment:
signature.asc
Description: OpenPGP digital signature