Control: tag -1 patch
On 19/11/15 14:55, Chris Boot wrote:
> I have prepared a patch for your package to enable to build against the
> new version of ppp currently in experimental. I will add the patch to
> this bug very shortly (once I have a bug number to add to the
> changelog).
Patch is now attached. This has been build-tested and the results of a
debdiff on the binary packages looks sensible to me.
Regards,
Chris
--
Chris Boot
deb...@bootc.net
GPG: 8467 53CB 1921 3142 C56D C918 F5C8 3C05 D9CE EEEE
>From 9dd31a12e2e424b0812f6ad9246435093cc75a05 Mon Sep 17 00:00:00 2001
From: Chris Boot <bo...@bootc.net>
Date: Thu, 19 Nov 2015 15:08:42 +0000
Subject: [PATCH] Use dh_ppp to manage dependencies on ppp
Bump Build-Depends on ppp-dev to (>= 2.4.7-1+1~exp2), 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/changelog | 7 +++++++
debian/control | 6 +++---
debian/rules | 9 +++++++--
3 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index daa39f053cae..2dcf261f826b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+network-manager (1.0.6-2) UNRELEASED; urgency=medium
+
+ * Use dh_ppp to generate Breaks for ppp and find the path to the plugin
+ directory. (Closes: #805565)
+
+ -- Chris Boot <deb...@bootc.net> Thu, 19 Nov 2015 11:30:43 +0000
+
network-manager (1.0.6-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/control b/debian/control
index 5c1e5a8f61fc..52cd103c996e 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 9),
libnl-3-dev (>= 3.2.8),
libnl-route-3-dev (>= 3.2.8),
libnl-genl-3-dev (>= 3.2.8),
- ppp-dev (>= 2.4.6),
+ ppp-dev (>= 2.4.7-1+1~exp2),
libpolkit-gobject-1-dev,
libpolkit-agent-1-dev (>= 0.97),
libgnutls28-dev (>= 2.12),
@@ -55,7 +55,7 @@ Depends: ${shlibs:Depends},
isc-dhcp-client (>= 4.1.1-P1-4),
libpam-systemd,
policykit-1
-Recommends: ppp (>= 2.4.6),
+Recommends: ppp,
dnsmasq-base,
iptables,
modemmanager,
@@ -63,7 +63,7 @@ Recommends: ppp (>= 2.4.6),
iputils-arping
Suggests: avahi-autoipd,
libteam-utils
-Breaks: ppp (<< 2.4.6)
+Breaks: ${misc:Breaks}
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 9922b71a19df..5a493f38963d 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:
--
2.1.4
