- Removed 01-STOLEN_FROM_HEAD-dbus60.patch, fixed upstream.

- Removed 01_NMDevice.c.patch, does not apply cleanly anymore.
- Removed 02_nm-netlink-monitor.patch, instead added if_fix.patch which merges 
  the changes regarding if.h from 01_NMDevice.c.patch and 02_nm-netlink-monitor.patch into one patch.



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

4 files changed, 33 insertions, 45 deletions

diff --git a/debian/patches/01-STOLEN_FROM_HEAD-dbus_60.patch b/debian/patches/01-STOLEN_FROM_HEAD-dbus_60.patch
deleted file mode 100644
index 9b6b3aad..00000000
--- a/debian/patches/01-STOLEN_FROM_HEAD-dbus_60.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome/applet/applet-dbus.c.old	2005-12-21 14:19:38.000000000 +0100
-+++ gnome/applet/applet-dbus.c	2005-12-21 14:20:12.000000000 +0100
-@@ -388,7 +388,7 @@
- 	}
- 
- 	dbus_error_init (&error);
--	acquisition = dbus_bus_request_name (connection, NMI_DBUS_SERVICE, DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT, &error);
-+	acquisition = dbus_bus_request_name (connection, NMI_DBUS_SERVICE, DBUS_NAME_FLAG_REPLACE_EXISTING, &error);
- 	if (dbus_error_is_set (&error))
- 	{
- 		nm_warning ("nmwa_dbus_init() could not acquire its service.  dbus_bus_acquire_service() says: '%s'", error.message);
diff --git a/debian/patches/01_NMDevice.c.patch b/debian/patches/01_NMDevice.c.patch
deleted file mode 100644
index a776d3ec..00000000
--- a/debian/patches/01_NMDevice.c.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- NetworkManagerDevice.c	2005-10-19 16:19:53.000000000 +0200
-+++ src/NetworkManagerDevice.c	2006-01-11 12:14:53.000000000 +0100
-@@ -4283,7 +4283,7 @@
- 
- 	strncpy (ifr.ifr_name, nm_device_get_iface (dev), sizeof(ifr.ifr_name)-1);
- 	edata.cmd = ETHTOOL_GLINK;
--	ifr.ifr_data = (char *) &edata;
-+	ifr.ifr_data = (void __user *) &edata;
- #ifdef IOCTL_DEBUG
- 	nm_info ("%s: About to ETHTOOL\n", nm_device_get_iface (dev));
- #endif
-@@ -4305,8 +4305,9 @@
- /**************************************/
- /*    MII capability detection        */
- /**************************************/
--#include <linux/mii.h>
--
-+#define _LINUX_IF_H
-+	#include <linux/mii.h>
-+#undef _LINUX_IF_
- static int mdio_read (NMDevice *dev, NMSock *sk, struct ifreq *ifr, int location)
- {
- 	struct mii_ioctl_data *mii;
diff --git a/debian/patches/02_nm-netlink-monitor.patch b/debian/patches/02_nm-netlink-monitor.patch
deleted file mode 100644
index 4389059d..00000000
--- a/debian/patches/02_nm-netlink-monitor.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nm-netlink-monitor.c	2005-08-12 21:06:09.000000000 +0200
-+++ src/nm-netlink-monitor.c 	2006-01-11 12:18:52.000000000 +0100
-@@ -30,7 +30,7 @@
- #include <linux/types.h>
- #include <linux/netlink.h>
- #include <linux/rtnetlink.h>
--#include <linux/if.h>
-+#include <net/if.h>
- #include <linux/unistd.h>
- #include <unistd.h>
- 
diff --git a/debian/patches/if_fix.patch b/debian/patches/if_fix.patch
new file mode 100644
index 00000000..379e9b38
--- /dev/null
+++ b/debian/patches/if_fix.patch
@@ -0,0 +1,33 @@
+Index: src/nm-device-802-3-ethernet.c
+===================================================================
+RCS file: /cvs/gnome/NetworkManager/src/nm-device-802-3-ethernet.c,v
+retrieving revision 1.3
+diff -u -r1.3 nm-device-802-3-ethernet.c
+--- src/nm-device-802-3-ethernet.c	3 Jan 2006 17:47:38 -0000	1.3
++++ src/nm-device-802-3-ethernet.c	4 Jan 2006 17:13:33 -0000
+@@ -328,7 +328,9 @@
+ /**************************************/
+ /*    MII capability detection        */
+ /**************************************/
++#define _LINUX_IF_H
+ #include <linux/mii.h>
++#undef _LINUX_IF_H
+ 
+ static int
+ mdio_read (NMDevice8023Ethernet *self, NMSock *sk, struct ifreq *ifr, int location)
+Index: src/nm-netlink-monitor.c
+===================================================================
+RCS file: /cvs/gnome/NetworkManager/src/nm-netlink-monitor.c,v
+retrieving revision 1.17
+diff -u -r1.17 nm-netlink-monitor.c
+--- src/nm-netlink-monitor.c	12 Aug 2005 19:06:09 -0000	1.17
++++ src/nm-netlink-monitor.c	4 Jan 2006 17:13:33 -0000
+@@ -30,7 +30,7 @@
+ #include <linux/types.h>
+ #include <linux/netlink.h>
+ #include <linux/rtnetlink.h>
+-#include <linux/if.h>
++#include <net/if.h>
+ #include <linux/unistd.h>
+ #include <unistd.h>
+