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

[Riccardo Setti]

Author: giskard-guest
Date: 2006-08-02 17:56:24 +0000 (Wed, 02 Aug 2006)
New Revision: 910

Modified:
   packages/unstable/networkmanager/debian/changelog
   packages/unstable/networkmanager/debian/control
   packages/unstable/networkmanager/debian/patches/08-disabled_devices.patch
Log:
- allow "auto-hotplug" iface to be managed by NM. (closes: #381017)

Modified: packages/unstable/networkmanager/debian/changelog
===================================================================
--- packages/unstable/networkmanager/debian/changelog	2006-07-31 15:15:54 UTC (rev 909)
+++ packages/unstable/networkmanager/debian/changelog	2006-08-02 17:56:24 UTC (rev 910)
@@ -1,8 +1,9 @@
 network-manager (0.6.4-1) unstable; urgency=low
 
   * New upstream release. (closes: #379163)
+  - allow "auto-hotplug" iface to be managed by NM. (closes: #381017)
 
- -- Riccardo Setti <giskard at autistici.org>  Sun, 23 Jul 2006 11:47:10 +0200
+ -- Riccardo Setti <giskard at debian.org>  Wed,  2 Aug 2006 19:51:48 +0200
 
 network-manager (0.6.3-2) unstable; urgency=low
 

Modified: packages/unstable/networkmanager/debian/control
===================================================================
--- packages/unstable/networkmanager/debian/control	2006-07-31 15:15:54 UTC (rev 909)
+++ packages/unstable/networkmanager/debian/control	2006-08-02 17:56:24 UTC (rev 910)
@@ -1,7 +1,7 @@
 Source: network-manager
 Section: net
 Priority: optional
-Maintainer: Riccardo Setti <giskard at autistici.org>
+Maintainer: Riccardo Setti <giskard at debian.org>
 Uploaders: Michael Biebl <biebl at teco.edu>
 Build-Depends: debhelper (>= 5.0.0), cdbs, gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, libhal-dev (>= 0.5.0), libnl-dev (>= 0.99+1.0.svn21), libnotify-dev (>= 0.3), docbook-to-man
 Standards-Version: 3.7.2

Modified: packages/unstable/networkmanager/debian/patches/08-disabled_devices.patch
===================================================================
--- packages/unstable/networkmanager/debian/patches/08-disabled_devices.patch	2006-07-31 15:15:54 UTC (rev 909)
+++ packages/unstable/networkmanager/debian/patches/08-disabled_devices.patch	2006-08-02 17:56:24 UTC (rev 910)
@@ -29,17 +29,17 @@
 +	 * definitely not okay to control it.
 +	 */
 +	for (curr_b = ifparser_getfirst(); curr_b; curr_b = curr_b->next) {
-+		if (!strcmp (curr_b->type, "auto")
++		if (!strcmp (curr_b->type, "auto") || !strcmp (curr_b->type, "allow-hotplug")
 +		    && strstr (curr_b->name, iface))
 +			blacklist = FALSE;
 +	}
 +
 +	/* If the interface has no options other than just "inet dhcp"
-+	 * it's probably ok to fiddle with it.
++	 * it's probably ok to fiddle with it. 
 +	 */
 +	for (curr_d = curr_device->info; curr_d; curr_d = curr_d->next) {
 +		if (strcmp (curr_d->key, "inet")
-+		    || strcmp (curr_d->data, "dhcp"))
++		    || strcmp (curr_d->data, "dhcp" )|| strcmp ( currd->key, "iface"))
 +			blacklist = TRUE;
 +	}
 +