Bug#760120: shogun: diff for NMU version 3.2.0-7.2

2014-09-01 Thread Gilles Filippini 
On Mon, 01 Sep 2014 01:31:26 +0200 Gilles Filippini p...@debian.org wrote:
 Package: shogun
 Version: 3.2.0-7.1
 Severity: normal
 Tags: patch pending
 
 Dear maintainer,
 
 I've prepared an NMU for shogun (versioned as 3.2.0-7.2) and
 uploaded it to DELAYED/1. Please feel free to tell me if I
 should delay it longer.
 
 This upload fixes two FTBFSs blocking the ongoing hdf5 transition:
 * on mips* /usr/bin/clang is now provided by the clang package;
 * on kfreebsd-i386 a dot process hangs forever; a successfully tested
   workaround is to force dot to run on one thread only via the 
   DOT_NUM_THREADS setting in Doxyfile.

I've canceled the upload because the second failure should be fixed by
the last graphviz upload (2.38.0-7).

I'll upload by tomorrow a new NMU to DELAYED/0 to fix the FTBFS on mips*.

Thanks,

_g.



signature.asc
Description: OpenPGP digital signature

Bug#760120: shogun: diff for NMU version 3.2.0-7.2

2014-08-31 Thread Gilles Filippini 
Package: shogun
Version: 3.2.0-7.1
Severity: normal
Tags: patch pending

Dear maintainer,

I've prepared an NMU for shogun (versioned as 3.2.0-7.2) and
uploaded it to DELAYED/1. Please feel free to tell me if I
should delay it longer.

This upload fixes two FTBFSs blocking the ongoing hdf5 transition:
* on mips* /usr/bin/clang is now provided by the clang package;
* on kfreebsd-i386 a dot process hangs forever; a successfully tested
  workaround is to force dot to run on one thread only via the 
  DOT_NUM_THREADS setting in Doxyfile.

Regards.

_g.

diff -Nru shogun-3.2.0/debian/changelog shogun-3.2.0/debian/changelog
--- shogun-3.2.0/debian/changelog   2014-08-27 10:36:29.0 +0200
+++ shogun-3.2.0/debian/changelog   2014-08-31 22:35:12.0 +0200
@@ -1,3 +1,14 @@
+shogun (3.2.0-7.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Build-Depends: clang instead of clang-3.4
+/usr/bin/clang is now provided by clang since co-installability of
+clang-* packages.
+  * On kfreebsd-i386 force doxygen to run dot sequentialy to workaround
+a not yet explained dot process hanging.
+
+ -- Gilles Filippini p...@debian.org  Sun, 31 Aug 2014 18:11:41 +0200
+
 shogun (3.2.0-7.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru shogun-3.2.0/debian/control shogun-3.2.0/debian/control
--- shogun-3.2.0/debian/control 2014-08-27 10:33:12.0 +0200
+++ shogun-3.2.0/debian/control 2014-08-31 18:11:37.0 +0200
@@ -9,7 +9,7 @@
  liblzo2-dev, zlib1g-dev, liblzma-dev, libxml2-dev, libjson-c-dev, cmake,
  libarpack2-dev, libsnappy-dev, libhdf5-dev (= 1.8.8~) | libhdf5-serial-dev,
  libprotobuf-dev, protobuf-compiler, libcurl4-gnutls-dev, libbz2-dev, 
libcolpack-dev,
- clang-3.4 [mips mipsel powerpc]
+ clang [mips mipsel powerpc]
 Standards-Version: 3.9.5
 Homepage: http://www.shogun-toolbox.org
 Vcs-Svn: http://bollin.googlecode.com/svn/shogun/trunk/
diff -Nru shogun-3.2.0/debian/rules shogun-3.2.0/debian/rules
--- shogun-3.2.0/debian/rules   2014-07-11 21:42:37.0 +0200
+++ shogun-3.2.0/debian/rules   2014-08-31 23:42:38.0 +0200
@@ -19,6 +19,22 @@
 
 override_dh_auto_configure:
dh_auto_configure -- -DCMAKE_SKIP_RPATH=TRUE -DBUILD_EXAMPLES=OFF 
-DUSE_SVMLIGHT=OFF -DCmdLineStatic=ON $(OVERRIDE_COMPILER) $(DISABLE_SSE)
+ifeq ($(ARCH),kfreebsd-i386)
+   # Workaround dot process hanging on kfreebsd-i386 when run on multiple 
threads
+   sed -i.orig '$$s/$$/\nDOT_NUM_THREADS = 1/' doc/Doxyfile_*.in
+endif
+
+DOXYFILES_IN := $(shell ls doc/Doxyfile_*.in)
+DOXYFILES_OUT := $(DOXYFILES_IN:.in=)
+override_dh_clean:
+ifeq ($(ARCH),kfreebsd-i386)
+   cd doc  if ls Doxyfile_*.in.orig; then \
+   for file in Doxyfile_*.in.orig; do \
+   mv $$file $$(basename $$file .orig) || exit 1; \
+   done; \
+   fi
+endif
+   dh_clean $(DOXYFILES_OUT)
 
 override_dh_install:
$(MAKE) -C doc doc


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org