diff -u gnome-applets-2.16.1/debian/changelog gnome-applets-2.16.1/debian/changelog --- gnome-applets-2.16.1/debian/changelog +++ gnome-applets-2.16.1/debian/changelog @@ -1,3 +1,12 @@ +gnome-applets (2.16.1-0ubuntu4~prop1) edgy-proposed; urgency=low + + * Add debian/patches/19_modem-applet_network-admin_gksu.patch: + - Call network-admin through gksu. + - This is necessary due to fixing system-tools-backends to only allow + access to root (bug LP#59946). + + -- Martin Pitt Tue, 5 Dec 2006 16:14:12 +0000 + gnome-applets (2.16.1-0ubuntu3) edgy; urgency=low * debian/patches/17_fix_mute_icon.patch: only in patch2: unchanged: --- gnome-applets-2.16.1.orig/debian/patches/19_modem-applet_network-admin_gksu.patch +++ gnome-applets-2.16.1/debian/patches/19_modem-applet_network-admin_gksu.patch @@ -0,0 +1,39 @@ +diff -Nur gnome-applets-2.16.1/modemlights/modem-applet.c gnome-applets-2.16.1.new/modemlights/modem-applet.c +--- gnome-applets-2.16.1/modemlights/modem-applet.c 2006-12-14 14:59:55.000000000 +0000 ++++ gnome-applets-2.16.1.new/modemlights/modem-applet.c 2006-12-14 15:00:23.000000000 +0000 +@@ -357,22 +357,29 @@ + static gboolean + launch_config_tool (GdkScreen *screen, OobsIface *iface) + { +- gchar *argv[4], *application; ++ gchar *argv[6], *application, *gksu; + gboolean ret; + ++ gksu = g_find_program_in_path ("gksu"); + application = g_find_program_in_path (NETWORK_TOOL); + +- if (!application) ++ if (!application || !gksu) { ++ g_free (application); ++ g_free (gksu); + return FALSE; ++ } + +- argv[0] = application; +- argv[1] = "--configure"; +- argv[2] = (gchar*) oobs_iface_get_device_name (iface); +- argv[3] = NULL; ++ argv[0] = gksu; ++ argv[1] = "--"; ++ argv[2] = application; ++ argv[3] = "--configure"; ++ argv[4] = (gchar*) oobs_iface_get_device_name (iface); ++ argv[5] = NULL; + + ret = gdk_spawn_on_screen (screen, NULL, argv, NULL, 0, + NULL, NULL, NULL, NULL); + g_free (application); ++ g_free (gksu); + return ret; + } +