diff -Nru goldencheetah-3.2.0/debian/changelog goldencheetah-3.2.0/debian/changelog --- goldencheetah-3.2.0/debian/changelog 2015-08-12 14:49:39.000000000 +0000 +++ goldencheetah-3.2.0/debian/changelog 2018-10-23 05:17:11.000000000 +0000 @@ -1,3 +1,13 @@ +goldencheetah (3.2.0-1+rpi1) stretch-staging; urgency=medium + + * Change build-dependency from libnss3-1d to libnss3 + * Build with gcc/g++ 5 + * Fix clean target + * Add flex version check fix backported from 3.3.0-2 by KURASHIKI Satoru + * Use the dynamic libical, the static one seems to be causing dependency issues. + + -- Peter Michael Green Tue, 23 Oct 2018 05:17:11 +0000 + goldencheetah (3.2.0-1) unstable; urgency=medium * New upstream release. diff -Nru goldencheetah-3.2.0/debian/control goldencheetah-3.2.0/debian/control --- goldencheetah-3.2.0/debian/control 2015-08-12 14:49:13.000000000 +0000 +++ goldencheetah-3.2.0/debian/control 2018-10-23 05:17:11.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: KURASHIKI Satoru Uploaders: Tatsuya Kinoshita -Build-Depends: debhelper (>= 9.0.0), libqt4-opengl-dev, libboost-dev, libqwtplot3d-qt4-dev, libkml-dev, liboauth-dev, libcurl4-nss-dev, zlib1g-dev, libgcrypt-dev, libqtwebkit-dev, libnss3-1d, bison, flex, dpkg-dev (>= 1.16.1~), libical-dev, libvlc-dev, libvlccore-dev, libclucene-dev, qt4-qmake, libexpat1-dev, texinfo, texlive, texlive-latex-base, texlive-fonts-recommended, texlive-generic-recommended, qt4-linguist-tools, libusb-dev +Build-Depends: debhelper (>= 9.0.0), libqt4-opengl-dev, libboost-dev, libqwtplot3d-qt4-dev, libkml-dev, liboauth-dev, libcurl4-nss-dev, zlib1g-dev, libgcrypt-dev, libqtwebkit-dev, libnss3, bison, flex, dpkg-dev (>= 1.16.1~), libical-dev, libvlc-dev, libvlccore-dev, libclucene-dev, qt4-qmake, libexpat1-dev, texinfo, texlive, texlive-latex-base, texlive-fonts-recommended, texlive-generic-recommended, qt4-linguist-tools, libusb-dev, gcc-5, g++-5 Standards-Version: 3.9.6 Vcs-Git: git://anonscm.debian.org/collab-maint/goldencheetah.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/goldencheetah.git;a=summary diff -Nru goldencheetah-3.2.0/debian/patches/series goldencheetah-3.2.0/debian/patches/series --- goldencheetah-3.2.0/debian/patches/series 2014-08-19 05:03:26.000000000 +0000 +++ goldencheetah-3.2.0/debian/patches/series 2018-10-23 05:17:11.000000000 +0000 @@ -1,2 +1,4 @@ kfreebsd-ttycom append-uncompressed-jquery +tweak-flex-version-check +use-dynamic-libical diff -Nru goldencheetah-3.2.0/debian/patches/tweak-flex-version-check goldencheetah-3.2.0/debian/patches/tweak-flex-version-check --- goldencheetah-3.2.0/debian/patches/tweak-flex-version-check 1970-01-01 00:00:00.000000000 +0000 +++ goldencheetah-3.2.0/debian/patches/tweak-flex-version-check 2018-10-23 05:17:11.000000000 +0000 @@ -0,0 +1,57 @@ +Index: goldencheetah/src/DataFilter.l +=================================================================== +--- goldencheetah.orig/src/DataFilter.l ++++ goldencheetah/src/DataFilter.l +@@ -22,6 +22,17 @@ + // need to get rid of this and use a string... + #include + ++#ifdef YY_FLEX_SUBMINOR_VERSION ++# define YY_FLEX_VERSION \ ++ (YY_FLEX_MAJOR_VERSION) * 1000000 \ +++ (YY_FLEX_MINOR_VERSION) * 1000 \ +++ (YY_FLEX_SUBMINOR_VERSION) ++#else ++# define YY_FLEX_VERSION \ ++ (YY_FLEX_MAJOR_VERSION) * 1000000 \ +++ (YY_FLEX_MINOR_VERSION) * 1000 ++#endif ++ + // tokens + #include "DataFilter_yacc.h"/* generated by the scanner */ + +@@ -100,7 +111,7 @@ int DataFiltercolumn = 1; + + // Older versions of flex (prior to 2.5.9) do not have the destroy function + // Or We're not using GNU flex then we also won't have a destroy function +-#if !defined(FLEX_SCANNER) || (YY_FLEX_SUBMINOR_VERSION < 9) ++#if !defined(FLEX_SCANNER) || (YY_FLEX_VERSION < 2005009) + int DataFilterlex_destroy(void) { return 0; } + #endif + +Index: goldencheetah/src/JsonRideFile.l +=================================================================== +--- goldencheetah.orig/src/JsonRideFile.l ++++ goldencheetah/src/JsonRideFile.l +@@ -161,7 +161,7 @@ void JsonRideFilefree (void * ptr , yysc + + // Older versions of flex (prior to 2.5.9) do not have the destroy function + // Or We're not using GNU flex then we also won't have a destroy function +-#if !defined(FLEX_SCANNER) || (YY_FLEX_SUBMINOR_VERSION < 9) ++#if !defined(FLEX_SCANNER) || (YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 9) + int JsonRideFilelex_destroy(void*) { return 0; } + #endif + +Index: goldencheetah/src/RideDB.l +=================================================================== +--- goldencheetah.orig/src/RideDB.l ++++ goldencheetah/src/RideDB.l +@@ -114,7 +114,7 @@ void RideDBfree (void * ptr , yyscan_t / + + // Older versions of flex (prior to 2.5.9) do not have the destroy function + // Or We're not using GNU flex then we also won't have a destroy function +-#if !defined(FLEX_SCANNER) || (YY_FLEX_SUBMINOR_VERSION < 9) ++#if !defined(FLEX_SCANNER) || (YY_FLEX_MINOR_VERSION < 6 && YY_FLEX_SUBMINOR_VERSION < 9) + int RideDBlex_destroy(void*) { return 0; } + #endif + diff -Nru goldencheetah-3.2.0/debian/patches/use-dynamic-libical goldencheetah-3.2.0/debian/patches/use-dynamic-libical --- goldencheetah-3.2.0/debian/patches/use-dynamic-libical 1970-01-01 00:00:00.000000000 +0000 +++ goldencheetah-3.2.0/debian/patches/use-dynamic-libical 2018-10-23 05:17:11.000000000 +0000 @@ -0,0 +1,27 @@ +Description: Use the dynamic libical, the static one seems to be causing dependency issues. +Author: Peter Michael Green + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: https://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: 2018-10-24 + +--- goldencheetah-3.2.0.orig/src/src.pro ++++ goldencheetah-3.2.0/src/src.pro +@@ -112,7 +112,7 @@ CONFIG(debug, debug|release) { + + !isEmpty( ICAL_INSTALL ) { + isEmpty( ICAL_INCLUDE ) { ICAL_INCLUDE = $${ICAL_INSTALL}/include } +- isEmpty( ICAL_LIBS ) { ICAL_LIBS = $${ICAL_INSTALL}/lib/libical.a } ++ isEmpty( ICAL_LIBS ) { ICAL_LIBS = -lical } + INCLUDEPATH += $${ICAL_INCLUDE} + LIBS += $${ICAL_LIBS} + DEFINES += GC_HAVE_ICAL diff -Nru goldencheetah-3.2.0/debian/rules goldencheetah-3.2.0/debian/rules --- goldencheetah-3.2.0/debian/rules 2014-08-20 12:03:45.000000000 +0000 +++ goldencheetah-3.2.0/debian/rules 2018-10-23 05:17:11.000000000 +0000 @@ -17,7 +17,12 @@ %: dh $@ --parallel +export PATH:=$(CURDIR)/gccbin:$(PATH) + override_dh_auto_configure: + mkdir gccbin + ln -s /usr/bin/gcc-5 gccbin/gcc + ln -s /usr/bin/g++-5 gccbin/g++ cp $(CURDIR)/debian/gcconfig.pri $(CURDIR)/src/ cp $(CURDIR)/debian/qwtconfig.pri $(CURDIR)/qwt/ ifeq ($(findstring kfreebsd,$(DEB_BUILD_ARCH)),kfreebsd) @@ -36,6 +41,7 @@ fi; \ done + override_dh_auto_install: override_dh_installdocs: @@ -48,4 +54,7 @@ rm -rf qwt/lib qwt/qwtconfig.pri src/gcconfig.pri -mv src/src.pro.orig src/src.pro dh_auto_clean - + rm -f `find . -name '*.o'` + rm -rf qwt/src/moc + rm -f src/moc* + rm -rf gccbin