debian/changelog

-harvest-tools (1.3-3) UNRELEASED; urgency=medium
+harvest-tools (1.3-3) unstable; urgency=medium
 
+  [ Jelmer Vernoo ]
   * Trim trailing whitespace.
   * Use secure copyright file specification URI.
 
- -- Jelmer Vernooij <jelmer@debian.org>  Sun, 14 Oct 2018 19:03:43 +0000
+  [ Adrian Bunk ]
+  Fix a frequent parallel FTBFS. (Closes: #912113)
+
+  [ Andreas Tille ]
+  * Standards-Version: 4.2.1
+
+ -- Andreas Tille <tille@debian.org>  Mon, 26 Nov 2018 07:48:51 +0100
 
 harvest-tools (1.3-2) unstable; urgency=medium
 

debian/control

@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 11~),
                libprotobuf-dev,
                libcapnp-dev,
                zlib1g-dev
-Standards-Version: 4.1.5
+Standards-Version: 4.2.1
 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/parallel.patch

+Description: Fix a frequent parallel FTBFS
+Author: Adrian Bunk <bunk@debian.org>
+
+--- harvest-tools-1.3.orig/Makefile.in
++++ harvest-tools-1.3/Makefile.in
+@@ -37,10 +37,14 @@ harvesttools : $(OBJECTS)
+ %.o : %.cc
+ 	$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $<
+ 
+-src/harvest/pb/harvest.pb.cc src/harvest/pb/harvest.pb.h : src/harvest/pb/harvest.proto
++src/harvest/pb/harvest.pb.cc : src/harvest/pb/harvest.pb.h
++
++src/harvest/pb/harvest.pb.h : src/harvest/pb/harvest.proto
+ 	cd src; @protobuf@/bin/protoc --cpp_out . harvest/pb/harvest.proto
+ 
+-src/harvest/capnp/harvest.capnp.c++ src/harvest/capnp/harvest.capnp.h : src/harvest/capnp/harvest.capnp
++src/harvest/capnp/harvest.capnp.c++ : src/harvest/capnp/harvest.capnp.h
++
++src/harvest/capnp/harvest.capnp.h : src/harvest/capnp/harvest.capnp
+ 	cd src/harvest/capnp;export PATH=@capnp@/bin/:${PATH};capnp compile -I @capnp@/include -oc++ harvest.capnp
+ 
+ install : harvesttools

debian/patches/series

@@ -2,3 +2,4 @@ fix_readme_in_setup.patch
 dynamic_linking.patch
 hardening.patch
 remove_memwrap.patch
+parallel.patch