- 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

1 files changed, 33 insertions, 0 deletions

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>
+