[med-svn] [Git][med-team/harvest-tools][master] 3 commits: Fix a frequent parallel FTBFS

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / harvest-tools


Commits:
76b71920 by Andreas Tille at 2018-11-26T06:48:09Z
Fix a frequent parallel FTBFS

- - - - -
64b214a0 by Andreas Tille at 2018-11-26T06:48:51Z
Standards-Version: 4.2.1

- - - - -
ed33b260 by Andreas Tille at 2018-11-26T06:50:54Z
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/parallel.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,16 @@
-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 at 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 at 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
=====================================
@@ -0,0 +1,22 @@
+Description: Fix a frequent parallel FTBFS
+Author: Adrian Bunk <bunk at 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



View it on GitLab: https://salsa.debian.org/med-team/harvest-tools/compare/74853ac81b0e352a7bed58d59a304a939d82fd6d...ed33b260ff0e1962e401c6abadc36a6b60bc6053

-- 
View it on GitLab: https://salsa.debian.org/med-team/harvest-tools/compare/74853ac81b0e352a7bed58d59a304a939d82fd6d...ed33b260ff0e1962e401c6abadc36a6b60bc6053
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20181126/253812ab/attachment-0001.html>