[med-svn] r17127 - in trunk/packages/imagevis3d/trunk/debian: . patches
Mathieu Malaterre
malat at moszumanska.debian.org
Wed Jun 11 10:53:13 UTC 2014
Author: malat
Date: 2014-06-11 10:53:12 +0000 (Wed, 11 Jun 2014)
New Revision: 17127
Modified:
trunk/packages/imagevis3d/trunk/debian/control
trunk/packages/imagevis3d/trunk/debian/patches/thirdparty.patch
Log:
3rdparty left over
Modified: trunk/packages/imagevis3d/trunk/debian/control
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/control 2014-06-11 10:47:09 UTC (rev 17126)
+++ trunk/packages/imagevis3d/trunk/debian/control 2014-06-11 10:53:12 UTC (rev 17127)
@@ -4,6 +4,7 @@
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
Uploaders: Mathieu Malaterre <malat at debian.org>
Build-Depends: bison,
+ cxxtest,
debhelper (>= 9),
flex,
g++ (>= 4:4.6),
@@ -13,12 +14,13 @@
libjpeg-dev,
liblua5.2-dev,
liblz4-dev (>= 0.0~r114),
- liblzma-dev, lzma-dev,
+ liblzma-dev,
libqt4-dev,
libqt4-opengl-dev,
libtclap-dev,
libtiff5-dev | libtiff-dev,
libz-dev,
+ lzma-dev,
qt4-qmake
Standards-Version: 3.9.5
Homepage: http://www.imagevis3d.com
Modified: trunk/packages/imagevis3d/trunk/debian/patches/thirdparty.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/thirdparty.patch 2014-06-11 10:47:09 UTC (rev 17126)
+++ trunk/packages/imagevis3d/trunk/debian/patches/thirdparty.patch 2014-06-11 10:53:12 UTC (rev 17127)
@@ -3,8 +3,8 @@
Index: imagevis3d-3.1.0/ImageVis3D/UI/RenderWindowDX.cpp
===================================================================
---- imagevis3d-3.1.0.orig/ImageVis3D/UI/RenderWindowDX.cpp 2014-06-11 12:24:55.527956113 +0200
-+++ imagevis3d-3.1.0/ImageVis3D/UI/RenderWindowDX.cpp 2014-06-11 12:24:57.171956212 +0200
+--- imagevis3d-3.1.0.orig/ImageVis3D/UI/RenderWindowDX.cpp 2014-06-11 12:48:38.204806520 +0200
++++ imagevis3d-3.1.0/ImageVis3D/UI/RenderWindowDX.cpp 2014-06-11 12:48:46.032793958 +0200
@@ -43,7 +43,7 @@
/// We need this first because GPUMemMan depends on OpenGL
/// but shouldn't, and GLEW will blow up if we don't include
@@ -16,8 +16,8 @@
#include "ImageVis3D.h"
Index: imagevis3d-3.1.0/StandaloneTuvok/GLContext.cpp
===================================================================
---- imagevis3d-3.1.0.orig/StandaloneTuvok/GLContext.cpp 2014-06-11 12:24:55.527956113 +0200
-+++ imagevis3d-3.1.0/StandaloneTuvok/GLContext.cpp 2014-06-11 12:24:57.171956212 +0200
+--- imagevis3d-3.1.0.orig/StandaloneTuvok/GLContext.cpp 2014-06-11 12:48:38.204806520 +0200
++++ imagevis3d-3.1.0/StandaloneTuvok/GLContext.cpp 2014-06-11 12:48:46.036793953 +0200
@@ -1,10 +1,10 @@
#include "GLContext.h"
-#include "3rdParty/GLEW/GL/glew.h"
@@ -34,8 +34,8 @@
GLContext::GLContext(UINT32 width, UINT32 height, BYTE colorBits, BYTE depthBits, BYTE stencilBits, bool useDoubleBuffer, std::wostream * errorOutput) :
Index: imagevis3d-3.1.0/Tuvok/IO/UVF/ExtendedOctree/BzlibCompression.cpp
===================================================================
---- imagevis3d-3.1.0.orig/Tuvok/IO/UVF/ExtendedOctree/BzlibCompression.cpp 2014-06-11 12:24:55.527956113 +0200
-+++ imagevis3d-3.1.0/Tuvok/IO/UVF/ExtendedOctree/BzlibCompression.cpp 2014-06-11 12:24:57.171956212 +0200
+--- imagevis3d-3.1.0.orig/Tuvok/IO/UVF/ExtendedOctree/BzlibCompression.cpp 2014-06-11 12:48:38.204806520 +0200
++++ imagevis3d-3.1.0/Tuvok/IO/UVF/ExtendedOctree/BzlibCompression.cpp 2014-06-11 12:48:46.036793953 +0200
@@ -6,7 +6,7 @@
#include "BzlibCompression.h"
@@ -47,8 +47,8 @@
namespace {
Index: imagevis3d-3.1.0/Tuvok/Renderer/GL/GLInclude.h
===================================================================
---- imagevis3d-3.1.0.orig/Tuvok/Renderer/GL/GLInclude.h 2014-06-11 12:24:55.527956113 +0200
-+++ imagevis3d-3.1.0/Tuvok/Renderer/GL/GLInclude.h 2014-06-11 12:24:57.171956212 +0200
+--- imagevis3d-3.1.0.orig/Tuvok/Renderer/GL/GLInclude.h 2014-06-11 12:48:45.836794274 +0200
++++ imagevis3d-3.1.0/Tuvok/Renderer/GL/GLInclude.h 2014-06-11 12:48:46.036793953 +0200
@@ -44,7 +44,7 @@
#ifdef WIN32
@@ -60,8 +60,8 @@
#ifdef max
Index: imagevis3d-3.1.0/BatchRenderer/BatchRenderer.pro
===================================================================
---- imagevis3d-3.1.0.orig/BatchRenderer/BatchRenderer.pro 2014-06-11 12:24:55.527956113 +0200
-+++ imagevis3d-3.1.0/BatchRenderer/BatchRenderer.pro 2014-06-11 12:24:57.171956212 +0200
+--- imagevis3d-3.1.0.orig/BatchRenderer/BatchRenderer.pro 2014-06-11 12:48:46.000794009 +0200
++++ imagevis3d-3.1.0/BatchRenderer/BatchRenderer.pro 2014-06-11 12:48:46.036793953 +0200
@@ -3,10 +3,6 @@
TARGET = BatchRenderer
DEPENDPATH = .
@@ -75,8 +75,8 @@
QT += opengl
Index: imagevis3d-3.1.0/UVFReader/UVFReader.pro
===================================================================
---- imagevis3d-3.1.0.orig/UVFReader/UVFReader.pro 2014-06-11 12:24:55.527956113 +0200
-+++ imagevis3d-3.1.0/UVFReader/UVFReader.pro 2014-06-11 12:24:57.171956212 +0200
+--- imagevis3d-3.1.0.orig/UVFReader/UVFReader.pro 2014-06-11 12:48:46.000794009 +0200
++++ imagevis3d-3.1.0/UVFReader/UVFReader.pro 2014-06-11 12:48:46.036793953 +0200
@@ -8,10 +8,7 @@
QT += opengl
DEPENDPATH += .
@@ -90,8 +90,8 @@
QMAKE_LIBDIR += ../Tuvok/IO/expressions
Index: imagevis3d-3.1.0/Tuvok/tvk.pro
===================================================================
---- imagevis3d-3.1.0.orig/Tuvok/tvk.pro 2014-06-11 12:24:55.527956113 +0200
-+++ imagevis3d-3.1.0/Tuvok/tvk.pro 2014-06-11 12:24:57.175956212 +0200
+--- imagevis3d-3.1.0.orig/Tuvok/tvk.pro 2014-06-11 12:48:45.996794016 +0200
++++ imagevis3d-3.1.0/Tuvok/tvk.pro 2014-06-11 12:48:46.036793953 +0200
@@ -3,7 +3,7 @@
CONFIG += warn_on qt rtti static staticlib stl largefile
CONFIG += exceptions
@@ -125,8 +125,8 @@
IO/AmiraConverter.cpp \
Index: imagevis3d-3.1.0/Tuvok/doc/genlua/genlua.pro
===================================================================
---- imagevis3d-3.1.0.orig/Tuvok/doc/genlua/genlua.pro 2014-06-11 12:24:55.527956113 +0200
-+++ imagevis3d-3.1.0/Tuvok/doc/genlua/genlua.pro 2014-06-11 12:24:57.175956212 +0200
+--- imagevis3d-3.1.0.orig/Tuvok/doc/genlua/genlua.pro 2014-06-11 12:48:45.944794101 +0200
++++ imagevis3d-3.1.0/Tuvok/doc/genlua/genlua.pro 2014-06-11 12:48:46.036793953 +0200
@@ -6,8 +6,6 @@
DEPENDPATH = .
INCLUDEPATH = ../../
@@ -138,8 +138,8 @@
LIBS = -lTuvok -ltuvokexpr
Index: imagevis3d-3.1.0/Tuvok/IO/expressions/libexpr.pro
===================================================================
---- imagevis3d-3.1.0.orig/Tuvok/IO/expressions/libexpr.pro 2014-06-11 12:24:55.527956113 +0200
-+++ imagevis3d-3.1.0/Tuvok/IO/expressions/libexpr.pro 2014-06-11 12:24:57.175956212 +0200
+--- imagevis3d-3.1.0.orig/Tuvok/IO/expressions/libexpr.pro 2014-04-07 10:09:36.000000000 +0200
++++ imagevis3d-3.1.0/Tuvok/IO/expressions/libexpr.pro 2014-06-11 12:48:46.036793953 +0200
@@ -5,7 +5,7 @@
DEFINES += YY_NO_UNPUT _FILE_OFFSET_BITS=64
TARGET = tuvokexpr
@@ -151,8 +151,8 @@
unix:QMAKE_CFLAGS += -fno-strict-aliasing
Index: imagevis3d-3.1.0/Tuvok/test/shaders/shaders.pro
===================================================================
---- imagevis3d-3.1.0.orig/Tuvok/test/shaders/shaders.pro 2014-06-11 12:24:55.527956113 +0200
-+++ imagevis3d-3.1.0/Tuvok/test/shaders/shaders.pro 2014-06-11 12:24:57.175956212 +0200
+--- imagevis3d-3.1.0.orig/Tuvok/test/shaders/shaders.pro 2014-06-11 12:48:46.000794009 +0200
++++ imagevis3d-3.1.0/Tuvok/test/shaders/shaders.pro 2014-06-11 12:48:46.036793953 +0200
@@ -3,9 +3,6 @@
TARGET = shtest
DEPENDPATH += . ../../
@@ -165,8 +165,8 @@
macx:INCLUDEPATH += /usr/X11R6/include
Index: imagevis3d-3.1.0/Tuvok/IO/expressions/debug.pro
===================================================================
---- imagevis3d-3.1.0.orig/Tuvok/IO/expressions/debug.pro 2014-06-11 12:24:55.527956113 +0200
-+++ imagevis3d-3.1.0/Tuvok/IO/expressions/debug.pro 2014-06-11 12:24:57.175956212 +0200
+--- imagevis3d-3.1.0.orig/Tuvok/IO/expressions/debug.pro 2014-04-07 10:09:36.000000000 +0200
++++ imagevis3d-3.1.0/Tuvok/IO/expressions/debug.pro 2014-06-11 12:48:46.036793953 +0200
@@ -5,7 +5,7 @@
macx:DEFINES += QT_MAC_USE_COCOA=1
TARGET = lexdbg
@@ -178,8 +178,8 @@
unix:QMAKE_CXXFLAGS += -fno-strict-aliasing
Index: imagevis3d-3.1.0/Tuvok/IO/test/test.pro
===================================================================
---- imagevis3d-3.1.0.orig/Tuvok/IO/test/test.pro 2014-06-11 12:24:55.527956113 +0200
-+++ imagevis3d-3.1.0/Tuvok/IO/test/test.pro 2014-06-11 12:24:57.175956212 +0200
+--- imagevis3d-3.1.0.orig/Tuvok/IO/test/test.pro 2014-04-07 10:09:36.000000000 +0200
++++ imagevis3d-3.1.0/Tuvok/IO/test/test.pro 2014-06-11 12:52:07.024480926 +0200
@@ -4,7 +4,7 @@
TARGET = cxxtester
DEFINES += _FILE_OFFSET_BITS=64
@@ -189,10 +189,19 @@
INCLUDEPATH += ../../Basics
QT += core gui opengl
QMAKE_LIBDIR += ../../Build ../expressions
+@@ -55,7 +55,7 @@
+
+ TG_PARAMS=--have-eh --abort-on-fail --no-static-init --error-printer
+ alltests.target = alltests.cpp
+-alltests.commands = python ../3rdParty/cxxtest/cxxtestgen.py \
++alltests.commands = python /usr/share/cxxtest/cxxtest/cxxtestgen.py \
+ $$TG_PARAMS -o alltests.cpp $$TEST_HEADERS
+ alltests.depends = $$TEST_HEADERS
+
Index: imagevis3d-3.1.0/ExtractDebugInfo/ExtractDebugInfo.pro
===================================================================
---- imagevis3d-3.1.0.orig/ExtractDebugInfo/ExtractDebugInfo.pro 2014-06-11 12:24:55.527956113 +0200
-+++ imagevis3d-3.1.0/ExtractDebugInfo/ExtractDebugInfo.pro 2014-06-11 12:24:57.175956212 +0200
+--- imagevis3d-3.1.0.orig/ExtractDebugInfo/ExtractDebugInfo.pro 2014-04-07 14:51:47.000000000 +0200
++++ imagevis3d-3.1.0/ExtractDebugInfo/ExtractDebugInfo.pro 2014-06-11 12:48:46.036793953 +0200
@@ -5,7 +5,7 @@
macx:DEFINES += QT_MAC_USE_COCOA=1
TARGET = Build/ExtractDebugInfo
@@ -204,8 +213,8 @@
QT += opengl
Index: imagevis3d-3.1.0/ImageVis3D/ImageVis3D.pro
===================================================================
---- imagevis3d-3.1.0.orig/ImageVis3D/ImageVis3D.pro 2014-06-11 12:24:55.527956113 +0200
-+++ imagevis3d-3.1.0/ImageVis3D/ImageVis3D.pro 2014-06-11 12:24:57.175956212 +0200
+--- imagevis3d-3.1.0.orig/ImageVis3D/ImageVis3D.pro 2014-06-11 12:48:46.000794009 +0200
++++ imagevis3d-3.1.0/ImageVis3D/ImageVis3D.pro 2014-06-11 12:48:46.040793947 +0200
@@ -11,11 +11,9 @@
incpath += ../Tuvok/IO ../Tuvok/IO/exception ../Tuvok/Renderer
incpath += ../Tuvok
@@ -220,8 +229,8 @@
LIBS = -lTuvok -ltuvokexpr
Index: imagevis3d-3.1.0/BatchRenderer/main.cpp
===================================================================
---- imagevis3d-3.1.0.orig/BatchRenderer/main.cpp 2014-06-11 12:24:55.527956113 +0200
-+++ imagevis3d-3.1.0/BatchRenderer/main.cpp 2014-06-11 12:24:57.175956212 +0200
+--- imagevis3d-3.1.0.orig/BatchRenderer/main.cpp 2014-04-07 14:51:47.000000000 +0200
++++ imagevis3d-3.1.0/BatchRenderer/main.cpp 2014-06-11 12:48:46.040793947 +0200
@@ -32,7 +32,7 @@
#include <cstdlib>
#include <iostream>
@@ -233,8 +242,8 @@
#include "LuaScripting/LuaScripting.h"
Index: imagevis3d-3.1.0/BatchRenderer/BatchContext.cpp
===================================================================
---- imagevis3d-3.1.0.orig/BatchRenderer/BatchContext.cpp 2014-06-11 12:24:55.527956113 +0200
-+++ imagevis3d-3.1.0/BatchRenderer/BatchContext.cpp 2014-06-11 12:24:57.175956212 +0200
+--- imagevis3d-3.1.0.orig/BatchRenderer/BatchContext.cpp 2014-04-07 14:51:47.000000000 +0200
++++ imagevis3d-3.1.0/BatchRenderer/BatchContext.cpp 2014-06-11 12:48:46.040793947 +0200
@@ -37,7 +37,7 @@
#include <iostream>
#include <stdexcept>
@@ -246,8 +255,8 @@
#include "BatchContext.h"
Index: imagevis3d-3.1.0/Tuvok/Basics/basics.pro
===================================================================
---- imagevis3d-3.1.0.orig/Tuvok/Basics/basics.pro 2014-06-11 12:24:55.527956113 +0200
-+++ imagevis3d-3.1.0/Tuvok/Basics/basics.pro 2014-06-11 12:24:57.175956212 +0200
+--- imagevis3d-3.1.0.orig/Tuvok/Basics/basics.pro 2014-04-07 10:09:36.000000000 +0200
++++ imagevis3d-3.1.0/Tuvok/Basics/basics.pro 2014-06-11 12:48:46.040793947 +0200
@@ -5,7 +5,7 @@
TARGET = tuvokbasics
win32 { DESTDIR = Build }
@@ -257,3 +266,63 @@
DEPENDPATH = $$d
INCLUDEPATH = $$d
win32:LIBS += shlwapi.lib
+Index: imagevis3d-3.1.0/CmdLineConverter/CmdLineConverter.pro
+===================================================================
+--- imagevis3d-3.1.0.orig/CmdLineConverter/CmdLineConverter.pro 2014-06-11 12:48:46.000794009 +0200
++++ imagevis3d-3.1.0/CmdLineConverter/CmdLineConverter.pro 2014-06-11 12:50:11.436659748 +0200
+@@ -6,11 +6,8 @@
+ TARGET = Build/UVFConverter
+ unix:TARGET = Build/uvfconvert
+ QT = core gui opengl
+-incpath = ../Tuvok/3rdParty/GLEW
+-incpath += ../Tuvok/IO/3rdParty/boost/
+-incpath += ../Tuvok/IO/exception
++incpath = ../Tuvok/IO/exception
+ incpath += ../Tuvok/Basics
+-incpath += ../Tuvok/Basics/3rdParty
+ incpath += ../Tuvok
+ DEPENDPATH += $$incpath
+ INCLUDEPATH += $$incpath
+Index: imagevis3d-3.1.0/Tuvok/test/render/render.pro
+===================================================================
+--- imagevis3d-3.1.0.orig/Tuvok/test/render/render.pro 2014-06-11 12:48:45.996794016 +0200
++++ imagevis3d-3.1.0/Tuvok/test/render/render.pro 2014-06-11 12:50:33.172625051 +0200
+@@ -2,10 +2,6 @@
+ CONFIG += exceptions qt rtti staticlib static stl warn_on
+ TARGET = tuvok
+ p = . ../ ../../
+-p += ../../Basics/3rdParty
+-p += ../../IO/3rdParty
+-p += ../../IO/3rdParty/boost
+-p += ../../3rdParty/GLEW
+ DEPENDPATH = $$p
+ INCLUDEPATH = $$p
+ macx:INCLUDEPATH += /usr/X11R6/include
+Index: imagevis3d-3.1.0/Tuvok/test/context/context.pro
+===================================================================
+--- imagevis3d-3.1.0.orig/Tuvok/test/context/context.pro 2014-06-11 12:48:46.000794009 +0200
++++ imagevis3d-3.1.0/Tuvok/test/context/context.pro 2014-06-11 12:50:44.960606010 +0200
+@@ -2,10 +2,6 @@
+ CONFIG += exceptions qt rtti staticlib static stl warn_on
+ TARGET = tvktest
+ p = . ../ ../../
+-p += ../../Basics/3rdParty
+-p += ../../IO/3rdParty
+-p += ../../IO/3rdParty/boost
+-p += ../../3rdParty/GLEW
+ DEPENDPATH = $$p
+ INCLUDEPATH = $$p
+ macx:INCLUDEPATH += /usr/X11R6/include
+Index: imagevis3d-3.1.0/Tuvok/IO/scio.pro
+===================================================================
+--- imagevis3d-3.1.0.orig/Tuvok/IO/scio.pro 2014-06-11 12:48:45.820794298 +0200
++++ imagevis3d-3.1.0/Tuvok/IO/scio.pro 2014-06-11 12:52:33.152437386 +0200
+@@ -6,7 +6,7 @@
+ TARGET = tuvokio
+ win32 { DESTDIR = Build }
+ OBJECTS_DIR = Build/objects
+-d = ../Basics ../ 3rdParty/cxxtest 3rdParty/boost 3rdParty exception .
++d = ../Basics ../ exception .
+ DEPENDPATH = $$d
+ INCLUDEPATH = $$d
+ LIBS = -Lexpressions -ltuvokexpr
More information about the debian-med-commit
mailing list