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 8430ee68da322338e2fd67fb2075103efcf809bc Mon Sep 17 00:00:00 2001
From: Chris Boot <bo...@bootc.net>
Date: Thu, 19 Nov 2015 15:15:16 +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. Use dh_ppp
--plugin-dir to determine the ppp plugin directory.
Closes: #805566
---
debian/changelog | 7 +++++++
debian/control | 6 ++----
debian/rules | 6 ++++--
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a88378888fd3..ee1d04fc75bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+network-manager-pptp (1.0.6-2) UNRELEASED; urgency=medium
+
+ * Use dh_ppp to generate Depends on ppp and to locate the ppp plugins
+ directory. (Closes: #805566)
+
+ -- Chris Boot <deb...@bootc.net> Thu, 19 Nov 2015 13:20:48 +0000
+
network-manager-pptp (1.0.6-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/control b/debian/control
index b1bdabee09cd..138db3391a62 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 9),
libnm-glib-dev (>= 0.9.10),
libnm-glib-vpn-dev (>= 0.9.10),
libnm-gtk-dev (>= 1.0.5),
- ppp-dev (>= 2.4.6),
+ ppp-dev (>= 2.4.7-1+1~exp2),
libdbus-glib-1-dev (>= 0.74),
libsecret-1-dev,
libgtk-3-dev (>= 3.4),
@@ -25,9 +25,7 @@ Package: network-manager-pptp
Architecture: linux-any
Depends: ${shlibs:Depends},
${misc:Depends},
- pptp-linux,
- ppp (>= 2.4.6),
- ppp (<< 2.4.7)
+ pptp-linux
Description: network management framework (PPTP plugin core)
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 23505e8e6555..51ac03ff549f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,14 +2,16 @@
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+PPPD_PLUGIN_DIR := $(shell dh_ppp --plugin-dir)
+
%:
- dh $@ --with autoreconf
+ dh $@ --with autoreconf,ppp
override_dh_auto_configure:
dh_auto_configure -- \
--libexecdir=/usr/lib/NetworkManager \
--disable-static \
- --with-pppd-plugin-dir=/usr/lib/pppd/2.4.6
+ --with-pppd-plugin-dir=$(PPPD_PLUGIN_DIR)
override_dh_makeshlibs:
dh_makeshlibs -X/usr/lib/$(DEB_HOST_MULTIARCH)/NetworkManager/ -X/usr/lib/pppd/
--
2.1.4
