diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/30-fix_paths_for_isc_dhcp_v4.patch | 26 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 2 insertions, 27 deletions
diff --git a/debian/changelog b/debian/changelog index efa7ae98..2e34d77e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ network-manager (0.8.1-1) UNRELEASED; urgency=low * New upstream release. + * debian/patches/30-fix_paths_for_isc_dhcp_v4.patch + - Remove, merged upstream. -- Michael Biebl <biebl@debian.org> Thu, 22 Jul 2010 01:50:20 +0200 diff --git a/debian/patches/30-fix_paths_for_isc_dhcp_v4.patch b/debian/patches/30-fix_paths_for_isc_dhcp_v4.patch deleted file mode 100644 index 5a3e5336..00000000 --- a/debian/patches/30-fix_paths_for_isc_dhcp_v4.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: b/src/dhcp-manager/nm-dhcp-dhclient.c -=================================================================== ---- a/src/dhcp-manager/nm-dhcp-dhclient.c 2010-07-08 04:16:18.421304546 +0200 -+++ b/src/dhcp-manager/nm-dhcp-dhclient.c 2010-07-08 04:16:31.369301275 +0200 -@@ -44,9 +44,7 @@ - - #define NM_DHCP_DHCLIENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP_DHCLIENT, NMDHCPDhclientPrivate)) - --#if defined(TARGET_DEBIAN) --#define NM_DHCLIENT_LEASE_DIR LOCALSTATEDIR "/lib/dhcp3" --#elif defined(TARGET_SUSE) || defined(TARGET_MANDRIVA) -+#if defined(TARGET_DEBIAN) || defined(TARGET_SUSE) || defined(TARGET_MANDRIVA) - #define NM_DHCLIENT_LEASE_DIR LOCALSTATEDIR "/lib/dhcp" - #else - #define NM_DHCLIENT_LEASE_DIR LOCALSTATEDIR "/lib/dhclient" -@@ -437,9 +435,7 @@ - - #if defined(TARGET_SUSE) - orig = g_strdup (SYSCONFDIR "/dhclient.conf"); --#elif defined(TARGET_DEBIAN) -- orig = g_strdup (SYSCONFDIR "/dhcp3/dhclient.conf"); --#elif defined(TARGET_GENTOO) -+#elif defined(TARGET_DEBIAN) || defined(TARGET_GENTOO) - orig = g_strdup (SYSCONFDIR "/dhcp/dhclient.conf"); - #else - orig = g_strdup_printf (SYSCONFDIR "/dhclient-%s.conf", iface); diff --git a/debian/patches/series b/debian/patches/series index b4d0a45e..c40ab33b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ # Debian patches for network-manager 02-dbus_access_network_manager.patch -30-fix_paths_for_isc_dhcp_v4.patch |