[med-svn] r14595 - in trunk/packages/imagevis3d/trunk/debian: . patches
Mathieu Malaterre
malat at alioth.debian.org
Thu Sep 5 15:59:54 UTC 2013
Author: malat
Date: 2013-09-05 15:59:53 +0000 (Thu, 05 Sep 2013)
New Revision: 14595
Added:
trunk/packages/imagevis3d/trunk/debian/patches/fopenmp.patch
trunk/packages/imagevis3d/trunk/debian/patches/kfreebsd2.patch
trunk/packages/imagevis3d/trunk/debian/patches/linkjpeg.patch
trunk/packages/imagevis3d/trunk/debian/patches/typos.patch
Modified:
trunk/packages/imagevis3d/trunk/debian/changelog
trunk/packages/imagevis3d/trunk/debian/control
trunk/packages/imagevis3d/trunk/debian/patches/series
trunk/packages/imagevis3d/trunk/debian/rules
Log:
Prepare new upload
Modified: trunk/packages/imagevis3d/trunk/debian/changelog
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/changelog 2013-09-05 10:14:24 UTC (rev 14594)
+++ trunk/packages/imagevis3d/trunk/debian/changelog 2013-09-05 15:59:53 UTC (rev 14595)
@@ -1,3 +1,12 @@
+imagevis3d (3.0.0-2) unstable; urgency=low
+
+ * fix kfreebsd compilation. Closes: #697015
+ * fix compilation with missing jpeg symbol. Closes: #713653
+ * Fix openmp compilation. Closes: #72193
+ * Fix typos reported by lintian
+
+ -- Mathieu Malaterre <malat at debian.org> Thu, 05 Sep 2013 17:01:08 +0200
+
imagevis3d (3.0.0-1) unstable; urgency=low
* New upstream: 3.0.0
Modified: trunk/packages/imagevis3d/trunk/debian/control
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/control 2013-09-05 10:14:24 UTC (rev 14594)
+++ trunk/packages/imagevis3d/trunk/debian/control 2013-09-05 15:59:53 UTC (rev 14595)
@@ -2,11 +2,10 @@
Section: science
Priority: optional
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-DM-Upload-Allowed: yes
Uploaders: Mathieu Malaterre <malat at debian.org>
Build-Depends: debhelper (>= 9), libqt4-dev, libqt4-opengl-dev, qt4-qmake, libtclap-dev, libglew-dev, libz-dev,
- libbz2-dev, libjpeg-dev, libtiff5-dev | libtiff-dev, libboost-all-dev, liblua5.2-dev
-Standards-Version: 3.9.3
+ libbz2-dev, libjpeg-dev, libtiff5-dev | libtiff-dev, libboost-all-dev, liblua5.2-dev, flex, bison
+Standards-Version: 3.9.4
Homepage: http://www.imagevis3d.com
Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/imagevis3d/trunk/
Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/imagevis3d/trunk/
Added: trunk/packages/imagevis3d/trunk/debian/patches/fopenmp.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/fopenmp.patch (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/fopenmp.patch 2013-09-05 15:59:53 UTC (rev 14595)
@@ -0,0 +1,91 @@
+Index: imagevis3d-3.0.0/Tuvok/tvk.pro
+===================================================================
+--- imagevis3d-3.0.0.orig/Tuvok/tvk.pro 2013-09-05 17:40:49.058639521 +0200
++++ imagevis3d-3.0.0/Tuvok/tvk.pro 2013-09-05 17:41:44.722639484 +0200
+@@ -18,7 +18,7 @@
+ QT += opengl
+ QMAKE_LIBDIR += IO/expressions
+ LIBS = -ltuvokexpr
+-unix:LIBS += -lz -lpthread -ljpeg
++unix:LIBS += -lz -lpthread -ljpeg -fopenmp
+ unix:LIBS += -llua5.2
+ win32:LIBS += shlwapi.lib
+ unix:QMAKE_CXXFLAGS += -std=c++0x
+Index: imagevis3d-3.0.0/Tuvok/test/render/render.pro
+===================================================================
+--- imagevis3d-3.0.0.orig/Tuvok/test/render/render.pro 2013-09-05 17:43:59.442639395 +0200
++++ imagevis3d-3.0.0/Tuvok/test/render/render.pro 2013-09-05 17:44:04.290639392 +0200
+@@ -13,7 +13,7 @@
+ macx:QMAKE_LIBDIR+= /usr/X11R6/lib
+ QMAKE_LIBDIR += ../../Build ../../IO/expressions
+ QT += opengl
+-LIBS += -lTuvok -ltuvokexpr -lz -llua5.2 -lbz2 -lGLEW -ltiff -ljpeg
++LIBS += -lTuvok -ltuvokexpr -lz -llua5.2 -lbz2 -lGLEW -ltiff -ljpeg -fopenmp
+ unix:LIBS += -lGL -lX11 -llua5.2
+ unix:!macx:LIBS += -lGLU
+ # Try to link to GLU statically.
+Index: imagevis3d-3.0.0/Tuvok/test/shaders/shaders.pro
+===================================================================
+--- imagevis3d-3.0.0.orig/Tuvok/test/shaders/shaders.pro 2013-09-05 17:44:45.850639365 +0200
++++ imagevis3d-3.0.0/Tuvok/test/shaders/shaders.pro 2013-09-05 17:44:51.990639361 +0200
+@@ -12,7 +12,7 @@
+ macx:QMAKE_LIBDIR+= /usr/X11R6/lib
+ QMAKE_LIBDIR += ../../Build ../../IO/expressions
+ QT += opengl
+-LIBS += -lTuvok -ltuvokexpr -lz -llua5.2 -ltiff -lbz2 -lGLEW -ljpeg
++LIBS += -lTuvok -ltuvokexpr -lz -llua5.2 -ltiff -lbz2 -lGLEW -ljpeg -fopenmp
+ unix:LIBS += -lGL -lX11
+ unix:QMAKE_CXXFLAGS += -std=c++0x
+ unix:QMAKE_CXXFLAGS += -fno-strict-aliasing -g
+Index: imagevis3d-3.0.0/Tuvok/test/context/context.pro
+===================================================================
+--- imagevis3d-3.0.0.orig/Tuvok/test/context/context.pro 2013-09-05 17:45:22.698639339 +0200
++++ imagevis3d-3.0.0/Tuvok/test/context/context.pro 2013-09-05 17:45:27.018639336 +0200
+@@ -12,7 +12,7 @@
+ macx:QMAKE_LIBDIR+= /usr/X11R6/lib
+ QMAKE_LIBDIR += ../../Build ../../IO/expressions
+ QT += opengl
+-LIBS += -lTuvok -ltuvokexpr -lz -llua5.2 -lGLEW -ltiff -lbz2 -ljpeg
++LIBS += -lTuvok -ltuvokexpr -lz -llua5.2 -lGLEW -ltiff -lbz2 -ljpeg -fopenmp
+ unix:LIBS += -lGL -lX11
+ unix:!macx:LIBS += -lGLU
+ # Try to link to GLU statically.
+Index: imagevis3d-3.0.0/CmdLineConverter/CmdLineConverter.pro
+===================================================================
+--- imagevis3d-3.0.0.orig/CmdLineConverter/CmdLineConverter.pro 2013-09-05 17:47:10.470639267 +0200
++++ imagevis3d-3.0.0/CmdLineConverter/CmdLineConverter.pro 2013-09-05 17:47:14.514639266 +0200
+@@ -15,7 +15,7 @@
+ QMAKE_LIBDIR += ../Tuvok/Build ../Tuvok/IO/expressions
+ LIBS = -lTuvok -ltuvokexpr
+ unix:LIBS += -lz
+-unix:LIBS += -llua5.2 -lGLEW -ljpeg -ltiff -lbz2
++unix:LIBS += -llua5.2 -lGLEW -ljpeg -ltiff -lbz2 -fopenmp
+ win3:LIBS += shlwapi.lib
+ unix:!macx:LIBS += -lGLU
+ macx:QMAKE_CXXFLAGS += -stdlib=libc++ -mmacosx-version-min=10.7
+Index: imagevis3d-3.0.0/ImageVis3D/ImageVis3D.pro
+===================================================================
+--- imagevis3d-3.0.0.orig/ImageVis3D/ImageVis3D.pro 2013-09-05 17:46:42.518639286 +0200
++++ imagevis3d-3.0.0/ImageVis3D/ImageVis3D.pro 2013-09-05 17:46:48.234639282 +0200
+@@ -20,7 +20,7 @@
+ QMAKE_LIBDIR += ../Tuvok/Build ../Tuvok/IO/expressions
+ LIBS = -lTuvok -ltuvokexpr
+ unix:LIBS += -lz
+-unix:LIBS += -llua5.2 -lGLEW -ljpeg -ltiff -lbz2
++unix:LIBS += -llua5.2 -lGLEW -ljpeg -ltiff -lbz2 -fopenmp
+ win32:LIBS += shlwapi.lib
+ unix:!macx:LIBS += -lGLU
+ macx:QMAKE_CXXFLAGS += -stdlib=libc++ -mmacosx-version-min=10.7
+Index: imagevis3d-3.0.0/UVFReader/UVFReader.pro
+===================================================================
+--- imagevis3d-3.0.0.orig/UVFReader/UVFReader.pro 2013-09-05 17:47:57.442639236 +0200
++++ imagevis3d-3.0.0/UVFReader/UVFReader.pro 2013-09-05 17:48:01.342639233 +0200
+@@ -12,7 +12,7 @@
+ QMAKE_LIBDIR += ../Tuvok/Build ../Tuvok/IO/expressions
+ LIBS = -lTuvok -ltuvokexpr
+ unix:LIBS += -lz
+-unix:LIBS += -llua5.2 -lGLEW -ljpeg -ltiff -lbz2
++unix:LIBS += -llua5.2 -lGLEW -ljpeg -ltiff -lbz2 -fopenmp
+ win32:LIBS += shlwapi.lib
+ unix:!macx:LIBS += -lGLU
+ QMAKE_CXXFLAGS_WARN_ON += -Wno-unknown-pragmas
Added: trunk/packages/imagevis3d/trunk/debian/patches/kfreebsd2.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/kfreebsd2.patch (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/kfreebsd2.patch 2013-09-05 15:59:53 UTC (rev 14595)
@@ -0,0 +1,34 @@
+Description: Allow compilation on kfreebsd
+ Accroding to
+ http://pubs.opengroup.org/onlinepubs/9699919799/functions/posix_fadvise.html
+
+ "The posix_fadvise() function is part of the Advisory Information option
+ and need not be provided on all implementations."
+
+ Please guard usage by POSIX_FADV_WILLNEED, not by POSIX version.
+Forwarded: not-needed
+Author: Petr Salinger <Petr.Salinger at seznam.cz>
+Bug: http://bugs.debian.org/697015
+
+Index: imagevis3d-3.0.0/Tuvok/Basics/LargeFileFD.cpp
+===================================================================
+--- imagevis3d-3.0.0.orig/Tuvok/Basics/LargeFileFD.cpp 2013-09-05 16:59:27.478641175 +0200
++++ imagevis3d-3.0.0/Tuvok/Basics/LargeFileFD.cpp 2013-09-05 16:59:42.038641165 +0200
+@@ -75,7 +75,7 @@
+ if(lseek(this->fd, offset+this->header_size, SEEK_SET) < 0) {
+ throw std::ios_base::failure("could not seek to correct file position.");
+ }
+-#if _POSIX_C_SOURCE >= 200112L
++#ifdef POSIX_FADV_WILLNEED
+ posix_fadvise(this->fd, offset+this->header_size, len, POSIX_FADV_WILLNEED);
+ #endif
+
+@@ -126,7 +126,7 @@
+ void LargeFileFD::enqueue(uint64_t offset, size_t len)
+ {
+ if(len == 0) { return; }
+-#if _POSIX_C_SOURCE >= 200112L
++#ifdef POSIX_FADV_WILLNEED
+ int adv = posix_fadvise(this->fd, offset, len, POSIX_FADV_WILLNEED);
+ // this should basically always succeed. the only way it can fail is if we
+ // gave it a bogus FD or something. if that's the case, that points to
Added: trunk/packages/imagevis3d/trunk/debian/patches/linkjpeg.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/linkjpeg.patch (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/linkjpeg.patch 2013-09-05 15:59:53 UTC (rev 14595)
@@ -0,0 +1,52 @@
+Index: imagevis3d-3.0.0/Tuvok/tvk.pro
+===================================================================
+--- imagevis3d-3.0.0.orig/Tuvok/tvk.pro 2013-09-05 17:23:13.410640225 +0200
++++ imagevis3d-3.0.0/Tuvok/tvk.pro 2013-09-05 17:23:13.442640226 +0200
+@@ -18,7 +18,7 @@
+ QT += opengl
+ QMAKE_LIBDIR += IO/expressions
+ LIBS = -ltuvokexpr
+-unix:LIBS += -lz -lpthread
++unix:LIBS += -lz -lpthread -ljpeg
+ unix:LIBS += -llua5.2
+ win32:LIBS += shlwapi.lib
+ unix:QMAKE_CXXFLAGS += -std=c++0x
+Index: imagevis3d-3.0.0/Tuvok/test/render/render.pro
+===================================================================
+--- imagevis3d-3.0.0.orig/Tuvok/test/render/render.pro 2013-09-05 17:24:19.006640181 +0200
++++ imagevis3d-3.0.0/Tuvok/test/render/render.pro 2013-09-05 17:24:24.186640178 +0200
+@@ -13,7 +13,7 @@
+ macx:QMAKE_LIBDIR+= /usr/X11R6/lib
+ QMAKE_LIBDIR += ../../Build ../../IO/expressions
+ QT += opengl
+-LIBS += -lTuvok -ltuvokexpr -lz -llua5.2 -lbz2 -lGLEW -ltiff
++LIBS += -lTuvok -ltuvokexpr -lz -llua5.2 -lbz2 -lGLEW -ltiff -ljpeg
+ unix:LIBS += -lGL -lX11 -llua5.2
+ unix:!macx:LIBS += -lGLU
+ # Try to link to GLU statically.
+Index: imagevis3d-3.0.0/Tuvok/test/shaders/shaders.pro
+===================================================================
+--- imagevis3d-3.0.0.orig/Tuvok/test/shaders/shaders.pro 2013-09-05 17:25:27.914640135 +0200
++++ imagevis3d-3.0.0/Tuvok/test/shaders/shaders.pro 2013-09-05 17:25:32.162640132 +0200
+@@ -12,7 +12,7 @@
+ macx:QMAKE_LIBDIR+= /usr/X11R6/lib
+ QMAKE_LIBDIR += ../../Build ../../IO/expressions
+ QT += opengl
+-LIBS += -lTuvok -ltuvokexpr -lz -llua5.2 -ltiff -lbz2 -lGLEW
++LIBS += -lTuvok -ltuvokexpr -lz -llua5.2 -ltiff -lbz2 -lGLEW -ljpeg
+ unix:LIBS += -lGL -lX11
+ unix:QMAKE_CXXFLAGS += -std=c++0x
+ unix:QMAKE_CXXFLAGS += -fno-strict-aliasing -g
+Index: imagevis3d-3.0.0/Tuvok/test/context/context.pro
+===================================================================
+--- imagevis3d-3.0.0.orig/Tuvok/test/context/context.pro 2013-09-05 17:26:14.198640104 +0200
++++ imagevis3d-3.0.0/Tuvok/test/context/context.pro 2013-09-05 17:26:18.058640103 +0200
+@@ -12,7 +12,7 @@
+ macx:QMAKE_LIBDIR+= /usr/X11R6/lib
+ QMAKE_LIBDIR += ../../Build ../../IO/expressions
+ QT += opengl
+-LIBS += -lTuvok -ltuvokexpr -lz -llua5.2 -lGLEW -ltiff -lbz2
++LIBS += -lTuvok -ltuvokexpr -lz -llua5.2 -lGLEW -ltiff -lbz2 -ljpeg
+ unix:LIBS += -lGL -lX11
+ unix:!macx:LIBS += -lGLU
+ # Try to link to GLU statically.
Modified: trunk/packages/imagevis3d/trunk/debian/patches/series
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/series 2013-09-05 10:14:24 UTC (rev 14594)
+++ trunk/packages/imagevis3d/trunk/debian/patches/series 2013-09-05 15:59:53 UTC (rev 14595)
@@ -7,3 +7,7 @@
kfreebsd.patch
fixcomp.patch
systemlua.patch
+kfreebsd2.patch
+linkjpeg.patch
+fopenmp.patch
+typos.patch
Added: trunk/packages/imagevis3d/trunk/debian/patches/typos.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/typos.patch (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/typos.patch 2013-09-05 15:59:53 UTC (rev 14595)
@@ -0,0 +1,156 @@
+Index: imagevis3d-3.0.0/ImageVis3D/UI/UI/ImageVis3D.ui
+===================================================================
+--- imagevis3d-3.0.0.orig/ImageVis3D/UI/UI/ImageVis3D.ui 2013-09-05 17:48:54.194639198 +0200
++++ imagevis3d-3.0.0/ImageVis3D/UI/UI/ImageVis3D.ui 2013-09-05 17:50:29.862639134 +0200
+@@ -1617,10 +1617,10 @@
+ </size>
+ </property>
+ <property name="toolTip">
+- <string>Select Transfer Function Libary Location</string>
++ <string>Select Transfer Function Library Location</string>
+ </property>
+ <property name="statusTip">
+- <string>Select Transfer Function Libary Location</string>
++ <string>Select Transfer Function Library Location</string>
+ </property>
+ <property name="text">
+ <string>...</string>
+@@ -3254,10 +3254,10 @@
+ <item>
+ <widget class="QRadioButton" name="radioButton_UpdateContinuous">
+ <property name="toolTip">
+- <string>All changes to the transfer functions are continously committed to the volume.</string>
++ <string>All changes to the transfer functions are continuously committed to the volume.</string>
+ </property>
+ <property name="statusTip">
+- <string>All changes to the transfer functions are continously committed to the volume.</string>
++ <string>All changes to the transfer functions are continuously committed to the volume.</string>
+ </property>
+ <property name="text">
+ <string>Continuous</string>
+@@ -3270,10 +3270,10 @@
+ <item>
+ <widget class="QRadioButton" name="radioButton_UpdateOnRelease">
+ <property name="toolTip">
+- <string>Changes to the transfer function affect the volume only on mouse release. Select this option if the continous mode is too slow in your machine.</string>
++ <string>Changes to the transfer function affect the volume only on mouse release. Select this option if the continuous mode is too slow in your machine.</string>
+ </property>
+ <property name="statusTip">
+- <string>Changes to the transfer function affect the volume only on mouse release. Select this option if the continous mode is to slow in your machine.</string>
++ <string>Changes to the transfer function affect the volume only on mouse release. Select this option if the continuous mode is to slow in your machine.</string>
+ </property>
+ <property name="text">
+ <string>On Release</string>
+@@ -4442,10 +4442,10 @@
+ <item>
+ <widget class="QCheckBox" name="checkBox_Stereo">
+ <property name="toolTip">
+- <string>Toggle the anaglyph stereo rendering. This option is only avaliable in single window 3D view.</string>
++ <string>Toggle the anaglyph stereo rendering. This option is only available in single window 3D view.</string>
+ </property>
+ <property name="statusTip">
+- <string>Toggle the anaglyph stereo rendering. This option is only avaliable in single window 3D view.</string>
++ <string>Toggle the anaglyph stereo rendering. This option is only available in single window 3D view.</string>
+ </property>
+ <property name="text">
+ <string>Enable Stereo Rendering</string>
+@@ -4502,13 +4502,13 @@
+ <property name="toolTip">
+ <string>
+ Use the focal length to specify where your monitor is in the virtual 3D world. Larger values wil bring the volume in front of the screen, while
+- smaller values while make it apear behind. While the first effect usualy looks more spectacular it is also more likely to cause headaches after a while.
++ smaller values while make it apear behind. While the first effect usually looks more spectacular it is also more likely to cause headaches after a while.
+ </string>
+ </property>
+ <property name="statusTip">
+ <string>
+ Use the focal length to specify where your monitor is in the virtual 3D world. Larger values wil bring the volume in front of the screen, while
+- smaller values while make it apear behind. While the first effect usualy looks more spectacular it is also more likely to cause headaches after a while.
++ smaller values while make it apear behind. While the first effect usually looks more spectacular it is also more likely to cause headaches after a while.
+ </string>
+ </property>
+ <property name="text">
+@@ -4521,13 +4521,13 @@
+ <property name="toolTip">
+ <string>
+ Use the focal length to specify where your monitor is in the virtual 3D world. Larger values wil bring the volume in front of the screen, while
+- smaller values while make it apear behind. While the first effect usualy looks more spectacular it is also more likely to cause headaches after a while.
++ smaller values while make it apear behind. While the first effect usually looks more spectacular it is also more likely to cause headaches after a while.
+ </string>
+ </property>
+ <property name="statusTip">
+ <string>
+ Use the focal length to specify where your monitor is in the virtual 3D world. Larger values wil bring the volume in front of the screen, while
+- smaller values while make it apear behind. While the first effect usualy looks more spectacular it is also more likely to cause headaches after a while.
++ smaller values while make it apear behind. While the first effect usually looks more spectacular it is also more likely to cause headaches after a while.
+ </string>
+ </property>
+ <property name="minimum">
+Index: imagevis3d-3.0.0/UVFReader/DataSource.h
+===================================================================
+--- imagevis3d-3.0.0.orig/UVFReader/DataSource.h 2013-09-05 17:50:53.114639119 +0200
++++ imagevis3d-3.0.0/UVFReader/DataSource.h 2013-09-05 17:51:00.070639114 +0200
+@@ -385,9 +385,9 @@
+ metaPairs->AddPair("Description","Dummy file for testing purposes.");
+
+ if (EndianConvert::IsLittleEndian())
+- metaPairs->AddPair("Source Endianess","little");
++ metaPairs->AddPair("Source Endianness","little");
+ else
+- metaPairs->AddPair("Source Endianess","big");
++ metaPairs->AddPair("Source Endianness","big");
+
+ metaPairs->AddPair("Source Type","integer");
+ metaPairs->AddPair("Source Bit width",SysTools::ToString(iBitSize));
+Index: imagevis3d-3.0.0/Tuvok/IO/OBJGeoConverter.cpp
+===================================================================
+--- imagevis3d-3.0.0.orig/Tuvok/IO/OBJGeoConverter.cpp 2013-09-05 17:51:15.570639104 +0200
++++ imagevis3d-3.0.0/Tuvok/IO/OBJGeoConverter.cpp 2013-09-05 17:51:22.774639099 +0200
+@@ -348,7 +348,7 @@
+ }
+ } else {
+ if (!m.GetColors().empty())
+- WARNING("Ignoring mesh colors for standart OBJ files, "
++ WARNING("Ignoring mesh colors for standard OBJ files, "
+ "use OBJX files to also export colors.");
+ }
+
+Index: imagevis3d-3.0.0/Tuvok/IO/VFFConverter.cpp
+===================================================================
+--- imagevis3d-3.0.0.orig/Tuvok/IO/VFFConverter.cpp 2013-09-05 17:51:35.730639090 +0200
++++ imagevis3d-3.0.0/Tuvok/IO/VFFConverter.cpp 2013-09-05 17:51:48.554639082 +0200
+@@ -193,7 +193,7 @@
+ }
+
+ if (bFloatingPoint) {
+- T_ERROR("Floating point formats are not avaliable for vff files.");
++ T_ERROR("Floating point formats are not available for vff files.");
+ return false;
+ }
+
+Index: imagevis3d-3.0.0/Tuvok/IO/QVISConverter.cpp
+===================================================================
+--- imagevis3d-3.0.0.orig/Tuvok/IO/QVISConverter.cpp 2013-09-05 17:53:03.426639032 +0200
++++ imagevis3d-3.0.0/Tuvok/IO/QVISConverter.cpp 2013-09-05 17:53:19.566639021 +0200
+@@ -209,7 +209,7 @@
+ fTarget << "ObjectType: TEXTURE_VOLUME_OBJECT" << endl;
+ fTarget << "ObjectModel: RGBA" << endl;
+ fTarget << "GridType: EQUIDISTANT" << endl;
+- fTarget << "Endianess: " << (EndianConvert::IsBigEndian() ? "BIG" : "LITTLE") << endl;
++ fTarget << "Endianness: " << (EndianConvert::IsBigEndian() ? "BIG" : "LITTLE") << endl;
+
+ fTarget.close();
+
+Index: imagevis3d-3.0.0/Tuvok/IO/IOManager.cpp
+===================================================================
+--- imagevis3d-3.0.0.orig/Tuvok/IO/IOManager.cpp 2013-09-05 17:53:29.098639015 +0200
++++ imagevis3d-3.0.0/Tuvok/IO/IOManager.cpp 2013-09-05 17:53:35.210639011 +0200
+@@ -364,7 +364,7 @@
+ }
+
+ if (pDICOMStack->m_bIsBigEndian != EndianConvert::IsBigEndian()) {
+- MESSAGE("Converting Endianess ...");
++ MESSAGE("Converting Endianness ...");
+ switch (pDICOMStack->m_iAllocated) {
+ case 8 : break;
+ case 16 : {
Modified: trunk/packages/imagevis3d/trunk/debian/rules
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/rules 2013-09-05 10:14:24 UTC (rev 14594)
+++ trunk/packages/imagevis3d/trunk/debian/rules 2013-09-05 15:59:53 UTC (rev 14595)
@@ -5,11 +5,13 @@
dh $@ --parallel
override_dh_auto_configure:
- dh_auto_configure -- QMAKE_CXXFLAGS="-DPACKAGE_MANAGER $(CXXFLAGS)" QMAKE_CFLAGS="$(CFLAGS)" QMAKE_LDFLAGS="$(LDFLAGS)"
+ dh_auto_configure -- QMAKE_CXXFLAGS="-fopenmp -DPACKAGE_MANAGER $(CXXFLAGS)" QMAKE_CFLAGS="-fopenmp $(CFLAGS)" QMAKE_LDFLAGS="-fopenmp $(LDFLAGS)"
override_dh_clean:
dh_clean Build/imagevis3d
dh_clean Tuvok/Build/libTuvok.a
+ # make sure to regen flex/bison stuff:
+ dh_clean Tuvok/IO/expressions/tvk-scan.lexer.cpp
override_dh_install:
# rename to match man page:
More information about the debian-med-commit
mailing list