diff options
| author | Riccardo Setti <giskard@autistici.org> | 2006-03-06 11:27:34 +0000 |
|---|---|---|
| committer | Riccardo Setti <giskard@autistici.org> | 2006-03-06 11:27:34 +0000 |
| commit | e0225a101acf158a95bc2ac9a41ed73a896ee23f (patch) | |
| tree | 90967ceaadee8db3cd19d37cc6f58bd1ea4c231a | |
| parent | c310525c658f899c47520f8aa5d2c9cb49cd53b7 (diff) | |
added NMDebian.patch which add the support for resolvconf
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@736 ceb527fc-18e6-0310-9fe2-813c157c29e7
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/patches/NetworkManagerDebian.patch | 20 |
2 files changed, 23 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 89fb3357..155d6f1d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,12 +3,13 @@ network-manager (0.6.0-1) unstable; urgency=low * 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@autistici.org> Sat, 4 Mar 2006 20:48:58 +0100 + + -- Riccardo Setti <giskard@autistici.org> Mon, 6 Mar 2006 12:23:23 +0100 network-manager (0.5.1-3) unstable; urgency=low diff --git a/debian/patches/NetworkManagerDebian.patch b/debian/patches/NetworkManagerDebian.patch new file mode 100644 index 00000000..8e55c8fa --- /dev/null +++ b/debian/patches/NetworkManagerDebian.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; + } |