about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2014-04-15 02:48:51 +0200
committerMichael Biebl <biebl@debian.org>2014-04-15 02:48:51 +0200
commitff2d70a4434eba0d47d88ae022247bd3f704ecb0 (patch)
treeae3139300664a5492d85068c30955f6f6a09172e
parent657c5d5409ca66d53439adefaaa984b7727e7314 (diff)
Build against ppp 2.4.6. Update plugin path and dependencies accordingly.
-rw-r--r--debian/changelog6
-rw-r--r--debian/control6
-rwxr-xr-xdebian/rules2
3 files changed, 10 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 8cde8567..7d4912c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+network-manager (0.9.8.8-7) UNRELEASED; urgency=medium
+
+  * Build against ppp 2.4.6. Update plugin path and dependencies accordingly.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 15 Apr 2014 02:48:00 +0200
+
 network-manager (0.9.8.8-6) unstable; urgency=medium
 
   [ Laurent Bigonville ]
diff --git a/debian/control b/debian/control
index 11fef84c..5b6a1e69 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 9),
                libnl-3-dev (>= 3.2.7),
                libnl-route-3-dev (>= 3.2.7),
                libnl-genl-3-dev (>= 3.2.7),
-               ppp-dev (>= 2.4.5),
+               ppp-dev (>= 2.4.6),
                libpolkit-gobject-1-dev,
                libgnutls-dev,
                uuid-dev,
@@ -48,7 +48,7 @@ Depends: ${shlibs:Depends},
          isc-dhcp-client (>= 4.1.1-P1-4),
          libpam-systemd,
          policykit-1
-Recommends: ppp (>= 2.4.5),
+Recommends: ppp (>= 2.4.6),
             dnsmasq-base,
             iptables,
             modemmanager,
@@ -61,7 +61,7 @@ Breaks: network-manager-gnome (<< 0.9),
         network-manager-openconnect (<< 0.9),
         network-manager-kde (<< 1:0.9),
         plasma-widget-networkmanagement (<< 0.9~),
-        ppp (<< 2.4.5)
+        ppp (<< 2.4.6)
 Description: network management framework (daemon and userspace tools)
  NetworkManager is a system network service that manages your network devices
  and connections, attempting to keep active network connectivity when
diff --git a/debian/rules b/debian/rules
index 4540c587..512eda65 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ override_dh_autoreconf:
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		--libexecdir=/usr/lib/NetworkManager \
-		--with-pppd-plugin-dir=/usr/lib/pppd/2.4.5 \
+		--with-pppd-plugin-dir=/usr/lib/pppd/2.4.6 \
 		--with-resolvconf=/sbin/resolvconf \
 		--with-dhclient=/sbin/dhclient \
 		--with-iptables=/sbin/iptables \