Control: tags 912113 + pending

Dear maintainer,

I've prepared an NMU for harvest-tools (versioned as 1.3-2.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-07-17 18:00:34.000000000 +0300
+++ harvest-tools-1.3/debian/changelog	2018-11-25 18:48:23.000000000 +0200
@@ -1,3 +1,10 @@
+harvest-tools (1.3-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix a frequent parallel FTBFS. (Closes: #912113)
+
+ -- Adrian Bunk <b...@debian.org>  Sun, 25 Nov 2018 18:48:23 +0200
+
 harvest-tools (1.3-2) unstable; urgency=medium
 
   [ Steffen Moeller ]
diff -Nru harvest-tools-1.3/debian/patches/parallel.patch harvest-tools-1.3/debian/patches/parallel.patch
--- harvest-tools-1.3/debian/patches/parallel.patch	1970-01-01 02:00:00.000000000 +0200
+++ harvest-tools-1.3/debian/patches/parallel.patch	2018-10-28 12:51:06.000000000 +0200
@@ -0,0 +1,22 @@
+Description: Fix a frequent parallel FTBFS
+Author: Adrian Bunk <b...@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
diff -Nru harvest-tools-1.3/debian/patches/series harvest-tools-1.3/debian/patches/series
--- harvest-tools-1.3/debian/patches/series	2018-07-17 18:00:34.000000000 +0300
+++ harvest-tools-1.3/debian/patches/series	2018-10-28 12:50:02.000000000 +0200
@@ -2,3 +2,4 @@
 dynamic_linking.patch
 hardening.patch
 remove_memwrap.patch
+parallel.patch

Reply via email to