From 15792ef7e8756e253133524a47e255c65cd6e768 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 1 Apr 2006 13:31:41 +0000 Subject: Apply an ordering for the packages and choose better names where applicable. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@775 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/patches/01-supplicant_timeout.patch | 11 +++++++++++ debian/patches/02-dbus_access_network_manager.patch | 11 +++++++++++ debian/patches/03-dbus_access_nm_applet.patch | 11 +++++++++++ debian/patches/04-if_fix.patch | 17 +++++++++++++++++ debian/patches/05-resolvconf.patch | 20 ++++++++++++++++++++ debian/patches/NetworkManagerDebian.patch | 20 -------------------- debian/patches/dbus_access_network_manager.patch | 11 ----------- debian/patches/dbus_access_nm_applet.patch | 11 ----------- debian/patches/if_fix.patch | 17 ----------------- debian/patches/timeout.patch | 11 ----------- 10 files changed, 70 insertions(+), 70 deletions(-) create mode 100644 debian/patches/01-supplicant_timeout.patch create mode 100644 debian/patches/02-dbus_access_network_manager.patch create mode 100644 debian/patches/03-dbus_access_nm_applet.patch create mode 100644 debian/patches/04-if_fix.patch create mode 100644 debian/patches/05-resolvconf.patch delete mode 100644 debian/patches/NetworkManagerDebian.patch delete mode 100644 debian/patches/dbus_access_network_manager.patch delete mode 100644 debian/patches/dbus_access_nm_applet.patch delete mode 100644 debian/patches/if_fix.patch delete mode 100644 debian/patches/timeout.patch (limited to 'debian') diff --git a/debian/patches/01-supplicant_timeout.patch b/debian/patches/01-supplicant_timeout.patch new file mode 100644 index 00000000..0723c83a --- /dev/null +++ b/debian/patches/01-supplicant_timeout.patch @@ -0,0 +1,11 @@ +--- 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) diff --git a/debian/patches/02-dbus_access_network_manager.patch b/debian/patches/02-dbus_access_network_manager.patch new file mode 100644 index 00000000..06886be3 --- /dev/null +++ b/debian/patches/02-dbus_access_network_manager.patch @@ -0,0 +1,11 @@ +--- 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 @@ + + + +- ++ + + + diff --git a/debian/patches/03-dbus_access_nm_applet.patch b/debian/patches/03-dbus_access_nm_applet.patch new file mode 100644 index 00000000..94053ea2 --- /dev/null +++ b/debian/patches/03-dbus_access_nm_applet.patch @@ -0,0 +1,11 @@ +--- 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 @@ + + + +- ++ + + + diff --git a/debian/patches/04-if_fix.patch b/debian/patches/04-if_fix.patch new file mode 100644 index 00000000..b5667c53 --- /dev/null +++ b/debian/patches/04-if_fix.patch @@ -0,0 +1,17 @@ +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 ++#undef _LINUX_IF_H + + static int + mdio_read (NMDevice8023Ethernet *self, NMSock *sk, struct ifreq *ifr, int location) diff --git a/debian/patches/05-resolvconf.patch b/debian/patches/05-resolvconf.patch new file mode 100644 index 00000000..8e55c8fa --- /dev/null +++ b/debian/patches/05-resolvconf.patch @@ -0,0 +1,20 @@ +--- 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; + } diff --git a/debian/patches/NetworkManagerDebian.patch b/debian/patches/NetworkManagerDebian.patch deleted file mode 100644 index 8e55c8fa..00000000 --- a/debian/patches/NetworkManagerDebian.patch +++ /dev/null @@ -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; - } diff --git a/debian/patches/dbus_access_network_manager.patch b/debian/patches/dbus_access_network_manager.patch deleted file mode 100644 index 06886be3..00000000 --- a/debian/patches/dbus_access_network_manager.patch +++ /dev/null @@ -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 @@ - - - -- -+ - - - diff --git a/debian/patches/dbus_access_nm_applet.patch b/debian/patches/dbus_access_nm_applet.patch deleted file mode 100644 index 94053ea2..00000000 --- a/debian/patches/dbus_access_nm_applet.patch +++ /dev/null @@ -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 @@ - - - -- -+ - - - diff --git a/debian/patches/if_fix.patch b/debian/patches/if_fix.patch deleted file mode 100644 index b5667c53..00000000 --- a/debian/patches/if_fix.patch +++ /dev/null @@ -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 -+#undef _LINUX_IF_H - - static int - mdio_read (NMDevice8023Ethernet *self, NMSock *sk, struct ifreq *ifr, int location) diff --git a/debian/patches/timeout.patch b/debian/patches/timeout.patch deleted file mode 100644 index 0723c83a..00000000 --- a/debian/patches/timeout.patch +++ /dev/null @@ -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) -- cgit 1.3.0-6-gf8a5