about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2010-07-08 14:59:02 +0000
committerMichael Biebl <biebl@debian.org>2010-07-08 14:59:02 +0000
commitf2800b281229c72f183e2e430f071d6c6edf6d77 (patch)
treee002ee7c45d97d75c29ea1447e6bfeaede5ed4a2
parent291f820df488d466bef73baaa91af97a1c1775a2 (diff)
Set --with-dhclient configure option to /sbin/dhclient.
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3633 ceb527fc-18e6-0310-9fe2-813c157c29e7
-rw-r--r--debian/changelog1
-rwxr-xr-xdebian/rules3
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index f872776b..2504bebf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,7 @@ network-manager (0.8.0.999-1) UNRELEASED; urgency=low
   * debian/rules
     - Set --with-pppd-plugin-dir configure option to /usr/lib/pppd/2.4.4.
       The upstream default is 2.4.5 now but Debian still only has ppp 2.4.4.
+    - Set --with-dhclient configure option to /sbin/dhclient.
 
  -- Michael Biebl <biebl@debian.org>  Thu, 08 Jul 2010 16:39:38 +0200
 
diff --git a/debian/rules b/debian/rules
index 2944e43a..89347de2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,10 +14,9 @@ DEB_INSTALL_DOCS_ALL := README AUTHORS
 DEB_CONFIGURE_LIBEXECDIR := "\$$(prefix)/lib/NetworkManager"
 
 DEB_CONFIGURE_EXTRA_FLAGS := \
-		--with-dbus-sys=/etc/dbus-1/system.d \
 		--with-distro=debian \
 		--with-resolvconf=/sbin/resolvconf \
-		--with-dhcp-client=/sbin/dhclient \
+		--with-dhclient=/sbin/dhclient \
 		--with-iptables=/sbin/iptables \
 		--with-crypto=gnutls \
 		--with-pppd-plugin-dir=/usr/lib/pppd/2.4.4 \