From dca9f3c2961cb9a32e26aa77e0cb08f4029e2404 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 22 Aug 2008 20:15:21 +0000 Subject: Remove 10-execute_system_dhclient_script.patch, patch no longer applies. Resolvconf intergration will have to be addressedd differently. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2414 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 7 +----- .../10-execute_system_dhclient_script.patch | 29 ---------------------- debian/patches/series | 2 -- 3 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 debian/patches/10-execute_system_dhclient_script.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7f1bfb2d..4097f33a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,12 +27,7 @@ network-manager (0.7.0~svn4002-1) UNRELEASED; urgency=low * debian/*.install: Updated * debian/*.symbols: Added - [ Sjoerd Simons ] - * debian/patches/10-execute_system_dhclient_script.patch - - Added. Let NM's custom dhclient script execute the systems dhclient - script. - - -- Sjoerd Simons Sun, 22 Jun 2008 22:25:32 +0100 + -- Michael Biebl Fri, 22 Aug 2008 21:53:54 +0200 network-manager (0.6.6-1) unstable; urgency=low diff --git a/debian/patches/10-execute_system_dhclient_script.patch b/debian/patches/10-execute_system_dhclient_script.patch deleted file mode 100644 index bf040bf6..00000000 --- a/debian/patches/10-execute_system_dhclient_script.patch +++ /dev/null @@ -1,29 +0,0 @@ -commit ab7e3a44e2869b91a62d12b3157fa1debc5df7a9 -Author: Sjoerd Simons -Date: Sun Jun 22 22:23:38 2008 +0100 - - Execute system dhclient script - -diff --git a/callouts/nm-dhcp-client-action.c b/callouts/nm-dhcp-client-action.c -index 9917235..30d7a02 100644 ---- a/callouts/nm-dhcp-client-action.c -+++ b/callouts/nm-dhcp-client-action.c -@@ -34,6 +34,9 @@ - #define NM_DHCP_CLIENT_DBUS_SERVICE "org.freedesktop.nm_dhcp_client" - #define NM_DHCP_CLIENT_DBUS_IFACE "org.freedesktop.nm_dhcp_client" - -+ -+#define SYSTEM_DHCLIENT_SCRIPT "/sbin/dhclient-script" -+ - /** - * Start a dict in a dbus message. Should be paired with a call to - * {@link wpa_dbus_dict_close_write}. -@@ -295,6 +298,8 @@ main (int argc, char *argv[]) - - g_type_init (); - -+ g_spawn_command_line_sync (SYSTEM_DHCLIENT_SCRIPT, NULL, NULL, NULL, NULL); -+ - /* Get a connection to the system bus */ - connection = dbus_init (); - if (connection == NULL) diff --git a/debian/patches/series b/debian/patches/series index af6b144d..5bb8c3f1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1 @@ 02-dbus_access_network_manager.patch -#05-debian_backend.patch -#10-execute_system_dhclient_script.patch -- cgit 1.3.0-6-gf8a5