about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@teco.edu>2006-03-27 20:29:12 +0000
committerMichael Biebl <biebl@teco.edu>2006-03-27 20:29:12 +0000
commit23ad753bcd5c3f1d7206be0d55816b6a7f76cf60 (patch)
treeb0c9d94cfeea5fdb54c6185e8c69a04014f05e57
parent96f4bb63e1aea9d7428205b05a0cd007ce01ca79 (diff)
New upstream release. Updated if_fix.patch and removed unnecessary lines.
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@764 ceb527fc-18e6-0310-9fe2-813c157c29e7
-rw-r--r--debian/changelog7
-rw-r--r--debian/patches/if_fix.patch16
2 files changed, 7 insertions, 16 deletions
diff --git a/debian/changelog b/debian/changelog
index eef4d367..430b45f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+network-manager (0.6.2-1) unstable; urgency=low
+
+  * New upstream release. 
+  * Updated if_fix.patch, parts of it have been fixed upstream.
+
+ -- Michael Biebl <biebl@teco.edu>  Mon, 27 Mar 2006 21:56:37 +0200
+
 network-manager (0.6.1-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/if_fix.patch b/debian/patches/if_fix.patch
index 379e9b38..b5667c53 100644
--- a/debian/patches/if_fix.patch
+++ b/debian/patches/if_fix.patch
@@ -15,19 +15,3 @@ diff -u -r1.3 nm-device-802-3-ethernet.c
  
  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>
-