Control: tags 917511 + pending
Dear maintainer,
I've prepared an NMU for harvest-tools (versioned as 1.3-3.1) and
uploaded it to DELAYED/14. Please feel free to tell me if I should
cancel it.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
diff -Nru harvest-tools-1.3/debian/changelog harvest-tools-1.3/debian/changelog
--- harvest-tools-1.3/debian/changelog 2018-11-26 08:48:51.000000000 +0200
+++ harvest-tools-1.3/debian/changelog 2019-01-11 22:27:35.000000000 +0200
@@ -1,3 +1,11 @@
+harvest-tools (1.3-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add fix from Peter Michael Green for FTBFS with new capng.
+ (Closes: #917511)
+
+ -- Adrian Bunk <[email protected]> Fri, 11 Jan 2019 22:27:35 +0200
+
harvest-tools (1.3-3) unstable; urgency=medium
[ Jelmer Vernoo ]
diff -Nru harvest-tools-1.3/debian/patches/series harvest-tools-1.3/debian/patches/series
--- harvest-tools-1.3/debian/patches/series 2018-11-26 08:48:51.000000000 +0200
+++ harvest-tools-1.3/debian/patches/series 2019-01-11 22:27:32.000000000 +0200
@@ -3,3 +3,4 @@
hardening.patch
remove_memwrap.patch
parallel.patch
+use-c++-14.patch
diff -Nru harvest-tools-1.3/debian/patches/use-c++-14.patch harvest-tools-1.3/debian/patches/use-c++-14.patch
--- harvest-tools-1.3/debian/patches/use-c++-14.patch 1970-01-01 02:00:00.000000000 +0200
+++ harvest-tools-1.3/debian/patches/use-c++-14.patch 2019-01-11 22:27:35.000000000 +0200
@@ -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)
+
