[med-svn] r12485 - in trunk/packages/imagevis3d/trunk/debian: . patches
Mathieu Malaterre
malat at alioth.debian.org
Sun Oct 28 09:08:15 UTC 2012
Author: malat
Date: 2012-10-28 09:08:15 +0000 (Sun, 28 Oct 2012)
New Revision: 12485
Modified:
trunk/packages/imagevis3d/trunk/debian/changelog
trunk/packages/imagevis3d/trunk/debian/patches/convenientlibs.patch
trunk/packages/imagevis3d/trunk/debian/patches/systemglew.patch
trunk/packages/imagevis3d/trunk/debian/patches/systemjpeg.patch
trunk/packages/imagevis3d/trunk/debian/patches/systemlua.patch
trunk/packages/imagevis3d/trunk/debian/patches/systemzlib.patch
Log:
Update for 3.0, refresh patches
Modified: trunk/packages/imagevis3d/trunk/debian/changelog
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/changelog 2012-10-27 21:50:41 UTC (rev 12484)
+++ trunk/packages/imagevis3d/trunk/debian/changelog 2012-10-28 09:08:15 UTC (rev 12485)
@@ -1,3 +1,9 @@
+imagevis3d (3.0.0-1) UNRELEASED; urgency=low
+
+ * New upstream: 3.0.0
+
+ -- Mathieu Malaterre <malat at debian.org> Sun, 28 Oct 2012 09:39:29 +0100
+
imagevis3d (2.1.1-1) unstable; urgency=low
* New upstream: 2.1.1
Modified: trunk/packages/imagevis3d/trunk/debian/patches/convenientlibs.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/convenientlibs.patch 2012-10-27 21:50:41 UTC (rev 12484)
+++ trunk/packages/imagevis3d/trunk/debian/patches/convenientlibs.patch 2012-10-28 09:08:15 UTC (rev 12485)
@@ -2,10 +2,10 @@
Forwarded: not-needed
Author: Mathieu Malaterre <malat at debian.org>
-Index: imagevis3d-2.1.1/Tuvok/tvk.pro
+Index: imagevis3d-3.0.0/Tuvok/tvk.pro
===================================================================
---- imagevis3d-2.1.1.orig/Tuvok/tvk.pro 2012-08-16 22:09:51.000000000 +0200
-+++ imagevis3d-2.1.1/Tuvok/tvk.pro 2012-08-23 16:16:21.698735084 +0200
+--- imagevis3d-3.0.0.orig/Tuvok/tvk.pro 2012-10-24 20:18:29.000000000 +0200
++++ imagevis3d-3.0.0/Tuvok/tvk.pro 2012-10-28 09:40:20.549511620 +0100
@@ -60,33 +60,6 @@
# Input
@@ -40,7 +40,7 @@
Basics/Appendix.h \
Basics/ArcBall.h \
Basics/Checksums/crc32.h \
-@@ -114,34 +87,6 @@
+@@ -118,34 +91,6 @@
DebugOut/ConsoleOut.h \
DebugOut/MultiplexOut.h \
DebugOut/TextfileOut.h \
@@ -75,7 +75,7 @@
IO/AbstrConverter.h \
IO/AmiraConverter.h \
IO/AnalyzeConverter.h \
-@@ -275,39 +220,6 @@
+@@ -283,39 +228,6 @@
Basics/LargeFileMMap.h
SOURCES += \
@@ -115,7 +115,7 @@
Basics/Appendix.cpp \
Basics/ArcBall.cpp \
Basics/Checksums/MD5.cpp \
-@@ -329,114 +241,6 @@
+@@ -340,114 +252,6 @@
DebugOut/ConsoleOut.cpp \
DebugOut/MultiplexOut.cpp \
DebugOut/TextfileOut.cpp \
@@ -230,7 +230,7 @@
IO/AbstrConverter.cpp \
IO/AmiraConverter.cpp \
IO/AnalyzeConverter.cpp \
-@@ -547,7 +351,6 @@
+@@ -564,7 +368,6 @@
Basics/LargeFileAIO.cpp \
Basics/LargeFileFD.cpp \
Basics/LargeFileMMap.cpp \
@@ -238,7 +238,7 @@
win32 {
HEADERS += \
-@@ -564,7 +367,6 @@
+@@ -581,7 +384,6 @@
SOURCES += \
Basics/DynamicDX.cpp \
@@ -246,10 +246,10 @@
Renderer/DX/DXRaycaster.cpp \
Renderer/DX/DXRenderer.cpp \
Renderer/DX/DXSBVR.cpp \
-Index: imagevis3d-2.1.1/Tuvok/IO/scio.pro
+Index: imagevis3d-3.0.0/Tuvok/IO/scio.pro
===================================================================
---- imagevis3d-2.1.1.orig/Tuvok/IO/scio.pro 2012-08-03 00:39:24.000000000 +0200
-+++ imagevis3d-2.1.1/Tuvok/IO/scio.pro 2012-08-23 16:16:21.702735084 +0200
+--- imagevis3d-3.0.0.orig/Tuvok/IO/scio.pro 2012-10-24 20:18:35.000000000 +0200
++++ imagevis3d-3.0.0/Tuvok/IO/scio.pro 2012-10-28 09:40:20.549511620 +0100
@@ -36,113 +36,6 @@
# Input
@@ -364,7 +364,7 @@
./AbstrConverter.cpp \
./AbstrGeoConverter.cpp \
./AnalyzeConverter.cpp \
-@@ -200,38 +93,6 @@
+@@ -201,38 +94,6 @@
./VGStudioConverter.cpp
HEADERS += \
Modified: trunk/packages/imagevis3d/trunk/debian/patches/systemglew.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/systemglew.patch 2012-10-27 21:50:41 UTC (rev 12484)
+++ trunk/packages/imagevis3d/trunk/debian/patches/systemglew.patch 2012-10-28 09:08:15 UTC (rev 12485)
@@ -2,10 +2,10 @@
Forwarded: not-needed
Author: Mathieu Malaterre <malat at debian.org>
-Index: imagevis3d-2.1.1/Tuvok/Renderer/GPUMemMan/GPUMemMan.h
+Index: imagevis3d-3.0.0/Tuvok/Renderer/GPUMemMan/GPUMemMan.h
===================================================================
---- imagevis3d-2.1.1.orig/Tuvok/Renderer/GPUMemMan/GPUMemMan.h 2012-08-04 22:24:38.000000000 +0200
-+++ imagevis3d-2.1.1/Tuvok/Renderer/GPUMemMan/GPUMemMan.h 2012-08-23 16:16:26.170734922 +0200
+--- imagevis3d-3.0.0.orig/Tuvok/Renderer/GPUMemMan/GPUMemMan.h 2012-10-24 20:18:28.000000000 +0200
++++ imagevis3d-3.0.0/Tuvok/Renderer/GPUMemMan/GPUMemMan.h 2012-10-28 09:40:27.969511664 +0100
@@ -33,7 +33,7 @@
#include <deque>
#include <utility>
@@ -15,10 +15,10 @@
#include "Basics/Vectors.h"
#include "GPUMemManDataStructs.h"
-Index: imagevis3d-2.1.1/Tuvok/Renderer/GPUMemMan/GPUMemManDataStructs.h
+Index: imagevis3d-3.0.0/Tuvok/Renderer/GPUMemMan/GPUMemManDataStructs.h
===================================================================
---- imagevis3d-2.1.1.orig/Tuvok/Renderer/GPUMemMan/GPUMemManDataStructs.h 2012-08-04 22:24:38.000000000 +0200
-+++ imagevis3d-2.1.1/Tuvok/Renderer/GPUMemMan/GPUMemManDataStructs.h 2012-08-23 16:16:26.170734922 +0200
+--- imagevis3d-3.0.0.orig/Tuvok/Renderer/GPUMemMan/GPUMemManDataStructs.h 2012-10-24 20:18:28.000000000 +0200
++++ imagevis3d-3.0.0/Tuvok/Renderer/GPUMemMan/GPUMemManDataStructs.h 2012-10-28 09:40:27.969511664 +0100
@@ -44,7 +44,7 @@
#include <memory>
#include <string>
@@ -28,23 +28,23 @@
#include "boost/noncopyable.hpp"
#include "Basics/Vectors.h"
#include "IO/Brick.h"
-Index: imagevis3d-2.1.1/ImageVis3D/UI/RenderWindowGL.cpp
+Index: imagevis3d-3.0.0/ImageVis3D/UI/RenderWindowGL.cpp
===================================================================
---- imagevis3d-2.1.1.orig/ImageVis3D/UI/RenderWindowGL.cpp 2012-08-19 12:24:08.000000000 +0200
-+++ imagevis3d-2.1.1/ImageVis3D/UI/RenderWindowGL.cpp 2012-08-23 16:16:26.170734922 +0200
-@@ -37,7 +37,7 @@
-
+--- imagevis3d-3.0.0.orig/ImageVis3D/UI/RenderWindowGL.cpp 2012-10-24 20:15:41.000000000 +0200
++++ imagevis3d-3.0.0/ImageVis3D/UI/RenderWindowGL.cpp 2012-10-28 09:40:27.969511664 +0100
+@@ -38,7 +38,7 @@
#include "../Tuvok/StdTuvokDefines.h"
+ #include <cstring>
#include <sstream>
-#include <3rdParty/GLEW/GL/glew.h>
+#include <GL/glew.h>
#if defined(__GNUC__) && defined(DETECTED_OS_LINUX)
# pragma GCC visibility push(default)
#endif
-Index: imagevis3d-2.1.1/Tuvok/Renderer/GL/GLInclude.h
+Index: imagevis3d-3.0.0/Tuvok/Renderer/GL/GLInclude.h
===================================================================
---- imagevis3d-2.1.1.orig/Tuvok/Renderer/GL/GLInclude.h 2012-01-21 00:39:27.000000000 +0100
-+++ imagevis3d-2.1.1/Tuvok/Renderer/GL/GLInclude.h 2012-08-23 16:16:26.170734922 +0200
+--- imagevis3d-3.0.0.orig/Tuvok/Renderer/GL/GLInclude.h 2012-10-24 20:18:28.000000000 +0200
++++ imagevis3d-3.0.0/Tuvok/Renderer/GL/GLInclude.h 2012-10-28 09:40:27.969511664 +0100
@@ -40,7 +40,7 @@
#define TUVOK_GLINCLUDE_H
Modified: trunk/packages/imagevis3d/trunk/debian/patches/systemjpeg.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/systemjpeg.patch 2012-10-27 21:50:41 UTC (rev 12484)
+++ trunk/packages/imagevis3d/trunk/debian/patches/systemjpeg.patch 2012-10-28 09:08:15 UTC (rev 12485)
@@ -2,10 +2,10 @@
Forwarded: not-needed
Author: Mathieu Malaterre <malat at debian.org>
-Index: imagevis3d-2.1.1/Tuvok/IO/TuvokJPEG.cpp
+Index: imagevis3d-3.0.0/Tuvok/IO/TuvokJPEG.cpp
===================================================================
---- imagevis3d-2.1.1.orig/Tuvok/IO/TuvokJPEG.cpp 2012-07-23 21:28:24.000000000 +0200
-+++ imagevis3d-2.1.1/Tuvok/IO/TuvokJPEG.cpp 2012-08-23 16:16:32.922734679 +0200
+--- imagevis3d-3.0.0.orig/Tuvok/IO/TuvokJPEG.cpp 2012-10-24 20:18:35.000000000 +0200
++++ imagevis3d-3.0.0/Tuvok/IO/TuvokJPEG.cpp 2012-10-28 09:40:33.073511694 +0100
@@ -39,7 +39,7 @@
#include <fstream>
#include <iterator>
@@ -24,10 +24,10 @@
if(jpeg_read_header(&(this->jinfo), TRUE) != JPEG_HEADER_OK) {
T_ERROR("Could not read JPEG header, bailing...");
return;
-Index: imagevis3d-2.1.1/ImageVis3D/UI/QDataRadioButton.cpp
+Index: imagevis3d-3.0.0/ImageVis3D/UI/QDataRadioButton.cpp
===================================================================
---- imagevis3d-2.1.1.orig/ImageVis3D/UI/QDataRadioButton.cpp 2012-07-17 20:11:23.000000000 +0200
-+++ imagevis3d-2.1.1/ImageVis3D/UI/QDataRadioButton.cpp 2012-08-23 16:16:32.922734679 +0200
+--- imagevis3d-3.0.0.orig/ImageVis3D/UI/QDataRadioButton.cpp 2012-10-24 20:15:41.000000000 +0200
++++ imagevis3d-3.0.0/ImageVis3D/UI/QDataRadioButton.cpp 2012-10-28 09:40:33.073511694 +0100
@@ -39,7 +39,7 @@
#include <QtGui/QMouseEvent>
#include "../Tuvok/IO/TuvokJPEG.h"
@@ -46,10 +46,10 @@
vData.resize(jpg.size());
std::copy(jpg_data, jpg_data + jpg.size(), &vData[0]);
} else {
-Index: imagevis3d-2.1.1/Tuvok/IO/IOManager.cpp
+Index: imagevis3d-3.0.0/Tuvok/IO/IOManager.cpp
===================================================================
---- imagevis3d-2.1.1.orig/Tuvok/IO/IOManager.cpp 2012-08-16 22:09:59.000000000 +0200
-+++ imagevis3d-2.1.1/Tuvok/IO/IOManager.cpp 2012-08-23 16:16:32.922734679 +0200
+--- imagevis3d-3.0.0.orig/Tuvok/IO/IOManager.cpp 2012-10-24 20:18:35.000000000 +0200
++++ imagevis3d-3.0.0/Tuvok/IO/IOManager.cpp 2012-10-28 09:40:33.073511694 +0100
@@ -44,7 +44,7 @@
#include <sstream>
#include <map>
@@ -59,7 +59,7 @@
#include "IOManager.h"
-@@ -351,7 +351,7 @@
+@@ -355,7 +355,7 @@
const char *jpeg_data = jpg.data();
copy(jpeg_data, jpeg_data + jpg.size(), &vData[0]);
Modified: trunk/packages/imagevis3d/trunk/debian/patches/systemlua.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/systemlua.patch 2012-10-27 21:50:41 UTC (rev 12484)
+++ trunk/packages/imagevis3d/trunk/debian/patches/systemlua.patch 2012-10-28 09:08:15 UTC (rev 12485)
@@ -2,10 +2,10 @@
Forwarded: not-needed
Author: Mathieu Malaterre <malat at debian.org>
-Index: imagevis3d-2.1.1/Tuvok/LuaScripting/LuaScripting.h
+Index: imagevis3d-3.0.0/Tuvok/LuaScripting/LuaScripting.h
===================================================================
---- imagevis3d-2.1.1.orig/Tuvok/LuaScripting/LuaScripting.h 2012-09-20 15:12:21.483545990 +0200
-+++ imagevis3d-2.1.1/Tuvok/LuaScripting/LuaScripting.h 2012-09-20 15:12:31.519545628 +0200
+--- imagevis3d-3.0.0.orig/Tuvok/LuaScripting/LuaScripting.h 2012-10-28 09:02:28.165519502 +0000
++++ imagevis3d-3.0.0/Tuvok/LuaScripting/LuaScripting.h 2012-10-28 09:02:29.809519512 +0000
@@ -46,7 +46,7 @@
#ifndef LUASCRIPTING_NO_TUVOK
@@ -15,10 +15,10 @@
#else
-Index: imagevis3d-2.1.1/Tuvok/LuaScripting/TuvokSpecific/LuaTuvokTypes.h
+Index: imagevis3d-3.0.0/Tuvok/LuaScripting/TuvokSpecific/LuaTuvokTypes.h
===================================================================
---- imagevis3d-2.1.1.orig/Tuvok/LuaScripting/TuvokSpecific/LuaTuvokTypes.h 2012-09-20 15:12:21.483545990 +0200
-+++ imagevis3d-2.1.1/Tuvok/LuaScripting/TuvokSpecific/LuaTuvokTypes.h 2012-09-20 15:12:31.519545628 +0200
+--- imagevis3d-3.0.0.orig/Tuvok/LuaScripting/TuvokSpecific/LuaTuvokTypes.h 2012-10-28 09:02:28.165519502 +0000
++++ imagevis3d-3.0.0/Tuvok/LuaScripting/TuvokSpecific/LuaTuvokTypes.h 2012-10-28 09:02:29.809519512 +0000
@@ -35,7 +35,7 @@
#ifndef TUVOK_LUATUVOKSPECIFICTYPES_H_
#define TUVOK_LUATUVOKSPECIFICTYPES_H_
@@ -28,10 +28,10 @@
// LuaFunBinding must always come before our implementation, because we depend
// on the templates it has built.
-Index: imagevis3d-2.1.1/Tuvok/LuaScripting/TuvokSpecific/LuaDatasetProxy.cpp
+Index: imagevis3d-3.0.0/Tuvok/LuaScripting/TuvokSpecific/LuaDatasetProxy.cpp
===================================================================
---- imagevis3d-2.1.1.orig/Tuvok/LuaScripting/TuvokSpecific/LuaDatasetProxy.cpp 2012-09-20 15:12:21.483545990 +0200
-+++ imagevis3d-2.1.1/Tuvok/LuaScripting/TuvokSpecific/LuaDatasetProxy.cpp 2012-09-20 15:12:31.519545628 +0200
+--- imagevis3d-3.0.0.orig/Tuvok/LuaScripting/TuvokSpecific/LuaDatasetProxy.cpp 2012-10-28 09:02:28.165519502 +0000
++++ imagevis3d-3.0.0/Tuvok/LuaScripting/TuvokSpecific/LuaDatasetProxy.cpp 2012-10-28 09:02:29.809519512 +0000
@@ -31,7 +31,7 @@
*/
@@ -41,10 +41,10 @@
#include "IO/IOManager.h"
#include "IO/FileBackedDataset.h"
#include "IO/uvfDataset.h"
-Index: imagevis3d-2.1.1/Tuvok/Renderer/RenderRegion.cpp
+Index: imagevis3d-3.0.0/Tuvok/Renderer/RenderRegion.cpp
===================================================================
---- imagevis3d-2.1.1.orig/Tuvok/Renderer/RenderRegion.cpp 2012-09-20 15:12:21.483545990 +0200
-+++ imagevis3d-2.1.1/Tuvok/Renderer/RenderRegion.cpp 2012-09-20 15:12:31.519545628 +0200
+--- imagevis3d-3.0.0.orig/Tuvok/Renderer/RenderRegion.cpp 2012-10-28 09:02:28.165519502 +0000
++++ imagevis3d-3.0.0/Tuvok/Renderer/RenderRegion.cpp 2012-10-28 09:02:29.809519512 +0000
@@ -27,7 +27,7 @@
*/
@@ -54,28 +54,29 @@
// Standard
#include "../Basics/Vectors.h"
-Index: imagevis3d-2.1.1/ImageVis3D/ImageVis3D.pro
+Index: imagevis3d-3.0.0/ImageVis3D/ImageVis3D.pro
===================================================================
---- imagevis3d-2.1.1.orig/ImageVis3D/ImageVis3D.pro 2012-09-20 15:12:21.483545990 +0200
-+++ imagevis3d-2.1.1/ImageVis3D/ImageVis3D.pro 2012-09-20 16:04:47.255432436 +0200
-@@ -12,26 +12,27 @@
- incpath += ../Tuvok/Scripting ../Tuvok
+--- imagevis3d-3.0.0.orig/ImageVis3D/ImageVis3D.pro 2012-10-28 09:02:28.165519502 +0000
++++ imagevis3d-3.0.0/ImageVis3D/ImageVis3D.pro 2012-10-28 09:05:16.761520504 +0000
+@@ -12,6 +12,7 @@
+ 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
+@@ -19,6 +20,7 @@
QMAKE_LIBDIR += ../Tuvok/Build ../Tuvok/IO/expressions
LIBS = -lTuvok -ltuvokexpr
--unix:LIBS += -lz
-+unix:LIBS += -lz -llua5.2 -lGLEW -ljpeg -ltiff -lbz2
+ unix:LIBS += -lz
++unix:LIBS += -llua5.2 -lGLEW -ljpeg -ltiff -lbz2
win32:LIBS += shlwapi.lib
unix:!macx:LIBS += -lGLU
macx:QMAKE_CXXFLAGS += -stdlib=libc++ -mmacosx-version-min=10.7
- macx:QMAKE_CFLAGS += -mmacosx-version-min=10.7
+@@ -26,13 +28,13 @@
macx:LIBS += -stdlib=libc++ -framework CoreFoundation -mmacosx-version-min=10.7
+ QMAKE_CXXFLAGS_WARN_ON += -Wno-unknown-pragmas
# Try to link to GLU statically.
-gludirs = /usr/lib /usr/lib/x86_64-linux-gnu
-for(d, gludirs) {
@@ -94,10 +95,10 @@
# Find the location of QtGui's prl file, and include it here so we can look at
# the QMAKE_PRL_CONFIG variable.
-Index: imagevis3d-2.1.1/Tuvok/test/shaders/shaders.pro
+Index: imagevis3d-3.0.0/Tuvok/test/shaders/shaders.pro
===================================================================
---- imagevis3d-2.1.1.orig/Tuvok/test/shaders/shaders.pro 2012-09-20 15:12:21.483545990 +0200
-+++ imagevis3d-2.1.1/Tuvok/test/shaders/shaders.pro 2012-09-20 16:01:16.615440038 +0200
+--- imagevis3d-3.0.0.orig/Tuvok/test/shaders/shaders.pro 2012-10-28 09:02:28.165519502 +0000
++++ imagevis3d-3.0.0/Tuvok/test/shaders/shaders.pro 2012-10-28 09:02:29.809519512 +0000
@@ -6,25 +6,26 @@
INCLUDEPATH += ../../ ../../IO/3rdParty/boost
INCLUDEPATH += ../../Basics/3rdParty
@@ -133,19 +134,19 @@
macx:QMAKE_CXXFLAGS += -stdlib=libc++ -mmacosx-version-min=10.7
macx:QMAKE_CFLAGS += -mmacosx-version-min=10.7
-Index: imagevis3d-2.1.1/Tuvok/tvk.pro
+Index: imagevis3d-3.0.0/Tuvok/tvk.pro
===================================================================
---- imagevis3d-2.1.1.orig/Tuvok/tvk.pro 2012-09-20 15:12:25.731545837 +0200
-+++ imagevis3d-2.1.1/Tuvok/tvk.pro 2012-09-20 15:42:59.791479631 +0200
+--- imagevis3d-3.0.0.orig/Tuvok/tvk.pro 2012-10-28 09:02:28.165519502 +0000
++++ imagevis3d-3.0.0/Tuvok/tvk.pro 2012-10-28 09:02:29.809519512 +0000
@@ -14,10 +14,12 @@
- DEPENDPATH += . Basics Controller DebugOut IO Renderer Scripting
+ DEPENDPATH += . Basics Controller DebugOut IO Renderer
INCLUDEPATH += . 3rdParty/GLEW IO/3rdParty/boost IO/3rdParty/zlib
INCLUDEPATH += Basics IO/exception
+INCLUDEPATH += /usr/include/lua5.2
QT += opengl
QMAKE_LIBDIR += IO/expressions
LIBS = -ltuvokexpr
- unix:LIBS += -lz
+ unix:LIBS += -lz -lpthread
+unix:LIBS += -llua5.2
win32:LIBS += shlwapi.lib
unix:QMAKE_CXXFLAGS += -std=c++0x
@@ -171,10 +172,10 @@
# Find the location of QtGui's prl file, and include it here so we can look at
# the QMAKE_PRL_CONFIG variable.
-Index: imagevis3d-2.1.1/Tuvok/test/render/render.pro
+Index: imagevis3d-3.0.0/Tuvok/test/render/render.pro
===================================================================
---- imagevis3d-2.1.1.orig/Tuvok/test/render/render.pro 2012-08-23 16:16:53.406733939 +0200
-+++ imagevis3d-2.1.1/Tuvok/test/render/render.pro 2012-09-20 16:00:08.483442498 +0200
+--- imagevis3d-3.0.0.orig/Tuvok/test/render/render.pro 2012-10-28 09:02:28.165519502 +0000
++++ imagevis3d-3.0.0/Tuvok/test/render/render.pro 2012-10-28 09:02:29.809519512 +0000
@@ -9,20 +9,21 @@
DEPENDPATH = $$p
INCLUDEPATH = $$p
@@ -206,10 +207,10 @@
unix:QMAKE_CXXFLAGS += -std=c++0x
unix:QMAKE_CXXFLAGS += -fno-strict-aliasing -g
unix:QMAKE_CFLAGS += -fno-strict-aliasing -g
-Index: imagevis3d-2.1.1/Tuvok/LuaScripting/TuvokSpecific/LuaTransferFun1DProxy.cpp
+Index: imagevis3d-3.0.0/Tuvok/LuaScripting/TuvokSpecific/LuaTransferFun1DProxy.cpp
===================================================================
---- imagevis3d-2.1.1.orig/Tuvok/LuaScripting/TuvokSpecific/LuaTransferFun1DProxy.cpp 2012-08-11 01:17:07.000000000 +0200
-+++ imagevis3d-2.1.1/Tuvok/LuaScripting/TuvokSpecific/LuaTransferFun1DProxy.cpp 2012-09-20 15:53:01.411457914 +0200
+--- imagevis3d-3.0.0.orig/Tuvok/LuaScripting/TuvokSpecific/LuaTransferFun1DProxy.cpp 2012-10-28 09:02:28.165519502 +0000
++++ imagevis3d-3.0.0/Tuvok/LuaScripting/TuvokSpecific/LuaTransferFun1DProxy.cpp 2012-10-28 09:02:29.809519512 +0000
@@ -33,7 +33,7 @@
#include <vector>
#include "Controller/Controller.h"
@@ -219,21 +220,21 @@
#include "../LuaScripting.h"
#include "../LuaClassRegistration.h"
#include "LuaTuvokTypes.h"
-Index: imagevis3d-2.1.1/CmdLineConverter/CmdLineConverter.pro
+Index: imagevis3d-3.0.0/CmdLineConverter/CmdLineConverter.pro
===================================================================
---- imagevis3d-2.1.1.orig/CmdLineConverter/CmdLineConverter.pro 2012-08-23 16:16:53.450733937 +0200
-+++ imagevis3d-2.1.1/CmdLineConverter/CmdLineConverter.pro 2012-09-20 16:06:31.503428670 +0200
-@@ -14,20 +14,20 @@
- INCLUDEPATH += $$incpath
+--- imagevis3d-3.0.0.orig/CmdLineConverter/CmdLineConverter.pro 2012-10-28 09:02:28.165519502 +0000
++++ imagevis3d-3.0.0/CmdLineConverter/CmdLineConverter.pro 2012-10-28 09:02:57.365519676 +0000
+@@ -15,6 +15,7 @@
QMAKE_LIBDIR += ../Tuvok/Build ../Tuvok/IO/expressions
LIBS = -lTuvok -ltuvokexpr
--unix:LIBS += -lz
-+unix:LIBS += -lz -llua5.2 -lGLEW -ljpeg -ltiff -lbz2
+ unix:LIBS += -lz
++unix:LIBS += -llua5.2 -lGLEW -ljpeg -ltiff -lbz2
win3:LIBS += shlwapi.lib
unix:!macx:LIBS += -lGLU
macx:QMAKE_CXXFLAGS += -stdlib=libc++ -mmacosx-version-min=10.7
- macx:QMAKE_CFLAGS += -mmacosx-version-min=10.7
+@@ -22,13 +23,13 @@
macx:LIBS += -stdlib=libc++ -framework CoreFoundation -mmacosx-version-min=10.7
+ QMAKE_CXXFLAGS_WARN_ON += -Wno-unknown-pragmas
# Try to link to GLU statically.
-gludirs = /usr/lib /usr/lib/x86_64-linux-gnu
-for(d, gludirs) {
@@ -252,10 +253,10 @@
# Find the location of QtGui's prl file, and include it here so we can look at
# the QMAKE_PRL_CONFIG variable.
-Index: imagevis3d-2.1.1/Tuvok/test/context/context.pro
+Index: imagevis3d-3.0.0/Tuvok/test/context/context.pro
===================================================================
---- imagevis3d-2.1.1.orig/Tuvok/test/context/context.pro 2012-08-23 16:16:53.430733936 +0200
-+++ imagevis3d-2.1.1/Tuvok/test/context/context.pro 2012-09-20 16:02:16.495437877 +0200
+--- imagevis3d-3.0.0.orig/Tuvok/test/context/context.pro 2012-10-28 09:02:28.165519502 +0000
++++ imagevis3d-3.0.0/Tuvok/test/context/context.pro 2012-10-28 09:02:29.809519512 +0000
@@ -12,17 +12,17 @@
macx:QMAKE_LIBDIR+= /usr/X11R6/lib
QMAKE_LIBDIR += ../../Build ../../IO/expressions
@@ -282,18 +283,18 @@
unix:QMAKE_CXXFLAGS += -std=c++0x
unix:QMAKE_CXXFLAGS += -fno-strict-aliasing -g
unix:QMAKE_CFLAGS += -fno-strict-aliasing -g
-Index: imagevis3d-2.1.1/UVFReader/UVFReader.pro
+Index: imagevis3d-3.0.0/UVFReader/UVFReader.pro
===================================================================
---- imagevis3d-2.1.1.orig/UVFReader/UVFReader.pro 2012-08-23 16:16:53.462733934 +0200
-+++ imagevis3d-2.1.1/UVFReader/UVFReader.pro 2012-09-20 16:07:51.007425802 +0200
-@@ -11,17 +11,17 @@
- INCLUDEPATH += ../Tuvok ../Tuvok/Basics/3rdParty ../Tuvok/Basics
+--- imagevis3d-3.0.0.orig/UVFReader/UVFReader.pro 2012-10-28 09:02:28.165519502 +0000
++++ imagevis3d-3.0.0/UVFReader/UVFReader.pro 2012-10-28 09:04:45.505520318 +0000
+@@ -12,17 +12,18 @@
QMAKE_LIBDIR += ../Tuvok/Build ../Tuvok/IO/expressions
LIBS = -lTuvok -ltuvokexpr
--unix:LIBS += -lz
-+unix:LIBS += -lz -llua5.2 -lGLEW -ljpeg -ltiff -lbz2
+ unix:LIBS += -lz
++unix:LIBS += -llua5.2 -lGLEW -ljpeg -ltiff -lbz2
win32:LIBS += shlwapi.lib
unix:!macx:LIBS += -lGLU
+ QMAKE_CXXFLAGS_WARN_ON += -Wno-unknown-pragmas
# Try to link to GLU statically.
-gludirs = /usr/lib /usr/lib/x86_64-linux-gnu
-for(d, gludirs) {
Modified: trunk/packages/imagevis3d/trunk/debian/patches/systemzlib.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/systemzlib.patch 2012-10-27 21:50:41 UTC (rev 12484)
+++ trunk/packages/imagevis3d/trunk/debian/patches/systemzlib.patch 2012-10-28 09:08:15 UTC (rev 12485)
@@ -2,11 +2,11 @@
Forwarded: not-needed
Author: Mathieu Malaterre <malat at debian.org>
-Index: imagevis3d-2.1.0/Tuvok/IO/IASSConverter.cpp
+Index: imagevis3d-3.0.0/Tuvok/IO/IASSConverter.cpp
===================================================================
---- imagevis3d-2.1.0.orig/Tuvok/IO/IASSConverter.cpp 2012-07-04 09:29:40.000000000 +0200
-+++ imagevis3d-2.1.0/Tuvok/IO/IASSConverter.cpp 2012-07-04 09:30:27.694631794 +0200
-@@ -37,7 +37,7 @@
+--- imagevis3d-3.0.0.orig/Tuvok/IO/IASSConverter.cpp 2012-10-24 20:18:35.000000000 +0200
++++ imagevis3d-3.0.0/Tuvok/IO/IASSConverter.cpp 2012-10-28 09:40:30.833511681 +0100
+@@ -38,7 +38,7 @@
#include <fstream>
#include <sstream>
#ifndef TUVOK_NO_ZLIB
@@ -15,10 +15,10 @@
#endif
#include "IASSConverter.h"
#include "Basics/EndianConvert.h"
-Index: imagevis3d-2.1.0/Tuvok/IO/gzio.h
+Index: imagevis3d-3.0.0/Tuvok/IO/gzio.h
===================================================================
---- imagevis3d-2.1.0.orig/Tuvok/IO/gzio.h 2012-07-04 09:29:40.000000000 +0200
-+++ imagevis3d-2.1.0/Tuvok/IO/gzio.h 2012-07-04 09:30:27.694631794 +0200
+--- imagevis3d-3.0.0.orig/Tuvok/IO/gzio.h 2012-10-24 20:18:35.000000000 +0200
++++ imagevis3d-3.0.0/Tuvok/IO/gzio.h 2012-10-28 09:40:30.833511681 +0100
@@ -31,7 +31,7 @@
#define IV3D_GZIO_H
More information about the debian-med-commit
mailing list