diff -Nru connman-1.35/debian/changelog connman-1.35/debian/changelog --- connman-1.35/debian/changelog 2017-11-05 03:17:15.000000000 +0000 +++ connman-1.35/debian/changelog 2018-02-22 23:34:47.000000000 +0000 @@ -1,3 +1,42 @@ +connman (1.35-6) unstable; urgency=medium + + * Override lintian warning about unusual wandtedby target + + -- Alf Gaida Fri, 23 Feb 2018 00:34:47 +0100 + +connman (1.35-5) unstable; urgency=medium + + * Fix include order in tethering.c - backported from upstream. + + -- Alf Gaida Tue, 20 Feb 2018 19:26:59 +0100 + +connman (1.35-4) unstable; urgency=medium + + * The provided patch was not enough - added a minimum version for + ppp-dev >= 2.4.7-2+ + + -- Alf Gaida Mon, 19 Feb 2018 18:47:06 +0100 + +connman (1.35-3) unstable; urgency=medium + + [ Chris Boot ] + * Use dh_ppp to generate Breaks for ppp (Closes: #890207) + + [ Alf Gaida ] + * Removed uploaders Mathieu and Shawn (no activity, no valid mail address). + Thank you for your contributions. (Closes: #884620) + * Bump compat to 11 + * Bump debhelper to 11 + * Bump Standards to 4.1.3, no changes needed + * Bumped copyright year + * Fixed rules, removed --with systemd + * Removed build dependency dh-systemd + * Use secure uri in watch + * Fixed some typos in manpages + * Removed lintian overrides for typos + + -- Alf Gaida Sat, 17 Feb 2018 15:22:45 +0100 + connman (1.35-2) unstable; urgency=medium * Fixed: main.conf is installed in wrong location @@ -16,7 +55,7 @@ connman (1.34-1) unstable; urgency=medium * Imported upstream-version 1.34 - * Removed obsolete fix-failure-kernel-4.5.patch + * Removed obsolete fix-failure-kernel-4.5.patch * Removed obsolete deb822610-add-manpage-option.patch, applied upstream * Removed obsolete dhcp-follow-rfc.patch, applied upstream * Bumped Standards to 4.0.0 @@ -33,7 +72,7 @@ * Fix connman.postrm (Closes: #849345) - don't remove state-dir unless when purge - - make removing the resolv.conf symlink more sophisticated + - make removing the resolv.conf symlink more sophisticated * Suggests: connman-vpn -- Alf Gaida Mon, 26 Dec 2016 02:12:30 +0100 @@ -41,7 +80,7 @@ connman (1.33-2) unstable; urgency=medium [ Alf Gaida ] - * Restrict Architecture to linux-any, connman will never work on non + * Restrict Architecture to linux-any, connman will never work on non linux systems - unless systemd will be ported for them * debian/README.debian is always removed (Closes: #833297) * Make connman postinst and postrm more complete diff -Nru connman-1.35/debian/compat connman-1.35/debian/compat --- connman-1.35/debian/compat 2017-08-11 17:11:52.000000000 +0000 +++ connman-1.35/debian/compat 2018-02-16 23:57:51.000000000 +0000 @@ -1 +1 @@ -10 +11 diff -Nru connman-1.35/debian/connman.lintian-overrides connman-1.35/debian/connman.lintian-overrides --- connman-1.35/debian/connman.lintian-overrides 2017-08-11 17:11:52.000000000 +0000 +++ connman-1.35/debian/connman.lintian-overrides 2018-02-22 23:31:51.000000000 +0000 @@ -1,4 +1,4 @@ -# known bug, won't fix +# known bug, won't fix (and also won't fixed upstream) connman: spelling-error-in-binary usr/bin/connmanctl prefered preferred connman: spelling-error-in-binary usr/sbin/connmand prefered preferred @@ -7,11 +7,11 @@ # We know connman: binary-without-manpage usr/sbin/connmand-wait-online +connman: systemd-service-file-refers-to-unusual-wantedby-target lib/systemd/system/connman-wait-online.service network-online.target # Send upstream patch later connman: manpage-has-errors-from-man usr/share/man/man1/connmanctl.1.gz 282: warning [p 4, 6.0i]: cannot adjust line connman: manpage-has-errors-from-man usr/share/man/man8/connman-vpn.8.gz 62: warning [p 1, 8.8i]: cannot adjust line connman: manpage-has-errors-from-man usr/share/man/man8/connman.8.gz 100: warning [p 2, 3.2i]: cannot adjust line -connman: spelling-error-in-manpage usr/share/man/man5/connman-vpn-provider.config.5.gz characers characters -connman: spelling-error-in-manpage usr/share/man/man5/connman.conf.5.gz explicitely explicitly + diff -Nru connman-1.35/debian/control connman-1.35/debian/control --- connman-1.35/debian/control 2017-08-11 17:55:03.000000000 +0000 +++ connman-1.35/debian/control 2018-02-19 17:47:02.000000000 +0000 @@ -1,11 +1,9 @@ Source: connman Maintainer: Alexander Sack -Uploaders: Mathieu Trudel-Lapierre , - Shawn Landden , - Alf Gaida +Uploaders: Alf Gaida Section: net Priority: optional -Build-Depends: debhelper (>= 10), +Build-Depends: debhelper (>= 11), libudev-dev, libglib2.0-dev, libdbus-1-dev, @@ -15,9 +13,8 @@ libxtables-dev, wpasupplicant, libbluetooth-dev, - ppp-dev, - dh-systemd -Standards-Version: 4.0.0 + ppp-dev (>= 2.4.7-2+) +Standards-Version: 4.1.3 Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/connman.git Vcs-Git: https://anonscm.debian.org/git/collab-maint/connman.git Homepage: https://01.org/connman @@ -59,7 +56,8 @@ ${misc:Depends} Recommends: connman (= ${source:Version}), xl2tpd -Breaks: connman (<< 1.21-1) +Breaks: ${misc:Breaks}, + connman (<< 1.21-1) Replaces: connman (<< 1.21-1) Description: Intel Connection Manager daemon - VPN daemon The Linux Connection Manager project provides a daemon for managing diff -Nru connman-1.35/debian/copyright connman-1.35/debian/copyright --- connman-1.35/debian/copyright 2017-08-11 18:04:07.000000000 +0000 +++ connman-1.35/debian/copyright 2018-02-17 10:03:04.000000000 +0000 @@ -9,9 +9,9 @@ Files: debian/* Copyright: 2009-2016 Alexander Sack - 2016-2017 Alf Gaida + 2016-2018 Alf Gaida 2016 Mateusz Łukasik - 2010-2013 Mathieu Trudel + 2010-2013 Mathieu Trudel License: GPL-2+ Files: gweb/gionotls.c @@ -32,7 +32,7 @@ Copyright: 2012 Intel Corporation. All rights reserved License: GPL-2 -Files: src/6to4.c +Files: src/6to4.c Copyright: Alexey Kuznetsov et al. from iproute2 package / 2011 Nokia Corporation. All rights reserved License: GPL-2 diff -Nru connman-1.35/debian/patches/fix-tethering-includes.patch connman-1.35/debian/patches/fix-tethering-includes.patch --- connman-1.35/debian/patches/fix-tethering-includes.patch 1970-01-01 00:00:00.000000000 +0000 +++ connman-1.35/debian/patches/fix-tethering-includes.patch 2018-02-20 18:26:51.000000000 +0000 @@ -0,0 +1,23 @@ +Description: Fixed include order + Backport from upstream. + To make it short: linux/$foo should be included after netinet/in.h + to prevent FTBFS +Author: Alf Gaida +Last-Update: 2018-02-20 + +--- connman-1.35.orig/src/tethering.c ++++ connman-1.35/src/tethering.c +@@ -31,11 +31,11 @@ + #include + #include + #include +-#include + #include + #include +-#include + #include ++#include ++#include + #include + + #include "connman.h" diff -Nru connman-1.35/debian/patches/manpage-fixes.patch connman-1.35/debian/patches/manpage-fixes.patch --- connman-1.35/debian/patches/manpage-fixes.patch 1970-01-01 00:00:00.000000000 +0000 +++ connman-1.35/debian/patches/manpage-fixes.patch 2018-02-17 10:08:57.000000000 +0000 @@ -0,0 +1,26 @@ +Description: Some typos fixed in manpages +Author: Alf Gaida +Last-Update: 2018-02-17 + +--- connman-1.35.orig/doc/connman-vpn-provider.config.5.in ++++ connman-1.35/doc/connman-vpn-provider.config.5.in +@@ -12,7 +12,7 @@ connection_name.config \- ConnMan vpn co + \fIConnMan\fP's vpn connections are configured with so called + "\fBprovisioning files\fP" which reside under \fI@vpn_storagedir@/\fP. + The files can be named anything, as long as they contain only printable +-ascii characers, for example letters, numbers and underscores. The file ++ascii characters, for example letters, numbers and underscores. The file + must end with \fB.config\fP. Each VPN connection requires a provisioning + file, but multiple connections can be specified in the same file. + .SH "FILE FORMAT" +--- connman-1.35.orig/doc/connman.conf.5.in ++++ connman-1.35/doc/connman.conf.5.in +@@ -71,7 +71,7 @@ set up and saved to storage beforehand. + List of technoolgies which are always connected regardless + of PreferredTechnologies setting (AutoConnect = true). The + default value is empty and this feature is disabled unless +-explicitely enabled in the config file. ++explicitly enabled in the config file. + .TP + .BI PreferredTechnologies= technology\fR[,...] + List of preferred technologies from the most preferred diff -Nru connman-1.35/debian/patches/series connman-1.35/debian/patches/series --- connman-1.35/debian/patches/series 2017-08-11 17:11:52.000000000 +0000 +++ connman-1.35/debian/patches/series 2018-02-20 18:22:01.000000000 +0000 @@ -1 +1,3 @@ 01-init-script-lsb-headers.patch +manpage-fixes.patch +fix-tethering-includes.patch diff -Nru connman-1.35/debian/rules connman-1.35/debian/rules --- connman-1.35/debian/rules 2017-08-11 17:11:52.000000000 +0000 +++ connman-1.35/debian/rules 2018-02-17 10:01:33.000000000 +0000 @@ -6,7 +6,7 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed %: - dh $@ --with=systemd,autoreconf \ + dh $@ --with=autoreconf,ppp \ --builddir build \ --as-needed @@ -20,6 +20,7 @@ --enable-pie \ --enable-polkit \ --enable-pptp \ + --enable-selinux \ --enable-threads \ --with-openconnect=/usr/sbin/openconnect \ --with-openvpn=/usr/sbin/openvpn \ @@ -28,7 +29,10 @@ override_dh_install: find $(CURDIR) -name "*.la" -print -delete - dh_install --fail-missing + dh_install + +override_dh_missing: + dh_missing --fail-missing override_dh_installinit: cp -a build/scripts/connman debian/connman.init @@ -41,3 +45,6 @@ override_dh_clean: dh_clean aclocal.m4 config.h.in configure ltmain.sh + +override_dh_ppp: + dh_ppp --breaks diff -Nru connman-1.35/debian/watch connman-1.35/debian/watch --- connman-1.35/debian/watch 2017-08-11 17:11:52.000000000 +0000 +++ connman-1.35/debian/watch 2018-02-17 09:59:48.000000000 +0000 @@ -1,3 +1,3 @@ version=4 opts=dversionmangle=s/\+dfsg$// \ -http://www.kernel.org/pub/linux/network/connman/connman-([0-9.]+)\.tar\.xz +https://www.kernel.org/pub/linux/network/connman/connman-([0-9.]+)\.tar\.xz