(really) fixed debian/patches/06

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@949 ceb527fc-18e6-0310-9fe2-813c157c29e7

1 files changed, 32 insertions, 35 deletions

diff --git a/debian/patches/06-dispatch_more_events.patch b/debian/patches/06-dispatch_more_events.patch
index adbae7ae..60d50432 100644
--- a/debian/patches/06-dispatch_more_events.patch
+++ b/debian/patches/06-dispatch_more_events.patch
@@ -48,10 +48,9 @@
  
  				nmd_execute_scripts (action, dev_iface_name);
  			}
-diff -ruNp network-manager-0.6.2~/man/NetworkManagerDispatcher.1.in network-manager-0.6.2/man/NetworkManagerDispatcher.1.in
---- man/NetworkManagerDispatcher.1.in    2006-04-03 18:10:32.000000000 +0100
-+++ man/NetworkManagerDispatcher.1.in     2006-04-03 18:14:06.000000000 +0100
-@@ -13,10 +13,14 @@ The \fINetworkManagerDispatcher\fP daemo
+--- man/NetworkManagerDispatcher.1.in	2006-02-01 19:14:15.000000000 +0100
++++ man/NetworkManagerDispatcher.1.in.new	2006-08-15 20:13:00.000000000 +0200
+@@ -12,10 +12,14 @@
  directory in response to interfaces coming up and down.  The scripts are run
  alphabetically.  The first parameter is the network interface name.  The second
  parameter is
@@ -68,35 +67,33 @@ diff -ruNp network-manager-0.6.2~/man/NetworkManagerDispatcher.1.in network-mana
  .SH OPTIONS
  The following options are supported:
  .TP
-diff -ruNp network-manager-0.6.2~/src/NetworkManagerDbus.c network-manager-0.6.2/src/NetworkManagerDbus.c
---- src/NetworkManagerDbus.c     2006-02-24 18:59:03.000000000 +0000
-+++ src/NetworkManagerDbus.c      2006-04-03 18:14:06.000000000 +0100
-@@ -193,6 +193,7 @@ static DeviceStatusSignals dev_status_si
-        { DEVICE_NOW_ACTIVE,            "DeviceNowActive"               },
-        { DEVICE_ACTIVATING,            "DeviceActivating"              },
-        { DEVICE_ACTIVATION_FAILED,     "DeviceActivationFailed"        },
-+       { DEVICE_DEACTIVATED,           "DeviceDeactivated"             },
-        { DEVICE_ADDED,                 "DeviceAdded"                   },
-        { DEVICE_REMOVED,                       "DeviceRemoved"         },
-        { DEVICE_CARRIER_ON,            "DeviceCarrierOn"               },
-diff -ruNp network-manager-0.6.2~/src/NetworkManagerDbus.h network-manager-0.6.2/src/NetworkManagerDbus.h
---- src/NetworkManagerDbus.h     2005-12-31 08:21:22.000000000 +0000
-+++ src/NetworkManagerDbus.h      2006-04-03 18:14:06.000000000 +0100
-@@ -40,6 +40,7 @@ typedef enum
-        DEVICE_ACTIVATING,
-        DEVICE_ACTIVATION_FAILED,
-        DEVICE_ACTIVATION_CANCELED,
-+       DEVICE_DEACTIVATED,
-        DEVICE_ADDED,
-        DEVICE_REMOVED,
-        DEVICE_CARRIER_ON,
-diff -ruNp network-manager-0.6.2~/src/nm-device.c network-manager-0.6.2/src/nm-device.c
---- src/nm-device.c      2006-03-21 17:56:34.000000000 +0000
-+++ src/nm-device.c       2006-04-03 18:14:06.000000000 +0100
-@@ -1445,6 +1445,7 @@ nm_device_deactivate (NMDevice *self)
-                NM_DEVICE_GET_CLASS (self)->deactivate (self);
-
-        nm_schedule_state_change_signal_broadcast (self->priv->app_data);
-+       nm_dbus_schedule_device_status_change_signal (self->priv->app_data, self, NULL, DEVICE_DEACTIVATED);
+--- src/NetworkManagerDbus.c	2006-05-21 19:28:02.000000000 +0200
++++ src/NetworkManagerDbus.c.new	2006-08-15 20:15:18.000000000 +0200
+@@ -191,6 +191,7 @@
+ 	{ DEVICE_NOW_ACTIVE,		"DeviceNowActive"		},
+ 	{ DEVICE_ACTIVATING,		"DeviceActivating"		},
+ 	{ DEVICE_ACTIVATION_FAILED,	"DeviceActivationFailed"	},
++	{ DEVICE_DEACTIVATED,       "DeviceDeactivated"     },
+ 	{ DEVICE_ADDED,			"DeviceAdded"			},
+ 	{ DEVICE_REMOVED,			"DeviceRemoved"		},
+ 	{ DEVICE_CARRIER_ON,		"DeviceCarrierOn"		},
+--- src/NetworkManagerDbus.h	2006-05-21 19:28:02.000000000 +0200
++++ src/NetworkManagerDbus.h.new	2006-08-15 20:15:39.000000000 +0200
+@@ -40,6 +40,7 @@
+ 	DEVICE_ACTIVATING,
+ 	DEVICE_ACTIVATION_FAILED,
+ 	DEVICE_ACTIVATION_CANCELED,
++	DEVICE_DEACTIVATED,
+ 	DEVICE_ADDED,
+ 	DEVICE_REMOVED,
+ 	DEVICE_CARRIER_ON,
+--- src/nm-device.c	2006-07-10 22:30:49.000000000 +0200
++++ src/nm-device.c.new	2006-08-15 20:16:11.000000000 +0200
+@@ -1436,6 +1436,7 @@
+ 		NM_DEVICE_GET_CLASS (self)->deactivate (self);
+ 
+ 	nm_schedule_state_change_signal_broadcast (self->priv->app_data);
++	nm_dbus_schedule_device_status_change_signal (self->priv->app_data, self, NULL, DEVICE_DEACTIVATED);
  }
-
+ 
+