Andreas Tille pushed to branch master at Debian Med / harvest-tools
Commits: 1433684d by Andreas Tille at 2019-01-11T20:41:22Z Add fix from Peter Michael Green for FTBFS with new capng - - - - - 943ebbf0 by Andreas Tille at 2019-01-11T20:41:36Z debhelper 12 - - - - - 1c9d7022 by Andreas Tille at 2019-01-11T20:41:38Z Standards-Version: 4.3.0 - - - - - f1d01550 by Andreas Tille at 2019-01-11T20:47:34Z override_dh_auto_clean - - - - - 80be77f9 by Andreas Tille at 2019-01-11T20:49:28Z Upload to unstable - - - - - 6 changed files: - debian/changelog - debian/compat - debian/control - debian/patches/series - + debian/patches/use-c++-14.patch - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,15 @@ +harvest-tools (1.3-4) unstable; urgency=medium + + [ Adrian Bunk ] + * Add fix from Peter Michael Green for FTBFS with new capng. + (Closes: #917511) + + [ Andreas Tille ] + * debhelper 12 (+override_dh_auto_clean) + * Standards-Version: 4.3.0 + + -- Andreas Tille <[email protected]> Fri, 11 Jan 2019 21:47:40 +0100 + harvest-tools (1.3-3) unstable; urgency=medium [ Jelmer Vernoo ] ===================================== debian/compat ===================================== @@ -1 +1 @@ -11 +12 ===================================== debian/control ===================================== @@ -3,7 +3,7 @@ Maintainer: Debian Med Packaging Team <[email protected]. Uploaders: Andreas Tille <[email protected]> Section: science Priority: optional -Build-Depends: debhelper (>= 11~), +Build-Depends: debhelper (>= 12~), cython, python-setuptools, protobuf-compiler, @@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 11~), libprotobuf-dev, libcapnp-dev, zlib1g-dev -Standards-Version: 4.2.1 +Standards-Version: 4.3.0 Vcs-Browser: https://salsa.debian.org/med-team/harvest-tools Vcs-Git: https://salsa.debian.org/med-team/harvest-tools.git Homepage: http://harvest.readthedocs.org/en/latest/content/harvest-tools.html ===================================== debian/patches/series ===================================== @@ -3,3 +3,4 @@ dynamic_linking.patch hardening.patch remove_memwrap.patch parallel.patch +use-c++-14.patch ===================================== debian/patches/use-c++-14.patch ===================================== @@ -0,0 +1,28 @@ +Description: Use c++14 rather than c++11 for compatibility with new capng. +Author: Peter Michael Green <[email protected]> +Bug-Debian: https://bugs.debian.org/917511 +Last-Update: 2018-12-27 + +Index: harvest-tools-1.3/configure.ac +=================================================================== +--- harvest-tools-1.3.orig/configure.ac ++++ harvest-tools-1.3/configure.ac +@@ -29,7 +29,7 @@ then + AC_MSG_ERROR([Cap'n Proto compiler (capnp) not found.]) + fi + +-CPPFLAGS="-I$with_protobuf/include -I$with_capnp/include -std=c++11" ++CPPFLAGS="-I$with_protobuf/include -I$with_capnp/include -std=c++14" + + AC_CHECK_HEADER(google/protobuf/stubs/common.h, [result=1], [result=0]) + +Index: harvest-tools-1.3/Makefile.in +=================================================================== +--- harvest-tools-1.3.orig/Makefile.in ++++ harvest-tools-1.3/Makefile.in +@@ -1,4 +1,4 @@ +-CXXFLAGS += -std=c++11 -Isrc -I@protobuf@/include -I@capnp@/include ++CXXFLAGS += -std=c++14 -Isrc -I@protobuf@/include -I@capnp@/include + + UNAME_S=$(shell uname -s) + ===================================== debian/rules ===================================== @@ -7,6 +7,10 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: dh $@ +# dh autodetection tries python-distutils which is not avialable in dh 12 +override_dh_auto_clean: + if [ -f Makefile ] ; then make clean ; fi + override_dh_auto_configure: dh_auto_configure -- --with-protobuf=/usr --with-capnp=/usr View it on GitLab: https://salsa.debian.org/med-team/harvest-tools/compare/bdce5280976a0b16496d456d44a4d2ef9704231b...80be77f9b15fe7138d91a2fdfeab8dfd44dbe76b -- View it on GitLab: https://salsa.debian.org/med-team/harvest-tools/compare/bdce5280976a0b16496d456d44a4d2ef9704231b...80be77f9b15fe7138d91a2fdfeab8dfd44dbe76b You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
