[med-svn] r23097 - in trunk/packages/imagevis3d/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2016-11-17 18:20:06 +0000 (Thu, 17 Nov 2016)
New Revision: 23097

Added:
   trunk/packages/imagevis3d/trunk/debian/patches/boost_serialization.patch
Modified:
   trunk/packages/imagevis3d/trunk/debian/changelog
   trunk/packages/imagevis3d/trunk/debian/control
   trunk/packages/imagevis3d/trunk/debian/patches/series
Log:
Fix FTBFS with Boost 1.61


Modified: trunk/packages/imagevis3d/trunk/debian/changelog
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/changelog	2016-11-17 16:55:15 UTC (rev 23096)
+++ trunk/packages/imagevis3d/trunk/debian/changelog	2016-11-17 18:20:06 UTC (rev 23097)
@@ -1,3 +1,11 @@
+imagevis3d (3.1.0-5) UNRELEASED; urgency=medium
+
+  * Fix FTBFS with Boost 1.61 (Thanks for the patch to Graham Inggs)
+    Closes: #835416
+    
+
+ -- Andreas Tille <tille at debian.org>  Thu, 17 Nov 2016 19:16:11 +0100
+
 imagevis3d (3.1.0-4) unstable; urgency=low
 
   * Handle obsolete symbol in liblz4. Closes: #763246

Modified: trunk/packages/imagevis3d/trunk/debian/control
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/control	2016-11-17 16:55:15 UTC (rev 23096)
+++ trunk/packages/imagevis3d/trunk/debian/control	2016-11-17 18:20:06 UTC (rev 23097)
@@ -8,7 +8,7 @@
                debhelper (>= 9),
                flex,
                g++ (>= 4:4.6),
-               libboost-all-dev,
+               libboost-serialization-dev,
                libbz2-dev,
                libglew-dev,
                libjpeg-dev,

Added: trunk/packages/imagevis3d/trunk/debian/patches/boost_serialization.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/boost_serialization.patch	                        (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/boost_serialization.patch	2016-11-17 18:20:06 UTC (rev 23097)
@@ -0,0 +1,60 @@
+Description: Fix FTBFS with Boost 1.61
+ Link libboost_serialization, thanks Tom Fogal.
+Bug-Debian: https://bugs.debian.org/835416
+Author: Graham Inggs <ginggs at debian.org>
+Last-Update: 2016-11-17
+--- a/Tuvok/doc/genlua/genlua.pro
++++ b/Tuvok/doc/genlua/genlua.pro
+@@ -8,7 +8,7 @@
+ INCLUDEPATH += /usr/include/lua5.2
+ QMAKE_LIBDIR += ../../Build
+ QMAKE_LIBDIR += ../../IO/expressions
+-LIBS             = -lTuvok -ltuvokexpr
++LIBS             = -lTuvok -ltuvokexpr -lboost_serialization
+ unix:LIBS       += -lz
+ unix:LIBS       += -llua5.2 -lGLEW -ltiff -lbz2 -llzma -llz4
+ win32:LIBS      += shlwapi.lib
+--- a/ImageVis3D/ImageVis3D.pro
++++ b/ImageVis3D/ImageVis3D.pro
+@@ -16,7 +16,7 @@
+ INCLUDEPATH      += $$incpath
+ QT               += opengl network
+ QMAKE_LIBDIR     += ../Tuvok/Build ../Tuvok/IO/expressions
+-LIBS              = -lTuvok -ltuvokexpr
++LIBS              = -lTuvok -ltuvokexpr -lboost_serialization
+ unix:LIBS        += -lz
+ unix:LIBS        += -llua5.2 -lGLEW -ltiff -lbz2 -fopenmp -llz4
+ win32:LIBS       += shlwapi.lib
+--- a/CmdLineConverter/CmdLineConverter.pro
++++ b/CmdLineConverter/CmdLineConverter.pro
+@@ -12,7 +12,7 @@
+ DEPENDPATH       += $$incpath
+ INCLUDEPATH      += $$incpath
+ QMAKE_LIBDIR     += ../Tuvok/Build ../Tuvok/IO/expressions
+-LIBS             += -lTuvok -ltuvokexpr
++LIBS             += -lTuvok -ltuvokexpr -lboost_serialization
+ unix:LIBS        += -lz
+ unix:LIBS        += -llua5.2 -lGLEW -ltiff -lbz2 -llz4
+ win32:LIBS       += shlwapi.lib
+--- a/UVFReader/UVFReader.pro
++++ b/UVFReader/UVFReader.pro
+@@ -12,7 +12,7 @@
+ INCLUDEPATH      += ../Tuvok/Basics
+ QMAKE_LIBDIR     += ../Tuvok/Build
+ QMAKE_LIBDIR     += ../Tuvok/IO/expressions
+-LIBS              = -lTuvok -ltuvokexpr
++LIBS              = -lTuvok -ltuvokexpr -lboost_serialization
+ unix:LIBS        += -lz
+ unix:LIBS        += -llua5.2 -lGLEW -ltiff -lbz2 -llz4
+ win32:LIBS       += shlwapi.lib
+--- a/BatchRenderer/BatchRenderer.pro
++++ b/BatchRenderer/BatchRenderer.pro
+@@ -6,7 +6,7 @@
+ INCLUDEPATH        += /usr/include/lua5.2
+ QMAKE_LIBDIR       += ../Tuvok/Build ../Tuvok/IO/expressions
+ QT                 += opengl
+-LIBS               += -lTuvok -ltuvokexpr -lz -llua5.2 -lGLEW -ltiff -llz4 -lbz2
++LIBS               += -lTuvok -ltuvokexpr -lboost_serialization -lz -llua5.2 -lGLEW -ltiff -llz4 -lbz2
+ !macx:unix:QMAKE_LFLAGS += -fopenmp
+ 
+ # Operating system definitions now in the makefile instead of

Modified: trunk/packages/imagevis3d/trunk/debian/patches/series
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/series	2016-11-17 16:55:15 UTC (rev 23096)
+++ trunk/packages/imagevis3d/trunk/debian/patches/series	2016-11-17 18:20:06 UTC (rev 23097)
@@ -11,3 +11,4 @@
 thirdparty.patch
 fixsparc.patch
 lz4.patch
+boost_serialization.patch