[Pkg-utopia-commits] r3625 - in /packages/unstable/networkmanager/debian: changelog patches/30-fix_paths_for_isc_dhcp_v4.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Jul  8 02:19:21 2010
New Revision: 3625

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3625
Log:
* debian/patches/30-fix_paths_for_isc_dhcp_v4.patch
  - Update dhclient.conf and lease directory path for isc-dhcp-client.
    (Closes: #587473)

Added:
    packages/unstable/networkmanager/debian/patches/30-fix_paths_for_isc_dhcp_v4.patch
Modified:
    packages/unstable/networkmanager/debian/changelog
    packages/unstable/networkmanager/debian/patches/series

Modified: packages/unstable/networkmanager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/changelog?rev=3625&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/changelog (original)
+++ packages/unstable/networkmanager/debian/changelog Thu Jul  8 02:19:21 2010
@@ -20,6 +20,9 @@
   * debian/control
     - Update Depends on dhcp3-client to isc-dhcp-client (>= 4.1.1-P1-4) to get
       DHCPv6 support.
+  * debian/patches/30-fix_paths_for_isc_dhcp_v4.patch
+    - Update dhclient.conf and lease directory path for isc-dhcp-client.
+      (Closes: #587473)
 
  -- Michael Biebl <biebl at debian.org>  Thu, 08 Jul 2010 03:32:37 +0200
 

Added: packages/unstable/networkmanager/debian/patches/30-fix_paths_for_isc_dhcp_v4.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/patches/30-fix_paths_for_isc_dhcp_v4.patch?rev=3625&op=file
==============================================================================
--- packages/unstable/networkmanager/debian/patches/30-fix_paths_for_isc_dhcp_v4.patch (added)
+++ packages/unstable/networkmanager/debian/patches/30-fix_paths_for_isc_dhcp_v4.patch Thu Jul  8 02:19:21 2010
@@ -1,0 +1,26 @@
+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);

Modified: packages/unstable/networkmanager/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/patches/series?rev=3625&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/patches/series (original)
+++ packages/unstable/networkmanager/debian/patches/series Thu Jul  8 02:19:21 2010
@@ -1,1 +1,3 @@
+# Debian patches for network-manager
 02-dbus_access_network_manager.patch
+30-fix_paths_for_isc_dhcp_v4.patch