[med-svn] r17122 - in trunk/packages/imagevis3d/trunk/debian: . patches
Mathieu Malaterre
malat at moszumanska.debian.org
Wed Jun 11 09:58:16 UTC 2014
Author: malat
Date: 2014-06-11 09:58:16 +0000 (Wed, 11 Jun 2014)
New Revision: 17122
Modified:
trunk/packages/imagevis3d/trunk/debian/changelog
trunk/packages/imagevis3d/trunk/debian/patches/thirdparty.patch
Log:
remove ref to 3rdparty
Modified: trunk/packages/imagevis3d/trunk/debian/changelog
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/changelog 2014-06-11 09:14:54 UTC (rev 17121)
+++ trunk/packages/imagevis3d/trunk/debian/changelog 2014-06-11 09:58:16 UTC (rev 17122)
@@ -1,3 +1,9 @@
+imagevis3d (3.1.0-2) UNRELEASED; urgency=low
+
+ * Really remove all references to 3rdParty
+
+ -- Mathieu Malaterre <malat at debian.org> Wed, 11 Jun 2014 11:57:47 +0200
+
imagevis3d (3.1.0-1) unstable; urgency=low
* New upstream
Modified: trunk/packages/imagevis3d/trunk/debian/patches/thirdparty.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/thirdparty.patch 2014-06-11 09:14:54 UTC (rev 17121)
+++ trunk/packages/imagevis3d/trunk/debian/patches/thirdparty.patch 2014-06-11 09:58:16 UTC (rev 17122)
@@ -1,8 +1,10 @@
Description: prefer system installed headers
Author: Mathieu Malaterre <malat at debian.org>
---- imagevis3d-3.1.0.orig/ImageVis3D/UI/RenderWindowDX.cpp
-+++ imagevis3d-3.1.0/ImageVis3D/UI/RenderWindowDX.cpp
+Index: imagevis3d-3.1.0/ImageVis3D/UI/RenderWindowDX.cpp
+===================================================================
+--- imagevis3d-3.1.0.orig/ImageVis3D/UI/RenderWindowDX.cpp 2014-06-11 11:44:31.535810540 +0200
++++ imagevis3d-3.1.0/ImageVis3D/UI/RenderWindowDX.cpp 2014-06-11 11:44:34.043810691 +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
@@ -12,8 +14,10 @@
#include "RenderWindowDX.h"
#include "ImageVis3D.h"
---- imagevis3d-3.1.0.orig/StandaloneTuvok/GLContext.cpp
-+++ imagevis3d-3.1.0/StandaloneTuvok/GLContext.cpp
+Index: imagevis3d-3.1.0/StandaloneTuvok/GLContext.cpp
+===================================================================
+--- imagevis3d-3.1.0.orig/StandaloneTuvok/GLContext.cpp 2014-06-11 11:44:31.535810540 +0200
++++ imagevis3d-3.1.0/StandaloneTuvok/GLContext.cpp 2014-06-11 11:44:34.043810691 +0200
@@ -1,10 +1,10 @@
#include "GLContext.h"
-#include "3rdParty/GLEW/GL/glew.h"
@@ -28,8 +32,10 @@
#endif
GLContext::GLContext(UINT32 width, UINT32 height, BYTE colorBits, BYTE depthBits, BYTE stencilBits, bool useDoubleBuffer, std::wostream * errorOutput) :
---- imagevis3d-3.1.0.orig/Tuvok/IO/UVF/ExtendedOctree/BzlibCompression.cpp
-+++ imagevis3d-3.1.0/Tuvok/IO/UVF/ExtendedOctree/BzlibCompression.cpp
+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 11:44:31.535810540 +0200
++++ imagevis3d-3.1.0/Tuvok/IO/UVF/ExtendedOctree/BzlibCompression.cpp 2014-06-11 11:44:34.043810691 +0200
@@ -6,7 +6,7 @@
#include "BzlibCompression.h"
@@ -39,8 +45,10 @@
}
namespace {
---- imagevis3d-3.1.0.orig/Tuvok/Renderer/GL/GLInclude.h
-+++ imagevis3d-3.1.0/Tuvok/Renderer/GL/GLInclude.h
+Index: imagevis3d-3.1.0/Tuvok/Renderer/GL/GLInclude.h
+===================================================================
+--- imagevis3d-3.1.0.orig/Tuvok/Renderer/GL/GLInclude.h 2014-06-11 11:44:31.535810540 +0200
++++ imagevis3d-3.1.0/Tuvok/Renderer/GL/GLInclude.h 2014-06-11 11:44:34.043810691 +0200
@@ -44,7 +44,7 @@
#ifdef WIN32
@@ -50,3 +58,180 @@
#include <windows.h>
// undef stupid windows defines to max and min
#ifdef max
+Index: imagevis3d-3.1.0/BatchRenderer/BatchRenderer.pro
+===================================================================
+--- imagevis3d-3.1.0.orig/BatchRenderer/BatchRenderer.pro 2014-06-11 11:44:31.535810540 +0200
++++ imagevis3d-3.1.0/BatchRenderer/BatchRenderer.pro 2014-06-11 11:44:34.043810691 +0200
+@@ -3,10 +3,6 @@
+ TARGET = BatchRenderer
+ DEPENDPATH = .
+ INCLUDEPATH = . ../Tuvok \
+-INCLUDEPATH += ../Tuvok/3rdParty
+-INCLUDEPATH += ../Tuvok/Basics/3rdParty
+-INCLUDEPATH += ../Tuvok/3rdParty/GLEW
+-INCLUDEPATH += ../Tuvok/IO/3rdParty/boost/
+ INCLUDEPATH += /usr/include/lua5.2
+ QMAKE_LIBDIR += ../Tuvok/Build ../Tuvok/IO/expressions
+ QT += opengl
+Index: imagevis3d-3.1.0/UVFReader/UVFReader.pro
+===================================================================
+--- imagevis3d-3.1.0.orig/UVFReader/UVFReader.pro 2014-06-11 11:44:31.535810540 +0200
++++ imagevis3d-3.1.0/UVFReader/UVFReader.pro 2014-06-11 11:44:34.043810691 +0200
+@@ -8,10 +8,7 @@
+ QT += opengl
+ DEPENDPATH += .
+ INCLUDEPATH += .
+-INCLUDEPATH += ../Tuvok/IO/3rdParty/boost
+-INCLUDEPATH += ../Tuvok/3rdParty/GLEW
+ INCLUDEPATH += ../Tuvok
+-INCLUDEPATH += ../Tuvok/Basics/3rdParty
+ INCLUDEPATH += ../Tuvok/Basics
+ QMAKE_LIBDIR += ../Tuvok/Build
+ QMAKE_LIBDIR += ../Tuvok/IO/expressions
+Index: imagevis3d-3.1.0/Tuvok/tvk.pro
+===================================================================
+--- imagevis3d-3.1.0.orig/Tuvok/tvk.pro 2014-06-11 11:44:31.535810540 +0200
++++ imagevis3d-3.1.0/Tuvok/tvk.pro 2014-06-11 11:44:34.043810691 +0200
+@@ -13,7 +13,7 @@
+ RCC_DIR = Build/rcc
+ OBJECTS_DIR = Build/objects
+ DEPENDPATH += . Basics Controller DebugOut IO Renderer
+-INCLUDEPATH += . 3rdParty/GLEW IO/3rdParty/boost IO/3rdParty/zlib IO/3rdParty/lzma IO/3rdParty/lz4 IO/3rdParty/lzham
++INCLUDEPATH += . IO/3rdParty/lzma IO/3rdParty/lzham
+ INCLUDEPATH += Basics IO/exception
+ INCLUDEPATH += /usr/include/lua5.2
+ QT += opengl
+Index: imagevis3d-3.1.0/Tuvok/doc/genlua/genlua.pro
+===================================================================
+--- imagevis3d-3.1.0.orig/Tuvok/doc/genlua/genlua.pro 2014-06-11 11:44:31.535810540 +0200
++++ imagevis3d-3.1.0/Tuvok/doc/genlua/genlua.pro 2014-06-11 11:44:34.043810691 +0200
+@@ -6,8 +6,6 @@
+ DEPENDPATH = .
+ INCLUDEPATH = ../../
+ INCLUDEPATH += /usr/include/lua5.2
+-INCLUDEPATH += ../../Basics/3rdParty
+-INCLUDEPATH += ../../IO/3rdParty/boost/
+ QMAKE_LIBDIR += ../../Build
+ QMAKE_LIBDIR += ../../IO/expressions
+ 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 11:44:31.535810540 +0200
++++ imagevis3d-3.1.0/Tuvok/IO/expressions/libexpr.pro 2014-06-11 11:44:34.043810691 +0200
+@@ -5,7 +5,7 @@
+ DEFINES += YY_NO_UNPUT _FILE_OFFSET_BITS=64
+ TARGET = tuvokexpr
+ DEPENDPATH += . ../../Basics ../
+-INCLUDEPATH += ../../ ../../Basics ../ ../3rdParty/boost
++INCLUDEPATH += ../../ ../../Basics ../
+ unix:QMAKE_CXXFLAGS += -std=c++0x
+ unix:QMAKE_CXXFLAGS += -fno-strict-aliasing
+ 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 11:44:31.535810540 +0200
++++ imagevis3d-3.1.0/Tuvok/test/shaders/shaders.pro 2014-06-11 11:44:34.043810691 +0200
+@@ -3,9 +3,6 @@
+ TARGET = shtest
+ DEPENDPATH += . ../../
+ INCLUDEPATH += ../
+-INCLUDEPATH += ../../ ../../IO/3rdParty/boost
+-INCLUDEPATH += ../../Basics/3rdParty
+-INCLUDEPATH += ../../3rdParty/GLEW
+ INCLUDEPATH += /usr/include/lua5.2
+ # for glX
+ 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 11:44:31.535810540 +0200
++++ imagevis3d-3.1.0/Tuvok/IO/expressions/debug.pro 2014-06-11 11:44:34.043810691 +0200
+@@ -5,7 +5,7 @@
+ macx:DEFINES += QT_MAC_USE_COCOA=1
+ TARGET = lexdbg
+ DEPENDPATH += . ../../Basics ../
+-INCLUDEPATH += ../../ ../../Basics ../ ../3rdParty/boost
++INCLUDEPATH += ../../ ../../Basics ../
+ win32:LIBS += shlwapi.lib
+ unix:QMAKE_CXXFLAGS += -std=c++0x
+ 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 11:44:31.535810540 +0200
++++ imagevis3d-3.1.0/Tuvok/IO/test/test.pro 2014-06-11 11:44:34.043810691 +0200
+@@ -4,7 +4,7 @@
+ TARGET = cxxtester
+ DEFINES += _FILE_OFFSET_BITS=64
+ DEPENDPATH += . ../
+-INCLUDEPATH += ../ ../../ ../3rdParty/boost ../3rdParty/cxxtest
++INCLUDEPATH += ../ ../../
+ INCLUDEPATH += ../../Basics
+ QT += core gui opengl
+ QMAKE_LIBDIR += ../../Build ../expressions
+Index: imagevis3d-3.1.0/ExtractDebugInfo/ExtractDebugInfo.pro
+===================================================================
+--- imagevis3d-3.1.0.orig/ExtractDebugInfo/ExtractDebugInfo.pro 2014-06-11 11:44:31.535810540 +0200
++++ imagevis3d-3.1.0/ExtractDebugInfo/ExtractDebugInfo.pro 2014-06-11 11:44:34.043810691 +0200
+@@ -5,7 +5,7 @@
+ macx:DEFINES += QT_MAC_USE_COCOA=1
+ TARGET = Build/ExtractDebugInfo
+ DEPENDPATH += .
+-INCLUDEPATH += . ../ ../Tuvok/Basics/3rdParty ../Tuvok
++INCLUDEPATH += . ../ ../Tuvok
+ QMAKE_LIBDIR += ../Tuvok/Build ../Tuvok/IO/expressions
+ LIBS = -lTuvok -ltuvokexpr
+ QT += opengl
+Index: imagevis3d-3.1.0/ImageVis3D/ImageVis3D.pro
+===================================================================
+--- imagevis3d-3.1.0.orig/ImageVis3D/ImageVis3D.pro 2014-06-11 11:44:31.535810540 +0200
++++ imagevis3d-3.1.0/ImageVis3D/ImageVis3D.pro 2014-06-11 11:44:34.043810691 +0200
+@@ -11,11 +11,9 @@
+ incpath += ../Tuvok/IO ../Tuvok/IO/exception ../Tuvok/Renderer
+ incpath += ../Tuvok
+ incpath += DebugOut UI UI/AutoGen
+-incpath += ../Tuvok/IO/3rdParty/boost ../Tuvok/3rdParty/GLEW
+ incpath += /usr/include/lua5.2
+ DEPENDPATH += $$incpath
+ INCLUDEPATH += $$incpath
+-#INCLUDEPATH += . ../Tuvok/IO/3rdParty/boost ../Tuvok/3rdParty/GLEW ../Tuvok
+ QT += opengl network
+ QMAKE_LIBDIR += ../Tuvok/Build ../Tuvok/IO/expressions
+ LIBS = -lTuvok -ltuvokexpr
+Index: imagevis3d-3.1.0/BatchRenderer/main.cpp
+===================================================================
+--- 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 11:51:53.607837089 +0200
+@@ -32,7 +32,7 @@
+ #include <cstdlib>
+ #include <iostream>
+
+-#include "GLEW/GL/glew.h"
++#include <GL/glew.h>
+ #include "tclap/CmdLine.h"
+
+ #include "LuaScripting/LuaScripting.h"
+Index: imagevis3d-3.1.0/BatchRenderer/BatchContext.cpp
+===================================================================
+--- 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 11:52:24.731838958 +0200
+@@ -37,7 +37,7 @@
+ #include <iostream>
+ #include <stdexcept>
+
+-#include <GLEW/GL/glew.h>
++#include <GL/glew.h>
+
+ #include "Renderer/GL/GLStateManager.h"
+ #include "BatchContext.h"
+Index: imagevis3d-3.1.0/Tuvok/Basics/basics.pro
+===================================================================
+--- 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 11:55:15.291849201 +0200
+@@ -5,7 +5,7 @@
+ TARGET = tuvokbasics
+ win32 { DESTDIR = Build }
+ OBJECTS_DIR = Build/objects
+-d = 3rdParty/boost 3rdParty/tclap . ../
++d = . ../
+ DEPENDPATH = $$d
+ INCLUDEPATH = $$d
+ win32:LIBS += shlwapi.lib
More information about the debian-med-commit
mailing list