Control: tag -1 patch On 19/11/15 14:38, 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 [email protected] GPG: 8467 53CB 1921 3142 C56D C918 F5C8 3C05 D9CE EEEE
>From 5c7a119417c99e2bcbea180c74d3c54ff97f5366 Mon Sep 17 00:00:00 2001 From: Chris Boot <[email protected]> Date: Thu, 19 Nov 2015 14:58:22 +0000 Subject: [PATCH] Patch fso-gsmd for ppp 2.4.7-1 --- debian/changelog | 8 ++++++++ debian/control | 3 ++- debian/rules | 5 ++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a30f0dc0a520..acfdf3f1926b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +fso-gsmd (0.12.0-4.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Use dh_ppp to populate the Breaks field so that the ppp2fsogsmd.so pppd + plugin does not silently break with ppp updates. + + -- Chris Boot <[email protected]> Thu, 19 Nov 2015 08:42:27 +0000 + fso-gsmd (0.12.0-4) unstable; urgency=high * Fix DBus permissions (Closes: CVE-2014-8156) diff --git a/debian/control b/debian/control index bbf5c85460f3..4980d6ebfa98 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 9), libxml2-dev (>= 2.7.3), mobile-broadband-provider-info (>= 20090918), pkg-config, - ppp-dev, + ppp-dev (>= 2.4.7-1+~), quilt, valac (>=0.16) Standards-Version: 3.9.5 @@ -30,6 +30,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, mobile-broadband-provider-info (>= 20090918) Recommends: fso-gsmd-platform +Breaks: ${misc:Breaks} Description: freesmartphone.org GSM daemon fsogsmd implements the freesmartphone.org GSM API. It takes care of all GSM related functions. diff --git a/debian/rules b/debian/rules index 851f40098c70..601fb6c1655c 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed %: - dh $@ --with quilt --with autoreconf + dh $@ --with quilt --with autoreconf,ppp override_dh_auto_configure: find . -name *_vala.stamp | xargs rm -f @@ -22,3 +22,6 @@ override_dh_autoreconf: override_dh_makeshlibs: dh_makeshlibs --exclude=/usr/lib/$(DEB_HOST_MULTIARCH)/cornucopia/modules/ + +override_dh_ppp: + dh_ppp --breaks -- 2.1.4
