[Pkg-utopia-commits] r683 - in packages/experimental/networkmanager/debian: . patches

[Michael Biebl]

Author: mbiebl-guest
Date: 2006-02-28 20:43:53 +0000 (Tue, 28 Feb 2006)
New Revision: 683

Added:
   packages/experimental/networkmanager/debian/patches/timeout.patch
Modified:
   packages/experimental/networkmanager/debian/control
   packages/experimental/networkmanager/debian/network-manager-gnome.install
   packages/experimental/networkmanager/debian/network-manager.dbus-event
Log:
Do not kill NM prematurely. NM needs some time to shutdown.


Modified: packages/experimental/networkmanager/debian/control
===================================================================
--- packages/experimental/networkmanager/debian/control	2006-02-28 18:53:55 UTC (rev 682)
+++ packages/experimental/networkmanager/debian/control	2006-02-28 20:43:53 UTC (rev 683)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Riccardo Setti <giskard at autistici.org>
 Uploaders: Michael Biebl <biebl at teco.edu>
-Build-Depends: debhelper (>= 5), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 1.0pre6), docbook-to-man
+Build-Depends: debhelper (>= 5), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man
 Standards-Version: 3.6.2
 
 Package: network-manager

Modified: packages/experimental/networkmanager/debian/network-manager-gnome.install
===================================================================
--- packages/experimental/networkmanager/debian/network-manager-gnome.install	2006-02-28 18:53:55 UTC (rev 682)
+++ packages/experimental/networkmanager/debian/network-manager-gnome.install	2006-02-28 20:43:53 UTC (rev 683)
@@ -4,5 +4,4 @@
 debian/tmp/usr/share/nm-applet/*
 debian/tmp/usr/share/icons
 debian/tmp/usr/share/gnome-vpn-properties
-debian/tmp/usr/share/autostart
 debian/tmp/etc/dbus-1/system.d/nm-applet.conf

Modified: packages/experimental/networkmanager/debian/network-manager.dbus-event
===================================================================
--- packages/experimental/networkmanager/debian/network-manager.dbus-event	2006-02-28 18:53:55 UTC (rev 682)
+++ packages/experimental/networkmanager/debian/network-manager.dbus-event	2006-02-28 20:43:53 UTC (rev 683)
@@ -65,13 +65,8 @@
         log_begin_msg "Stopping $DESC"
 	start-stop-daemon --stop --quiet --pidfile $PIDFILE \
 		 --oknodo --user $USER --exec $DAEMON
+		 
         log_end_msg $?
-
-        # if NetworkManager does not want to die, apply some more force
-        if [ -e $PIDFILE ]; then
-            kill -9 $(cat $PIDFILE) || true
-            rm -f $PIDFILE
-        fi
 }
 
 

Added: packages/experimental/networkmanager/debian/patches/timeout.patch
===================================================================
--- packages/experimental/networkmanager/debian/patches/timeout.patch	2006-02-28 18:53:55 UTC (rev 682)
+++ packages/experimental/networkmanager/debian/patches/timeout.patch	2006-02-28 20:43:53 UTC (rev 683)
@@ -0,0 +1,11 @@
+--- src/nm-device-802-11-wireless.c.orig	2006-02-13 11:46:50.000000000 +0100
++++ src/nm-device-802-11-wireless.c	2006-02-13 11:47:08.000000000 +0100
+@@ -2205,7 +2205,7 @@
+ }
+ 
+ 
+-#define NM_SUPPLICANT_TIMEOUT	20	/* how long we wait for wpa_supplicant to associate (in seconds) */
++#define NM_SUPPLICANT_TIMEOUT	60	/* how long we wait for wpa_supplicant to associate (in seconds) */
+ 
+ static unsigned int
+ get_supplicant_timeout (NMDevice80211Wireless *self)