about summary refs log tree commit diff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
-rw-r--r--debian/control4
-rwxr-xr-xdebian/rules1
3 files changed, 6 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 1710d3a1..5d345981 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ network-manager (0.8.1-1) UNRELEASED; urgency=low
   * New upstream release. (Closes: #590139)
   * debian/patches/30-fix_paths_for_isc_dhcp_v4.patch
     - Remove, merged upstream.
+  * Build against ppp 2.4.5. (Closes: #589791)
+    - Bump Build-Depends on ppp to (>= 2.4.5).
+    - Bump Recommends on ppp to (>= 2.4.5).
+    - Drop --with-pppd-plugin-dir configure option and use upstream default.
 
  -- Michael Biebl <biebl@debian.org>  Thu, 22 Jul 2010 01:50:20 +0200
 
diff --git a/debian/control b/debian/control
index 40d55c8b..f126f87c 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
  libiw-dev(>= 27+28pre9),
  libglib2.0-dev (>= 2.18),
  libnl-dev (>= 1.0~pre8),
- ppp-dev,
+ ppp-dev (>= 2.4.5),
  libpolkit-gobject-1-dev,
  libgnutls-dev,
  uuid-dev,
@@ -40,7 +40,7 @@ Depends:
 Recommends:
  network-manager-gnome | network-manager-kde,
  policykit-1,
- ppp,
+ ppp (>= 2.4.5),
  dnsmasq-base,
  iptables,
  modemmanager
diff --git a/debian/rules b/debian/rules
index 89347de2..b1bbea63 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,6 @@ DEB_CONFIGURE_EXTRA_FLAGS := \
 		--with-dhclient=/sbin/dhclient \
 		--with-iptables=/sbin/iptables \
 		--with-crypto=gnutls \
-		--with-pppd-plugin-dir=/usr/lib/pppd/2.4.4 \
 		--disable-more-warnings
 
 DEB_DH_INSTALLINIT_ARGS := -r -- start 26 2 3 4 5 . stop 88 0 1 6 .