diff -Nru gpsd-3.16/debian/changelog gpsd-3.16/debian/changelog --- gpsd-3.16/debian/changelog 2016-05-15 13:35:27.000000000 +0000 +++ gpsd-3.16/debian/changelog 2016-09-24 12:34:07.000000000 +0000 @@ -1,3 +1,17 @@ +gpsd (3.16-3) unstable; urgency=medium + + * [aa43cc65] Various patches were applied upstream. + Take them from there, removing our version. + * [1444f940] Build with -std=gnu++98. (Closes: #830993) + * [505d032a] Remove netbase/systemd-sysv dependency. + Not needed anymore. (Closes: #768100) + * [b53473f0] Migrate to github. + * [cb624dcb] Add travis.yml build stuff. + * [1c3c3463] Updating gbp.conf to ignore travis.yml for debuild. + * [d870a5c6] Don't rebuild for the static library. + + -- Bernd Zeimetz Sat, 24 Sep 2016 14:34:07 +0200 + gpsd (3.16-2) unstable; urgency=medium * [5001c11a] Do not start gpsd.service by default. diff -Nru gpsd-3.16/debian/control gpsd-3.16/debian/control --- gpsd-3.16/debian/control 2016-05-15 13:37:57.000000000 +0000 +++ gpsd-3.16/debian/control 2016-09-24 12:34:07.000000000 +0000 @@ -20,13 +20,13 @@ dh-python Standards-Version: 3.9.2 Homepage: http://www.catb.org/gpsd/ -Vcs-Browser: http://git.recluse.de/?p=debian/pkg-gpsd.git -Vcs-Git: git://git.recluse.de/debian/pkg-gpsd.git +Vcs-Browser: https://github.com/bzed/pkg-gpsd +Vcs-Git: https://github.com/bzed/pkg-gpsd.git X-Python-Version: >= 2.3 Package: gpsd Architecture: any -Depends: netbase | systemd-sysv, lsb-base (>= 3.2-13), +Depends: lsb-base (>= 3.2-13), adduser (>= 3.34), ${shlibs:Depends}, ${misc:Depends}, libgps22 (= ${binary:Version}) diff -Nru gpsd-3.16/debian/gbp.conf gpsd-3.16/debian/gbp.conf --- gpsd-3.16/debian/gbp.conf 2016-05-15 13:35:27.000000000 +0000 +++ gpsd-3.16/debian/gbp.conf 2016-09-24 12:34:07.000000000 +0000 @@ -15,6 +15,7 @@ [buildpackage] # uncomment this to automatically GPG sign tags sign-tags = True +builder = debuild -i'^\.git' -I.git -i'^\.travis.yml' -I.travis.yml # Options only affecting git-dch [dch] diff -Nru gpsd-3.16/debian/patches/20d3c07_Work-around-yet-another-scons-fuckup gpsd-3.16/debian/patches/20d3c07_Work-around-yet-another-scons-fuckup --- gpsd-3.16/debian/patches/20d3c07_Work-around-yet-another-scons-fuckup 1970-01-01 00:00:00.000000000 +0000 +++ gpsd-3.16/debian/patches/20d3c07_Work-around-yet-another-scons-fuckup 2016-09-24 12:34:07.000000000 +0000 @@ -0,0 +1,85 @@ +From 20d3c077c805ba64331e1a733a09638365abf7a0 Mon Sep 17 00:00:00 2001 +From: Bernd Zeimetz +Date: Sun, 1 May 2016 15:21:45 +0200 +Subject: [PATCH] Work around yet another scons fuckup. + +Scons' CheckFunc does not work with recent compiler versions and +-Wstrict-prototypes being enabled. +--- + SConstruct | 50 ++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 48 insertions(+), 2 deletions(-) + +--- a/SConstruct ++++ b/SConstruct +@@ -383,6 +383,52 @@ values can be listed with 'scons -h'. + + ## Configuration + ++# CheckFunc from upstream scons fails always with -Wstrict-prototypes ++ ++def CheckFuncFor_Wstrict_prototypes(context, function_name, header = None, language = None): ++ if context.headerfilename: ++ includetext = '#include "%s"' % context.headerfilename ++ else: ++ includetext = '' ++ if not header: ++ header = """ ++#ifdef __cplusplus ++extern "C" ++#endif ++char %s(void);""" % function_name ++ ++ if not language or language in ["C", "c"]: ++ lang, suffix, msg = ("C", ".c", None) ++ elif language in ["c++", "C++", "cpp", "CXX", "cxx"]: ++ lang, suffix, msg = ("C++", ".cpp", None) ++ ++ if msg: ++ context.Display("Cannot check for %s(): %s\n" % (function_name, msg)) ++ return msg ++ ++ text = """ ++%(include)s ++#include ++%(hdr)s ++ ++int main(void) { ++#if defined (__stub_%(name)s) || defined (__stub___%(name)s) ++ fail fail fail ++#else ++ %(name)s(); ++#endif ++ ++ return 0; ++} ++""" % { 'name': function_name, ++ 'include': includetext, ++ 'hdr': header } ++ ++ context.Display("Checking for %s function %s()... " % (lang, function_name)) ++ ret = context.TryBuild(context.env.Program, text, suffix) ++ context.Result(ret) ++ return ret ++ + def CheckPKG(context, name): + context.Message( 'Checking for %s... ' % name ) + ret = context.TryAction('%s --exists \'%s\'' % (env['PKG_CONFIG'], name))[0] +@@ -488,7 +534,8 @@ if env.GetOption("clean") or env.GetOpti + htmlbuilder = False + qt_env = None + else: +- config = Configure(env, custom_tests = { 'CheckPKG' : CheckPKG, ++ config = Configure(env, custom_tests = { 'CheckFuncFor_Wstrict_prototypes': CheckFuncFor_Wstrict_prototypes, ++ 'CheckPKG' : CheckPKG, + 'CheckXsltproc' : CheckXsltproc, + 'CheckCompilerOption' : CheckCompilerOption, + 'CheckCompilerDefines' : CheckCompilerDefines, +@@ -668,7 +715,7 @@ else: + # check function after libraries, because some function require libraries + # for example clock_gettime() require librt on Linux glibc < 2.17 + for f in ("daemon", "strlcpy", "strlcat", "clock_gettime"): +- if config.CheckFunc(f): ++ if config.CheckFuncFor_Wstrict_prototypes(f): + confdefs.append("#define HAVE_%s 1\n" % f.upper()) + else: + confdefs.append("/* #undef HAVE_%s */\n" % f.upper()) diff -Nru gpsd-3.16/debian/patches/54db139_Buildflags-need-to-be-splitted-into-an-array gpsd-3.16/debian/patches/54db139_Buildflags-need-to-be-splitted-into-an-array --- gpsd-3.16/debian/patches/54db139_Buildflags-need-to-be-splitted-into-an-array 1970-01-01 00:00:00.000000000 +0000 +++ gpsd-3.16/debian/patches/54db139_Buildflags-need-to-be-splitted-into-an-array 2016-09-24 12:34:07.000000000 +0000 @@ -0,0 +1,20 @@ +From 54db1396cf9631217c220fa4f5f0bd80caac13e6 Mon Sep 17 00:00:00 2001 +From: Bernd Zeimetz +Date: Sun, 1 May 2016 15:47:12 +0200 +Subject: [PATCH] Buildflags need to be splitted into an array. + +--- + SConstruct | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/SConstruct ++++ b/SConstruct +@@ -264,7 +264,7 @@ for i in ["AR", "ARFLAGS", "CCFLAGS", "C + env.Replace(**{j: os.getenv(i)}) + for flag in ["LDFLAGS", "SHLINKFLAGS", "CPPFLAGS"]: + if os.environ.has_key(flag): +- env.MergeFlags({flag : [os.getenv(flag)]}) ++ env.MergeFlags({flag : Split(os.getenv(flag))}) + + + # Keep scan-build options in the environment diff -Nru gpsd-3.16/debian/patches/943dec7_time.h-on-linux-defines-__timespec_defined gpsd-3.16/debian/patches/943dec7_time.h-on-linux-defines-__timespec_defined --- gpsd-3.16/debian/patches/943dec7_time.h-on-linux-defines-__timespec_defined 1970-01-01 00:00:00.000000000 +0000 +++ gpsd-3.16/debian/patches/943dec7_time.h-on-linux-defines-__timespec_defined 2016-09-24 12:34:07.000000000 +0000 @@ -0,0 +1,26 @@ +From 943dec7435ee2538d53272132e68b163f4470c2b Mon Sep 17 00:00:00 2001 +From: Bernd Zeimetz +Date: Sun, 1 May 2016 12:44:38 +0200 +Subject: [PATCH] time.h on linux defines __timespec_defined. + +Enhance the check for struct timespec as building in +Debian unstable fails otherwise. +--- + SConstruct | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/SConstruct ++++ b/SConstruct +@@ -745,7 +745,11 @@ typedef int clockid_t; + #define CLOCKID_T_DEFINED + # endif + /* OS X uses _STRUCT_TIMESPEC, but no clock_gettime */ +-#ifndef _STRUCT_TIMESPEC ++#if !defined(_STRUCT_TIMESPEC) && \ ++ !defined(_TIMESPEC) && \ ++ !defined(_TIMESPEC_DECLARED) && \ ++ !defined(__timespec_defined) ++ + struct timespec { + time_t tv_sec; + long tv_nsec; diff -Nru gpsd-3.16/debian/patches/fix_clock_gettime_check gpsd-3.16/debian/patches/fix_clock_gettime_check --- gpsd-3.16/debian/patches/fix_clock_gettime_check 2016-05-15 13:35:27.000000000 +0000 +++ gpsd-3.16/debian/patches/fix_clock_gettime_check 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ ---- a/SConstruct -+++ b/SConstruct -@@ -736,7 +736,7 @@ size_t strlcpy(/*@out@*/char *dst, /*@in - } - # endif - #endif --#ifndef HAVE_CLOCK_GETTIME -+#ifndef _POSIX_TIMERS - # ifdef __cplusplus - extern "C" { - # endif ---- a/gpsd.h-head -+++ b/gpsd.h-head -@@ -14,6 +14,7 @@ extern "C" { - #include - #include - #include /* for time_t */ -+#include /* for _POSIX_TIMERS */ - - #ifndef GPSD_CONFIG_H - /* Feature configuration switches begin here */ diff -Nru gpsd-3.16/debian/patches/fix_cppflags_parsing gpsd-3.16/debian/patches/fix_cppflags_parsing --- gpsd-3.16/debian/patches/fix_cppflags_parsing 2016-05-15 13:35:27.000000000 +0000 +++ gpsd-3.16/debian/patches/fix_cppflags_parsing 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ ---- a/SConstruct -+++ b/SConstruct -@@ -264,7 +264,7 @@ for i in ["AR", "ARFLAGS", "CCFLAGS", "C - env.Replace(**{j: os.getenv(i)}) - for flag in ["LDFLAGS", "SHLINKFLAGS", "CPPFLAGS"]: - if os.environ.has_key(flag): -- env.MergeFlags({flag : [os.getenv(flag)]}) -+ env.MergeFlags({flag : Split(os.getenv(flag))}) - - - # Keep scan-build options in the environment diff -Nru gpsd-3.16/debian/patches/fix_timespec_struct_check gpsd-3.16/debian/patches/fix_timespec_struct_check --- gpsd-3.16/debian/patches/fix_timespec_struct_check 2016-05-15 13:35:27.000000000 +0000 +++ gpsd-3.16/debian/patches/fix_timespec_struct_check 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ ---- a/SConstruct -+++ b/SConstruct -@@ -746,11 +746,13 @@ typedef int clockid_t; - # endif - /* OS X uses _STRUCT_TIMESPEC, but no clock_gettime */ - #ifndef _STRUCT_TIMESPEC -+#ifndef __timespec_defined - struct timespec { - time_t tv_sec; - long tv_nsec; - }; - #endif -+#endif - #define CLOCK_REALTIME 0 - int clock_gettime(clockid_t, struct timespec *); - # ifdef __cplusplus ---- a/clock_gettime.c -+++ b/clock_gettime.c -@@ -15,7 +15,10 @@ - #include - #endif - --#ifndef HAVE_CLOCK_GETTIME -+#include -+ -+#ifndef _POSIX_TIMERS -+ - int clock_gettime(clockid_t clk_id UNUSED, struct timespec *ts) - { - #ifdef __MACH__ // OS X and hurd do not have clock_gettime, use clock_get_time -@@ -43,6 +46,6 @@ int clock_gettime(clockid_t clk_id UNUSE - #endif /* __MACH__ */ - return 0; - } --#endif /* HAVE_CLOCK_GETTIME */ -+#endif /* _POSIX_TIMERS */ - - /* end */ diff -Nru gpsd-3.16/debian/patches/series gpsd-3.16/debian/patches/series --- gpsd-3.16/debian/patches/series 2016-05-15 13:35:27.000000000 +0000 +++ gpsd-3.16/debian/patches/series 2016-09-24 12:34:07.000000000 +0000 @@ -1,7 +1,7 @@ full-systemd-support gpsd_hotplug_rules_disable_generic_serial_converters -fix_cppflags_parsing 1a35ea0_Ensure-the-test_gpsmm-program-compiles 65f2a7e_Fix-FTBFS-on-hurd -fix_clock_gettime_check -fix_timespec_struct_check +943dec7_time.h-on-linux-defines-__timespec_defined +20d3c07_Work-around-yet-another-scons-fuckup +54db139_Buildflags-need-to-be-splitted-into-an-array diff -Nru gpsd-3.16/debian/rules gpsd-3.16/debian/rules --- gpsd-3.16/debian/rules 2016-05-15 13:35:27.000000000 +0000 +++ gpsd-3.16/debian/rules 2016-09-24 12:34:07.000000000 +0000 @@ -52,9 +52,6 @@ SCONSOPTS += debug=no endif -SCONSSTATICOPTS = python=no shared=no - - #package names PACKAGE_GPSD := gpsd PACKAGE_CLIENTS := gpsd-clients @@ -66,9 +63,9 @@ PACKAGE_GPSDDBG := gpsd-dbg -cflags := $(shell dpkg-buildflags --get CFLAGS) +cflags := $(shell dpkg-buildflags --get CFLAGS) -std=gnu++98 cppflags := $(shell dpkg-buildflags --get CPPFLAGS) -cxxflags := $(shell dpkg-buildflags --get CXXFLAGS) +cxxflags := $(shell dpkg-buildflags --get CXXFLAGS) -std=gnu++98 ldflags := $(shell dpkg-buildflags --get LDFLAGS) SCONS_ENV := set -e ;\ @@ -125,16 +122,7 @@ touch $@ build-static-stamp: SConstruct.deb_revision - mkdir static_lib - find . \ - -mindepth 1 -maxdepth 1 \ - -name static_lib \ - -prune \ - -o -name debian -prune \ - -o -exec cp -pr {} static_lib \; - $(SCONS_ENV) scons -C static_lib $(SCONSOPTS) --clean ;\ - $(SCONS_ENV) scons -C static_lib $(SCONSOPTS) sconsclean || true ;\ - $(SCONS_ENV) scons -C static_lib $(SCONSOPTS) $(SCONSSTATICOPTS) libgps.a + cp libgps_static.a libgps.a touch $@ clean: debian/control @@ -158,9 +146,9 @@ TROUBLESHOOTING \ debian/buildinfo.gz \ config.log \ - static_lib \ debian/shlibs.local \ leapsecond.pyc \ + libgps.a \ $(LIBGPS_DEBIAN_FILE_TARGETS) dh_clean @@ -175,7 +163,7 @@ $(SCONS_ENV) DESTDIR=`pwd`/debian/tmp python$${py}-dbg /usr/bin/scons install $(SCONSOPTS) ;\ done # install static lib - cp static_lib/libgps.a debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) + cp libgps.a debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) cp INSTALL TROUBLESHOOTING # install systemd files mkdir -p debian/tmp/lib/systemd/system diff -Nru gpsd-3.16/debian/source/options gpsd-3.16/debian/source/options --- gpsd-3.16/debian/source/options 1970-01-01 00:00:00.000000000 +0000 +++ gpsd-3.16/debian/source/options 2016-09-24 12:34:07.000000000 +0000 @@ -0,0 +1,2 @@ +compression = xz +extend-diff-ignore = '^\.travis\.yml$'