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. Unfortunately I have not been able to test the patch for correctness, because pptpd currently fails to build in sid because of Bug #802579 (binutils changed ld.bfd / ld.gold files and symlinks). Regards, Chris -- Chris Boot deb...@bootc.net GPG: 8467 53CB 1921 3142 C56D C918 F5C8 3C05 D9CE EEEE
>From b005d0feb5dccde014008fec2df43b69147cdc7a Mon Sep 17 00:00:00 2001 From: Chris Boot <bo...@bootc.net> Date: Thu, 19 Nov 2015 15:19:30 +0000 Subject: [PATCH] Use dh_ppp to manage dependencies on ppp. Closes: #805567 --- debian/changelog | 7 +++++++ debian/control | 5 ++--- debian/rules | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index e104db25f940..9ff213bc3475 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +pptpd (1.4.0-5.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Use dh_ppp to manage dependencies on ppp. Closes: #805567 + + -- Chris Boot <deb...@bootc.net> Thu, 19 Nov 2015 15:18:33 +0000 + pptpd (1.4.0-5) unstable; urgency=medium * Fix description of patch introduced in 1.4.0-4 diff --git a/debian/control b/debian/control index 93e1fe030f5f..a4d20a8608e4 100644 --- a/debian/control +++ b/debian/control @@ -7,15 +7,14 @@ Build-Depends: debhelper (>= 9), automake, hardening-wrapper, libwrap0-dev, - ppp-dev (>= 2.4.6-2~), + ppp-dev (>= 2.4.7-1+~), Homepage: http://poptop.sourceforge.net/dox/ Package: pptpd Architecture: linux-any Depends: ${misc:Depends}, ${shlibs:Depends}, bcrelay, - netbase, - ppp (>= 2.4.6-2~), + netbase Description: PoPToP Point to Point Tunneling Server This implements a Virtual Private Networking Server (VPN) that is compatible with Microsoft VPN clients. It allows Windows users to diff --git a/debian/rules b/debian/rules index 30aa1155a4b8..5409dc7b1c94 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,7 @@ export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) %: - dh $@ + dh $@ --with ppp override_dh_auto_configure: autoreconf --force --install -- 2.1.4