[Pkg-utopia-commits] r841 - in packages/unstable/networkmanager/debian: . patches

[Michael Biebl]

Author: mbiebl-guest
Date: 2006-05-15 22:32:59 +0000 (Mon, 15 May 2006)
New Revision: 841

Added:
   packages/unstable/networkmanager/debian/patches/11-carrier_detection.patch
Modified:
   packages/unstable/networkmanager/debian/changelog
Log:
Support cards which can't do carrier detect.


Modified: packages/unstable/networkmanager/debian/changelog
===================================================================
--- packages/unstable/networkmanager/debian/changelog	2006-05-15 22:12:13 UTC (rev 840)
+++ packages/unstable/networkmanager/debian/changelog	2006-05-15 22:32:59 UTC (rev 841)
@@ -1,9 +1,11 @@
 network-manager (0.6.2-3) unstable; urgency=low
 
-  * Ship the NEWS.Debian file only for the network-manager package.  
+  * Ship the NEWS.Debian file only for the network-manager package.
     (Closes: #367063)
+  * Added 11-carrier_detection.patch to support network cards which can't do
+    carrier detection. (Closes: #366373) 
 
- -- Michael Biebl <biebl at teco.edu>  Sat, 13 May 2006 12:35:03 +0200
+ -- Michael Biebl <biebl at teco.edu>  Tue, 16 May 2006 00:16:43 +0200
 
 network-manager (0.6.2-2) unstable; urgency=low
 

Added: packages/unstable/networkmanager/debian/patches/11-carrier_detection.patch
===================================================================
--- packages/unstable/networkmanager/debian/patches/11-carrier_detection.patch	2006-05-15 22:12:13 UTC (rev 840)
+++ packages/unstable/networkmanager/debian/patches/11-carrier_detection.patch	2006-05-15 22:32:59 UTC (rev 841)
@@ -0,0 +1,17 @@
+===================================================================
+RCS file: /cvs/gnome/NetworkManager/src/nm-device-802-3-ethernet.c,v
+retrieving revision 1.13.2.1
+retrieving revision 1.13.2.2
+diff -u -r1.13.2.1 -r1.13.2.2
+--- src/nm-device-802-3-ethernet.c	2006/03/09 21:39:15	1.13.2.1
++++ src/nm-device-802-3-ethernet.c	2006/05/13 19:06:05	1.13.2.2
+@@ -207,8 +207,7 @@
+ 	if (supports_ethtool_carrier_detect (self) || supports_mii_carrier_detect (self))
+ 		caps |= NM_DEVICE_CAP_CARRIER_DETECT;
+ 
+-	if (caps)
+-		caps |= NM_DEVICE_CAP_NM_SUPPORTED;
++	caps |= NM_DEVICE_CAP_NM_SUPPORTED;
+ 
+ 	return caps;
+ }