[Pkg-utopia-commits] r775 - packages/unstable/networkmanager/debian/patches

[Michael Biebl]

Author: mbiebl-guest
Date: 2006-04-01 13:31:41 +0000 (Sat, 01 Apr 2006)
New Revision: 775

Added:
   packages/unstable/networkmanager/debian/patches/01-supplicant_timeout.patch
   packages/unstable/networkmanager/debian/patches/02-dbus_access_network_manager.patch
   packages/unstable/networkmanager/debian/patches/03-dbus_access_nm_applet.patch
   packages/unstable/networkmanager/debian/patches/04-if_fix.patch
   packages/unstable/networkmanager/debian/patches/05-resolvconf.patch
Removed:
   packages/unstable/networkmanager/debian/patches/NetworkManagerDebian.patch
   packages/unstable/networkmanager/debian/patches/dbus_access_network_manager.patch
   packages/unstable/networkmanager/debian/patches/dbus_access_nm_applet.patch
   packages/unstable/networkmanager/debian/patches/if_fix.patch
   packages/unstable/networkmanager/debian/patches/timeout.patch
Log:
Apply an ordering for the packages and choose better names where applicable.


Copied: packages/unstable/networkmanager/debian/patches/01-supplicant_timeout.patch (from rev 763, packages/unstable/networkmanager/debian/patches/timeout.patch)

Copied: packages/unstable/networkmanager/debian/patches/02-dbus_access_network_manager.patch (from rev 763, packages/unstable/networkmanager/debian/patches/dbus_access_network_manager.patch)

Copied: packages/unstable/networkmanager/debian/patches/03-dbus_access_nm_applet.patch (from rev 763, packages/unstable/networkmanager/debian/patches/dbus_access_nm_applet.patch)

Copied: packages/unstable/networkmanager/debian/patches/04-if_fix.patch (from rev 764, packages/unstable/networkmanager/debian/patches/if_fix.patch)

Copied: packages/unstable/networkmanager/debian/patches/05-resolvconf.patch (from rev 763, packages/unstable/networkmanager/debian/patches/NetworkManagerDebian.patch)

Deleted: packages/unstable/networkmanager/debian/patches/NetworkManagerDebian.patch
===================================================================
--- packages/unstable/networkmanager/debian/patches/NetworkManagerDebian.patch	2006-04-01 13:23:13 UTC (rev 774)
+++ packages/unstable/networkmanager/debian/patches/NetworkManagerDebian.patch	2006-04-01 13:31:41 UTC (rev 775)
@@ -1,20 +0,0 @@
---- src/backends/NetworkManagerDebian.c	2006-02-28 22:24:22.000000000 +0100
-+++ ../NetworkManager-0.6.0.patched/src/backends/NetworkManagerDebian.c	2006-03-06 12:19:34.000000000 +0100
-@@ -37,6 +37,7 @@
- #include "nm-utils.h"
- 
- #define ARPING "/usr/sbin/arping"
-+#define RESOLVCONF "resolvconf"
- 
- /*
-  * nm_system_init
-@@ -679,5 +680,8 @@
-  */
- gboolean nm_system_should_modify_resolv_conf (void)
- {
--	return TRUE;
-+	if (g_find_program_in_path(RESOLVCONF) != NULL)
-+		return FALSE;
-+	else
-+		return TRUE;
- }

Deleted: packages/unstable/networkmanager/debian/patches/dbus_access_network_manager.patch
===================================================================
--- packages/unstable/networkmanager/debian/patches/dbus_access_network_manager.patch	2006-04-01 13:23:13 UTC (rev 774)
+++ packages/unstable/networkmanager/debian/patches/dbus_access_network_manager.patch	2006-04-01 13:31:41 UTC (rev 775)
@@ -1,11 +0,0 @@
---- src/NetworkManager.conf.orig	2006-02-07 04:24:38.000000000 +0100
-+++ src/NetworkManager.conf	2006-02-07 04:25:00.000000000 +0100
-@@ -8,7 +8,7 @@
-                 <allow send_destination="org.freedesktop.NetworkManager"/>
-                 <allow send_interface="org.freedesktop.NetworkManager"/>
-         </policy>
--        <policy at_console="true">
-+        <policy group="netdev">
-                 <allow send_destination="org.freedesktop.NetworkManager"/>
-                 <allow send_interface="org.freedesktop.NetworkManager"/>
-         </policy>

Deleted: packages/unstable/networkmanager/debian/patches/dbus_access_nm_applet.patch
===================================================================
--- packages/unstable/networkmanager/debian/patches/dbus_access_nm_applet.patch	2006-04-01 13:23:13 UTC (rev 774)
+++ packages/unstable/networkmanager/debian/patches/dbus_access_nm_applet.patch	2006-04-01 13:31:41 UTC (rev 775)
@@ -1,11 +0,0 @@
---- gnome/applet/nm-applet.conf.orig	2006-02-07 04:22:39.000000000 +0100
-+++ gnome/applet/nm-applet.conf	2006-02-07 04:23:00.000000000 +0100
-@@ -8,7 +8,7 @@
- 		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>
-                 <allow send_interface="org.freedesktop.NetworkManagerInfo"/>
- 	</policy>
--	<policy at_console="true">
-+	<policy group="netdev">
- 		<allow own="org.freedesktop.NetworkManagerInfo"/>
- 
- 		<allow send_destination="org.freedesktop.NetworkManagerInfo"/>

Deleted: packages/unstable/networkmanager/debian/patches/if_fix.patch
===================================================================
--- packages/unstable/networkmanager/debian/patches/if_fix.patch	2006-04-01 13:23:13 UTC (rev 774)
+++ packages/unstable/networkmanager/debian/patches/if_fix.patch	2006-04-01 13:31:41 UTC (rev 775)
@@ -1,17 +0,0 @@
-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)

Deleted: packages/unstable/networkmanager/debian/patches/timeout.patch
===================================================================
--- packages/unstable/networkmanager/debian/patches/timeout.patch	2006-04-01 13:23:13 UTC (rev 774)
+++ packages/unstable/networkmanager/debian/patches/timeout.patch	2006-04-01 13:31:41 UTC (rev 775)
@@ -1,11 +0,0 @@
---- src/nm-device-802-11-wireless.c.orig	2006-02-13 11:46:50.000000000 +0100
-+++ src/nm-device-802-11-wireless.c	2006-02-13 11:47:08.000000000 +0100
-@@ -2205,7 +2205,7 @@
- }
- 
- 
--#define NM_SUPPLICANT_TIMEOUT	20	/* how long we wait for wpa_supplicant to associate (in seconds) */
-+#define NM_SUPPLICANT_TIMEOUT	60	/* how long we wait for wpa_supplicant to associate (in seconds) */
- 
- static unsigned int
- get_supplicant_timeout (NMDevice80211Wireless *self)