Bug#914649: libvigraimpex: diff for NMU version 1.10.0+git20160211.167be93+dfsg-6.1

[Gilles Filippini]

Control: tags 914649 + pending

Dear maintainer,

I've prepared an NMU for libvigraimpex (versioned as
1.10.0+git20160211.167be93+dfsg-6.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards,

_g.

diff -Nru libvigraimpex-1.10.0+git20160211.167be93+dfsg/debian/changelog
libvigraimpex-1.10.0+git20160211.167be93+dfsg/debian/changelog
--- libvigraimpex-1.10.0+git20160211.167be93+dfsg/debian/changelog
2018-08-11 06:20:04.000000000 +0200
+++ libvigraimpex-1.10.0+git20160211.167be93+dfsg/debian/changelog
2018-11-29 20:39:23.000000000 +0100
@@ -1,3 +1,11 @@
+libvigraimpex (1.10.0+git20160211.167be93+dfsg-6.1) unstable;
urgency=medium
+
+  * Non-maintainer upload.
+  * New patch link-with-pthread.patch to fix FTBFS against boost1.67 on
+    armel (Closes: #914649)
+
+ -- Gilles Filippini <pini at debian.org>  Thu, 29 Nov 2018 20:39:23 +0100
+
 libvigraimpex (1.10.0+git20160211.167be93+dfsg-6) unstable; urgency=medium
    * add multi_convolution_fix_incomplete_template_paramater.patch
diff -Nru
libvigraimpex-1.10.0+git20160211.167be93+dfsg/debian/patches/link-with-pthread.patch
libvigraimpex-1.10.0+git20160211.167be93+dfsg/debian/patches/link-with-pthread.patch
---
libvigraimpex-1.10.0+git20160211.167be93+dfsg/debian/patches/link-with-pthread.patch
1970-01-01 01:00:00.000000000 +0100
+++
libvigraimpex-1.10.0+git20160211.167be93+dfsg/debian/patches/link-with-pthread.patch
2018-11-29 20:39:23.000000000 +0100
@@ -0,0 +1,16 @@
+Description: Workaround to fix FTBFS on armel
+  /usr/bin/ld:
CMakeFiles/test_blockwisewatersheds.dir/test_watersheds.cxx.o:
+    undefined reference to symbol 'pthread_condattr_setclock@@GLIBC_2.4'
+Index:
libvigraimpex-1.10.0+git20160211.167be93+dfsg/config/VigraConfigureThreading.cmake
+===================================================================
+---
libvigraimpex-1.10.0+git20160211.167be93+dfsg.orig/config/VigraConfigureThreading.cmake
++++
libvigraimpex-1.10.0+git20160211.167be93+dfsg/config/VigraConfigureThreading.cmake
+@@ -9,7 +9,7 @@ macro(VIGRA_CONFIGURE_THREADING)
+     set(THREADING_FOUND 1)
+     if(THREADING_IMPLEMENTATION MATCHES "boost")
+         include_directories(${Boost_INCLUDE_DIR})
+-        set(THREADING_LIBRARIES ${Boost_THREAD_LIBRARY}
${Boost_SYSTEM_LIBRARY} ${Boost_DATE_TIME_LIBRARY} ${Boost_CHRONO_LIBRARY})
++        set(THREADING_LIBRARIES ${Boost_THREAD_LIBRARY}
${Boost_SYSTEM_LIBRARY} ${Boost_DATE_TIME_LIBRARY}
${Boost_CHRONO_LIBRARY} pthread)
+     elseif(THREADING_IMPLEMENTATION MATCHES "std")
+         # Great, we can use the std library.  Nothing to do here...
+     elseif(THREADING_IMPLEMENTATION MATCHES "none")
diff -Nru
libvigraimpex-1.10.0+git20160211.167be93+dfsg/debian/patches/series
libvigraimpex-1.10.0+git20160211.167be93+dfsg/debian/patches/series
--- libvigraimpex-1.10.0+git20160211.167be93+dfsg/debian/patches/series
2018-08-11 06:18:32.000000000 +0200
+++ libvigraimpex-1.10.0+git20160211.167be93+dfsg/debian/patches/series
2018-11-25 22:21:32.000000000 +0100
@@ -7,3 +7,4 @@
 removed-static-docs.diff
 const-swap.patch
 multi_convolution_fix_incomplete_template_paramater.patch
+link-with-pthread.patch

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://alioth-lists.debian.net/pipermail/debian-science-maintainers/attachments/20181129/0e9ff8ab/attachment.sig>