[Pkg-utopia-commits] r736 - in packages/unstable/networkmanager/debian: . patches

[Riccardo Setti]

Author: giskard-guest
Date: 2006-03-06 11:27:34 +0000 (Mon, 06 Mar 2006)
New Revision: 736

Added:
   packages/unstable/networkmanager/debian/patches/NetworkManagerDebian.patch
Modified:
   packages/unstable/networkmanager/debian/changelog
Log:
added NMDebian.patch which add the support for resolvconf

Modified: packages/unstable/networkmanager/debian/changelog
===================================================================
--- packages/unstable/networkmanager/debian/changelog	2006-03-05 21:11:25 UTC (rev 735)
+++ packages/unstable/networkmanager/debian/changelog	2006-03-06 11:27:34 UTC (rev 736)
@@ -3,13 +3,14 @@
   * New upstream release.
   - most of the work is taken from the experimental branch of NM.
     Thanks goes to  Michael Biebl.
+  - Added NetworkManagerDebian.patch which...(closes: )
   * switched to debhelper5.
   * added libnl-util0, libnl-util-dev packages.
   - added debian/libnl-util0.install , debian/libnl-util-dev.install
   * removed debian/dirs as it was useless.
-  
- -- Riccardo Setti <giskard at autistici.org>  Sat,  4 Mar 2006 20:48:58 +0100
 
+ -- Riccardo Setti <giskard at autistici.org>  Mon,  6 Mar 2006 12:23:23 +0100
+
 network-manager (0.5.1-3) unstable; urgency=low
 
   * improved debian/copyright . I hope this time it will be 

Added: packages/unstable/networkmanager/debian/patches/NetworkManagerDebian.patch
===================================================================
--- packages/unstable/networkmanager/debian/patches/NetworkManagerDebian.patch	2006-03-05 21:11:25 UTC (rev 735)
+++ packages/unstable/networkmanager/debian/patches/NetworkManagerDebian.patch	2006-03-06 11:27:34 UTC (rev 736)
@@ -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;
+ }