From 878be836b2a556654220fafcc053888f01bf2cbe Mon Sep 17 00:00:00 2001
From: Chris Boot <bootc@bootc.net>
Date: Thu, 19 Nov 2015 15:08:42 +0000
Subject: Use dh_ppp to manage dependencies on ppp

Bump Build-Depends on ppp-dev to (>= 2.4.7-1+1), which includes
dh_ppp that has --plugin-dir. Add ppp addon to dh sequencer. Add
Breaks: ${misc:Breaks} (generated by dh_ppp) and remove the version
from Recommends: ppp. Use dh_ppp --plugin-dir to determine the ppp
plugin directory.

Closes: #805565
---
 debian/rules | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'debian/rules')

diff --git a/debian/rules b/debian/rules
index 9922b71a..5a493f38 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,10 @@
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
+PPPD_PLUGIN_DIR := $(shell dh_ppp --plugin-dir)
+
 %:
-	dh $@ --with gir,systemd,autoreconf
+	dh $@ --with gir,systemd,autoreconf,ppp
 
 autoreconf:
 	gtkdocize --copy
@@ -16,7 +18,7 @@ override_dh_autoreconf:
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		--libexecdir=/usr/lib/NetworkManager \
-		--with-pppd-plugin-dir=/usr/lib/pppd/2.4.6 \
+		--with-pppd-plugin-dir=$(PPPD_PLUGIN_DIR) \
 		--with-pppd=/usr/sbin/pppd \
 		--with-pppoe=/usr/sbin/pppoe \
 		--with-resolvconf=/sbin/resolvconf \
@@ -70,4 +72,7 @@ override_dh_systemd_start:
 	dh_systemd_start -pnetwork-manager --no-start NetworkManager-wait-online.service
 	dh_systemd_start -pnetwork-manager --restart-after-upgrade NetworkManager.service
 
+override_dh_ppp:
+	dh_ppp --breaks
+
 override_dh_auto_test:
-- 
cgit 1.3.0-6-gf8a5