[med-svn] r12244 - in trunk/packages/imagevis3d/trunk/debian: . patches
Mathieu Malaterre
malat at alioth.debian.org
Thu Sep 20 14:13:06 UTC 2012
Author: malat
Date: 2012-09-20 14:13:06 +0000 (Thu, 20 Sep 2012)
New Revision: 12244
Added:
trunk/packages/imagevis3d/trunk/debian/patches/fixcomp.patch
trunk/packages/imagevis3d/trunk/debian/watch
Modified:
trunk/packages/imagevis3d/trunk/debian/changelog
trunk/packages/imagevis3d/trunk/debian/patches/convenientlibs.patch
trunk/packages/imagevis3d/trunk/debian/patches/series
trunk/packages/imagevis3d/trunk/debian/patches/systembzip2.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/rules
Log:
Prepare imagevis3d
Modified: trunk/packages/imagevis3d/trunk/debian/changelog
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/changelog 2012-09-20 12:47:40 UTC (rev 12243)
+++ trunk/packages/imagevis3d/trunk/debian/changelog 2012-09-20 14:13:06 UTC (rev 12244)
@@ -1,8 +1,17 @@
-imagevis3d (2.1.0-1) UNRELEASED; urgency=low
+imagevis3d (2.1.1-1) unstable; urgency=low
- * New upstream: 2.1.0
+ * New upstream: 2.1.1
+ - Added support for GeomView files.
+ Remove patches, applied upstream:
+ - missingsharedlibs.patch
+ - tuvok_details.patch
+ - maxpath.patch
+ - overflow.patch
+ - warning.patch
+ - manual.patch
+ - gcc47.patch
- -- Mathieu Malaterre <malat at debian.org> Wed, 04 Jul 2012 09:28:15 +0200
+ -- Mathieu Malaterre <malat at debian.org> Thu, 20 Sep 2012 16:08:41 +0200
imagevis3d (2.0.1-5) unstable; urgency=low
Modified: trunk/packages/imagevis3d/trunk/debian/patches/convenientlibs.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/convenientlibs.patch 2012-09-20 12:47:40 UTC (rev 12243)
+++ trunk/packages/imagevis3d/trunk/debian/patches/convenientlibs.patch 2012-09-20 14:13:06 UTC (rev 12244)
@@ -2,11 +2,11 @@
Forwarded: not-needed
Author: Mathieu Malaterre <malat at debian.org>
-Index: imagevis3d-2.1.0/Tuvok/tvk.pro
+Index: imagevis3d-2.1.1/Tuvok/tvk.pro
===================================================================
---- imagevis3d-2.1.0.orig/Tuvok/tvk.pro 2012-07-04 07:42:27.418644772 +0000
-+++ imagevis3d-2.1.0/Tuvok/tvk.pro 2012-07-04 07:42:58.570645334 +0000
-@@ -58,33 +58,6 @@
+--- 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
+@@ -60,33 +60,6 @@
# Input
HEADERS += \
@@ -40,7 +40,7 @@
Basics/Appendix.h \
Basics/ArcBall.h \
Basics/Checksums/crc32.h \
-@@ -112,34 +85,6 @@
+@@ -114,34 +87,6 @@
DebugOut/ConsoleOut.h \
DebugOut/MultiplexOut.h \
DebugOut/TextfileOut.h \
@@ -75,7 +75,7 @@
IO/AbstrConverter.h \
IO/AmiraConverter.h \
IO/AnalyzeConverter.h \
-@@ -270,39 +215,6 @@
+@@ -275,39 +220,6 @@
Basics/LargeFileMMap.h
SOURCES += \
@@ -115,7 +115,7 @@
Basics/Appendix.cpp \
Basics/ArcBall.cpp \
Basics/Checksums/MD5.cpp \
-@@ -324,114 +236,6 @@
+@@ -329,114 +241,6 @@
DebugOut/ConsoleOut.cpp \
DebugOut/MultiplexOut.cpp \
DebugOut/TextfileOut.cpp \
@@ -230,7 +230,7 @@
IO/AbstrConverter.cpp \
IO/AmiraConverter.cpp \
IO/AnalyzeConverter.cpp \
-@@ -540,7 +344,6 @@
+@@ -547,7 +351,6 @@
Basics/LargeFileAIO.cpp \
Basics/LargeFileFD.cpp \
Basics/LargeFileMMap.cpp \
@@ -238,7 +238,7 @@
win32 {
HEADERS += \
-@@ -557,7 +360,6 @@
+@@ -564,7 +367,6 @@
SOURCES += \
Basics/DynamicDX.cpp \
@@ -246,11 +246,11 @@
Renderer/DX/DXRaycaster.cpp \
Renderer/DX/DXRenderer.cpp \
Renderer/DX/DXSBVR.cpp \
-Index: imagevis3d-2.1.0/Tuvok/IO/scio.pro
+Index: imagevis3d-2.1.1/Tuvok/IO/scio.pro
===================================================================
---- imagevis3d-2.1.0.orig/Tuvok/IO/scio.pro 2012-07-04 07:42:27.418644772 +0000
-+++ imagevis3d-2.1.0/Tuvok/IO/scio.pro 2012-07-04 07:42:29.142644803 +0000
-@@ -31,113 +31,6 @@
+--- 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
+@@ -36,113 +36,6 @@
# Input
SOURCES += \
@@ -364,7 +364,7 @@
./AbstrConverter.cpp \
./AbstrGeoConverter.cpp \
./AnalyzeConverter.cpp \
-@@ -195,38 +88,6 @@
+@@ -200,38 +93,6 @@
./VGStudioConverter.cpp
HEADERS += \
Added: trunk/packages/imagevis3d/trunk/debian/patches/fixcomp.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/fixcomp.patch (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/fixcomp.patch 2012-09-20 14:13:06 UTC (rev 12244)
@@ -0,0 +1,31 @@
+Description: truncate() prototype was missing
+Author: Mathieu Malaterre <malat at debian.org>
+
+Index: imagevis3d-2.1.1/Tuvok/Basics/LargeFile.cpp
+===================================================================
+--- imagevis3d-2.1.1.orig/Tuvok/Basics/LargeFile.cpp 2012-07-30 21:30:34.000000000 +0000
++++ imagevis3d-2.1.1/Tuvok/Basics/LargeFile.cpp 2012-09-20 13:08:07.503555158 +0000
+@@ -38,6 +38,9 @@
+ # include <unistd.h>
+ #endif
+
++#include <unistd.h>
++#include <sys/types.h>
++
+ #ifndef NDEBUG
+ # include <iostream>
+ # define DEBUG(...) do { std::cerr << __VA_ARGS__ << "\n"; } while(0)
+Index: imagevis3d-2.1.1/Tuvok/Basics/LargeFileC.cpp
+===================================================================
+--- imagevis3d-2.1.1.orig/Tuvok/Basics/LargeFileC.cpp 2012-07-30 21:30:34.000000000 +0000
++++ imagevis3d-2.1.1/Tuvok/Basics/LargeFileC.cpp 2012-09-20 13:09:17.839552619 +0000
+@@ -46,6 +46,9 @@
+ #ifdef DETECTED_OS_APPLE
+ # include <unistd.h>
+ #endif
++#include <unistd.h>
++#include <sys/types.h>
++
+ #include "LargeFileC.h"
+
+ LargeFileC::LargeFileC(const std::string fn,
Modified: trunk/packages/imagevis3d/trunk/debian/patches/series
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/series 2012-09-20 12:47:40 UTC (rev 12243)
+++ trunk/packages/imagevis3d/trunk/debian/patches/series 2012-09-20 14:13:06 UTC (rev 12244)
@@ -5,4 +5,5 @@
systembzip2.patch
systemtiff.patch
kfreebsd.patch
+fixcomp.patch
systemlua.patch
Modified: trunk/packages/imagevis3d/trunk/debian/patches/systembzip2.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/systembzip2.patch 2012-09-20 12:47:40 UTC (rev 12243)
+++ trunk/packages/imagevis3d/trunk/debian/patches/systembzip2.patch 2012-09-20 14:13:06 UTC (rev 12244)
@@ -2,11 +2,11 @@
Forwarded: not-needed
Author: Mathieu Malaterre <malat at debian.org>
-Index: imagevis3d-2.1.0/Tuvok/IO/RAWConverter.cpp
+Index: imagevis3d-2.1.1/Tuvok/IO/RAWConverter.cpp
===================================================================
---- imagevis3d-2.1.0.orig/Tuvok/IO/RAWConverter.cpp 2012-07-04 07:30:43.126632073 +0000
-+++ imagevis3d-2.1.0/Tuvok/IO/RAWConverter.cpp 2012-07-04 07:44:46.226647275 +0000
-@@ -38,7 +38,7 @@
+--- imagevis3d-2.1.1.orig/Tuvok/IO/RAWConverter.cpp 2012-08-08 22:49:43.000000000 +0200
++++ imagevis3d-2.1.1/Tuvok/IO/RAWConverter.cpp 2012-08-23 16:16:35.114734600 +0200
+@@ -39,7 +39,7 @@
#include <cstring>
#include <iterator>
#include <list>
Modified: trunk/packages/imagevis3d/trunk/debian/patches/systemglew.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/systemglew.patch 2012-09-20 12:47:40 UTC (rev 12243)
+++ trunk/packages/imagevis3d/trunk/debian/patches/systemglew.patch 2012-09-20 14:13:06 UTC (rev 12244)
@@ -2,10 +2,10 @@
Forwarded: not-needed
Author: Mathieu Malaterre <malat at debian.org>
-Index: imagevis3d-2.1.0/Tuvok/Renderer/GPUMemMan/GPUMemMan.h
+Index: imagevis3d-2.1.1/Tuvok/Renderer/GPUMemMan/GPUMemMan.h
===================================================================
---- imagevis3d-2.1.0.orig/Tuvok/Renderer/GPUMemMan/GPUMemMan.h 2012-07-04 09:29:07.000000000 +0200
-+++ imagevis3d-2.1.0/Tuvok/Renderer/GPUMemMan/GPUMemMan.h 2012-07-04 09:30:25.162631749 +0200
+--- 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
@@ -33,7 +33,7 @@
#include <deque>
#include <utility>
@@ -15,12 +15,12 @@
#include "Basics/Vectors.h"
#include "GPUMemManDataStructs.h"
-Index: imagevis3d-2.1.0/Tuvok/Renderer/GPUMemMan/GPUMemManDataStructs.h
+Index: imagevis3d-2.1.1/Tuvok/Renderer/GPUMemMan/GPUMemManDataStructs.h
===================================================================
---- imagevis3d-2.1.0.orig/Tuvok/Renderer/GPUMemMan/GPUMemManDataStructs.h 2012-07-04 09:29:07.000000000 +0200
-+++ imagevis3d-2.1.0/Tuvok/Renderer/GPUMemMan/GPUMemManDataStructs.h 2012-07-04 09:30:25.162631749 +0200
-@@ -49,7 +49,7 @@
- #include <deque>
+--- 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
+@@ -44,7 +44,7 @@
+ #include <memory>
#include <string>
#include <vector>
-#include "3rdParty/GLEW/GL/glew.h"
@@ -28,10 +28,10 @@
#include "boost/noncopyable.hpp"
#include "Basics/Vectors.h"
#include "IO/Brick.h"
-Index: imagevis3d-2.1.0/ImageVis3D/UI/RenderWindowGL.cpp
+Index: imagevis3d-2.1.1/ImageVis3D/UI/RenderWindowGL.cpp
===================================================================
---- imagevis3d-2.1.0.orig/ImageVis3D/UI/RenderWindowGL.cpp 2012-07-04 09:28:48.000000000 +0200
-+++ imagevis3d-2.1.0/ImageVis3D/UI/RenderWindowGL.cpp 2012-07-04 09:30:25.162631749 +0200
+--- 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 @@
#include "../Tuvok/StdTuvokDefines.h"
@@ -41,10 +41,10 @@
#if defined(__GNUC__) && defined(DETECTED_OS_LINUX)
# pragma GCC visibility push(default)
#endif
-Index: imagevis3d-2.1.0/Tuvok/Renderer/GL/GLInclude.h
+Index: imagevis3d-2.1.1/Tuvok/Renderer/GL/GLInclude.h
===================================================================
---- imagevis3d-2.1.0.orig/Tuvok/Renderer/GL/GLInclude.h 2012-07-04 09:29:08.000000000 +0200
-+++ imagevis3d-2.1.0/Tuvok/Renderer/GL/GLInclude.h 2012-07-04 09:30:25.162631749 +0200
+--- 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
@@ -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-09-20 12:47:40 UTC (rev 12243)
+++ trunk/packages/imagevis3d/trunk/debian/patches/systemjpeg.patch 2012-09-20 14:13:06 UTC (rev 12244)
@@ -2,10 +2,10 @@
Forwarded: not-needed
Author: Mathieu Malaterre <malat at debian.org>
-Index: imagevis3d-2.1.0/Tuvok/IO/TuvokJPEG.cpp
+Index: imagevis3d-2.1.1/Tuvok/IO/TuvokJPEG.cpp
===================================================================
---- imagevis3d-2.1.0.orig/Tuvok/IO/TuvokJPEG.cpp 2012-07-04 07:40:59.034643178 +0000
-+++ imagevis3d-2.1.0/Tuvok/IO/TuvokJPEG.cpp 2012-07-04 07:41:15.158643469 +0000
+--- 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
@@ -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.0/ImageVis3D/UI/QDataRadioButton.cpp
+Index: imagevis3d-2.1.1/ImageVis3D/UI/QDataRadioButton.cpp
===================================================================
---- imagevis3d-2.1.0.orig/ImageVis3D/UI/QDataRadioButton.cpp 2012-07-04 07:40:59.034643178 +0000
-+++ imagevis3d-2.1.0/ImageVis3D/UI/QDataRadioButton.cpp 2012-07-04 07:41:15.158643469 +0000
+--- 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
@@ -39,7 +39,7 @@
#include <QtGui/QMouseEvent>
#include "../Tuvok/IO/TuvokJPEG.h"
@@ -35,7 +35,7 @@
-#include "../Tuvok/IO/3rdParty/jpeglib/jconfig.h"
+#include "jconfig.h"
- QDataRadioButton::QDataRadioButton(std::tr1::shared_ptr<FileStackInfo> stack,
+ QDataRadioButton::QDataRadioButton(std::shared_ptr<FileStackInfo> stack,
QWidget *parent) :
@@ -103,7 +103,7 @@
(m_stackInfo->m_Elements[i])->GetOffsetToData());
@@ -46,10 +46,10 @@
vData.resize(jpg.size());
std::copy(jpg_data, jpg_data + jpg.size(), &vData[0]);
} else {
-Index: imagevis3d-2.1.0/Tuvok/IO/IOManager.cpp
+Index: imagevis3d-2.1.1/Tuvok/IO/IOManager.cpp
===================================================================
---- imagevis3d-2.1.0.orig/Tuvok/IO/IOManager.cpp 2012-07-04 07:40:59.034643178 +0000
-+++ imagevis3d-2.1.0/Tuvok/IO/IOManager.cpp 2012-07-04 07:41:41.378643941 +0000
+--- 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
@@ -44,7 +44,7 @@
#include <sstream>
#include <map>
@@ -59,7 +59,7 @@
#include "IOManager.h"
-@@ -349,7 +349,7 @@
+@@ -351,7 +351,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-09-20 12:47:40 UTC (rev 12243)
+++ trunk/packages/imagevis3d/trunk/debian/patches/systemlua.patch 2012-09-20 14:13:06 UTC (rev 12244)
@@ -2,40 +2,23 @@
Forwarded: not-needed
Author: Mathieu Malaterre <malat at debian.org>
-Index: imagevis3d-2.1.0/Tuvok/LuaScripting/LuaScripting.h
+Index: imagevis3d-2.1.1/Tuvok/LuaScripting/LuaScripting.h
===================================================================
---- imagevis3d-2.1.0.orig/Tuvok/LuaScripting/LuaScripting.h 2012-07-04 07:52:49.778655994 +0000
-+++ imagevis3d-2.1.0/Tuvok/LuaScripting/LuaScripting.h 2012-07-04 07:54:15.278657536 +0000
-@@ -43,7 +43,7 @@
+--- 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
+@@ -46,7 +46,7 @@
#ifndef LUASCRIPTING_NO_TUVOK
-#include "3rdParty/LUA/lua.hpp"
+#include "lua.hpp"
- #ifdef _MSC_VER
- #include <functional>
-Index: imagevis3d-2.1.0/Tuvok/tvk.pro
+ #else
+
+Index: imagevis3d-2.1.1/Tuvok/LuaScripting/TuvokSpecific/LuaTuvokTypes.h
===================================================================
---- imagevis3d-2.1.0.orig/Tuvok/tvk.pro 2012-07-04 07:54:15.214657534 +0000
-+++ imagevis3d-2.1.0/Tuvok/tvk.pro 2012-07-04 07:54:15.278657536 +0000
-@@ -14,10 +14,12 @@
- DEPENDPATH += . Basics Controller DebugOut IO Renderer Scripting
- INCLUDEPATH += . 3rdParty/GLEW IO/3rdParty/boost IO/3rdParty/zlib
- INCLUDEPATH += Basics IO/exception
-+INCLUDEPATH += /usr/include/lua5.2/
- QT += opengl
- LIBPATH += IO/expressions
- LIBS = -ltuvokexpr
- unix:LIBS += -lz
-+unix:LIBS += -llua5.2.so
- macx:LIBS += -framework CoreFoundation
- win32:LIBS += shlwapi.lib
- unix:QMAKE_CXXFLAGS += -fno-strict-aliasing
-Index: imagevis3d-2.1.0/Tuvok/LuaScripting/TuvokSpecific/LuaTuvokTypes.h
-===================================================================
---- imagevis3d-2.1.0.orig/Tuvok/LuaScripting/TuvokSpecific/LuaTuvokTypes.h 2012-07-04 07:52:49.778655994 +0000
-+++ imagevis3d-2.1.0/Tuvok/LuaScripting/TuvokSpecific/LuaTuvokTypes.h 2012-07-04 07:54:15.278657536 +0000
+--- 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
@@ -35,7 +35,7 @@
#ifndef TUVOK_LUATUVOKSPECIFICTYPES_H_
#define TUVOK_LUATUVOKSPECIFICTYPES_H_
@@ -45,10 +28,10 @@
// LuaFunBinding must always come before our implementation, because we depend
// on the templates it has built.
-Index: imagevis3d-2.1.0/Tuvok/LuaScripting/TuvokSpecific/LuaDatasetProxy.cpp
+Index: imagevis3d-2.1.1/Tuvok/LuaScripting/TuvokSpecific/LuaDatasetProxy.cpp
===================================================================
---- imagevis3d-2.1.0.orig/Tuvok/LuaScripting/TuvokSpecific/LuaDatasetProxy.cpp 2012-07-04 07:52:49.778655994 +0000
-+++ imagevis3d-2.1.0/Tuvok/LuaScripting/TuvokSpecific/LuaDatasetProxy.cpp 2012-07-04 07:54:15.278657536 +0000
+--- 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
@@ -31,7 +31,7 @@
*/
@@ -57,11 +40,11 @@
+#include "lua.hpp"
#include "IO/IOManager.h"
#include "IO/FileBackedDataset.h"
-
-Index: imagevis3d-2.1.0/Tuvok/Renderer/RenderRegion.cpp
+ #include "IO/uvfDataset.h"
+Index: imagevis3d-2.1.1/Tuvok/Renderer/RenderRegion.cpp
===================================================================
---- imagevis3d-2.1.0.orig/Tuvok/Renderer/RenderRegion.cpp 2012-07-04 07:52:49.778655994 +0000
-+++ imagevis3d-2.1.0/Tuvok/Renderer/RenderRegion.cpp 2012-07-04 07:54:15.278657536 +0000
+--- 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
@@ -27,7 +27,7 @@
*/
@@ -71,29 +54,11 @@
// Standard
#include "../Basics/Vectors.h"
-Index: imagevis3d-2.1.0/Tuvok/test/render/render.pro
+Index: imagevis3d-2.1.1/ImageVis3D/ImageVis3D.pro
===================================================================
---- imagevis3d-2.1.0.orig/Tuvok/test/render/render.pro 2012-07-04 07:52:49.778655994 +0000
-+++ imagevis3d-2.1.0/Tuvok/test/render/render.pro 2012-07-04 07:59:16.358662963 +0000
-@@ -9,11 +9,13 @@
- DEPENDPATH = $$p
- INCLUDEPATH = $$p
- macx:INCLUDEPATH += /usr/X11R6/include
-+unix:INCLUDEPATH += /usr/include/lua5.2
- macx:QMAKE_LIBDIR+= /usr/X11R6/lib
- QMAKE_LIBDIR += ../../Build ../../IO/expressions
- QT += opengl
- LIBS += -lTuvok -ltuvokexpr -lz
- unix:LIBS += -lGL -lX11
-+unix:LIBS += -llua5.2 -lGLEW -lbz2 -ltiff
- macx:LIBS += -framework CoreFoundation
- unix:!macx:LIBS += -lGLU
- # Try to link to GLU statically.
-Index: imagevis3d-2.1.0/ImageVis3D/ImageVis3D.pro
-===================================================================
---- imagevis3d-2.1.0.orig/ImageVis3D/ImageVis3D.pro 2012-07-04 07:30:55.574632297 +0000
-+++ imagevis3d-2.1.0/ImageVis3D/ImageVis3D.pro 2012-07-04 08:05:09.834669338 +0000
-@@ -16,6 +16,7 @@
+--- 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
incpath += DebugOut UI UI/AutoGen
incpath += ../Tuvok/IO/3rdParty/boost ../Tuvok/3rdParty/GLEW
@@ -101,19 +66,39 @@
DEPENDPATH += $$incpath
INCLUDEPATH += $$incpath
#INCLUDEPATH += . ../Tuvok/IO/3rdParty/boost ../Tuvok/3rdParty/GLEW ../Tuvok
-@@ -23,6 +24,7 @@
- LIBPATH += ../Tuvok/Build ../Tuvok/IO/expressions
+ QT += opengl network
+ QMAKE_LIBDIR += ../Tuvok/Build ../Tuvok/IO/expressions
LIBS = -lTuvok -ltuvokexpr
- unix:LIBS += -lz
-+unix:LIBS += -llua5.2 -lGLEW -ltiff -lbz2
- macx:LIBS +=-framework CoreFoundation
+-unix:LIBS += -lz
++unix:LIBS += -lz -llua5.2 -lGLEW -ljpeg -ltiff -lbz2
win32:LIBS += shlwapi.lib
unix:!macx:LIBS += -lGLU
-Index: imagevis3d-2.1.0/Tuvok/test/shaders/shaders.pro
+ macx:QMAKE_CXXFLAGS += -stdlib=libc++ -mmacosx-version-min=10.7
+ macx:QMAKE_CFLAGS += -mmacosx-version-min=10.7
+ macx:LIBS += -stdlib=libc++ -framework CoreFoundation -mmacosx-version-min=10.7
+ # Try to link to GLU statically.
+-gludirs = /usr/lib /usr/lib/x86_64-linux-gnu
+-for(d, gludirs) {
+- if(exists($${d}/libGLU.a) && static) {
+- LIBS -= -lGLU;
+- LIBS += $${d}/libGLU.a
+- }
+-}
++#gludirs = /usr/lib /usr/lib/x86_64-linux-gnu
++#for(d, gludirs) {
++# if(exists($${d}/libGLU.a) && static) {
++# LIBS -= -lGLU;
++# LIBS += $${d}/libGLU.a
++# }
++#}
+
+ # 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
===================================================================
---- imagevis3d-2.1.0.orig/Tuvok/test/shaders/shaders.pro 2012-07-04 07:29:05.000000000 +0000
-+++ imagevis3d-2.1.0/Tuvok/test/shaders/shaders.pro 2012-07-04 08:01:16.826665136 +0000
-@@ -6,6 +6,7 @@
+--- 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
+@@ -6,25 +6,26 @@
INCLUDEPATH += ../../ ../../IO/3rdParty/boost
INCLUDEPATH += ../../Basics/3rdParty
INCLUDEPATH += ../../3rdParty/GLEW
@@ -121,47 +106,209 @@
# for glX
macx:INCLUDEPATH += /usr/X11R6/include
macx:QMAKE_LIBDIR+= /usr/X11R6/lib
-@@ -13,6 +14,7 @@
+ QMAKE_LIBDIR += ../../Build ../../IO/expressions
QT += opengl
- LIBS += -lTuvok -ltuvokexpr -lz
+-LIBS += -lTuvok -ltuvokexpr -lz
++LIBS += -lTuvok -ltuvokexpr -lz -llua5.2 -ltiff -lbz2 -lGLEW
unix:LIBS += -lGL -lX11
-+unix:LIBS += -llua5.2 -lGLEW -ltiff -lbz2
- macx:LIBS += -lX11 -framework CoreFoundation
+ unix:QMAKE_CXXFLAGS += -std=c++0x
unix:QMAKE_CXXFLAGS += -fno-strict-aliasing -g
unix:QMAKE_CFLAGS += -fno-strict-aliasing -g
-Index: imagevis3d-2.1.0/Tuvok/test/context/context.pro
+ unix:!macx:LIBS += -lGLU
+ # Try to link to GLU statically.
+-gludirs = /usr/lib /usr/lib/x86_64-linux-gnu
+-for(d, gludirs) {
+- if(exists($${d}/libGLU.a) && static) {
+- LIBS -= -lGLU;
+- LIBS += $${d}/libGLU.a
+- }
+-}
++#gludirs = /usr/lib /usr/lib/x86_64-linux-gnu
++#for(d, gludirs) {
++# if(exists($${d}/libGLU.a) && static) {
++# LIBS -= -lGLU;
++# LIBS += $${d}/libGLU.a
++# }
++#}
+
+ 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
===================================================================
---- imagevis3d-2.1.0.orig/Tuvok/test/context/context.pro 2012-07-04 07:29:05.000000000 +0000
-+++ imagevis3d-2.1.0/Tuvok/test/context/context.pro 2012-07-04 08:02:26.182666387 +0000
-@@ -14,6 +14,7 @@
+--- 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
+@@ -14,10 +14,12 @@
+ DEPENDPATH += . Basics Controller DebugOut IO Renderer Scripting
+ INCLUDEPATH += . 3rdParty/GLEW IO/3rdParty/boost IO/3rdParty/zlib
+ INCLUDEPATH += Basics IO/exception
++INCLUDEPATH += /usr/include/lua5.2
QT += opengl
- LIBS += -lTuvok -ltuvokexpr -lz
- unix:LIBS += -lGL -lX11
-+unix:LIBS += -lGLEW -ltiff -lbz2 -llua5.2
- macx:LIBS += -framework CoreFoundation
+ QMAKE_LIBDIR += IO/expressions
+ LIBS = -ltuvokexpr
+ unix:LIBS += -lz
++unix:LIBS += -llua5.2
+ win32:LIBS += shlwapi.lib
+ unix:QMAKE_CXXFLAGS += -std=c++0x
+ unix:QMAKE_CXXFLAGS += -fno-strict-aliasing
+@@ -28,13 +30,13 @@
+ macx:QMAKE_CFLAGS += -mmacosx-version-min=10.7
+ macx:LIBS += -stdlib=libc++ -framework CoreFoundation -mmacosx-version-min=10.7
+ # Try to link to GLU statically.
+-gludirs = /usr/lib /usr/lib/x86_64-linux-gnu
+-for(d, gludirs) {
+- if(exists($${d}/libGLU.a) && static) {
+- LIBS -= -lGLU;
+- LIBS += $${d}/libGLU.a
+- }
+-}
++#gludirs = /usr/lib /usr/lib/x86_64-linux-gnu
++#for(d, gludirs) {
++# if(exists($${d}/libGLU.a) && static) {
++# LIBS -= -lGLU;
++# LIBS += $${d}/libGLU.a
++# }
++#}
+
+ # 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
+===================================================================
+--- 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
+@@ -9,20 +9,21 @@
+ DEPENDPATH = $$p
+ INCLUDEPATH = $$p
+ macx:INCLUDEPATH += /usr/X11R6/include
++unix:INCLUDEPATH += /usr/include/lua5.2
+ macx:QMAKE_LIBDIR+= /usr/X11R6/lib
+ QMAKE_LIBDIR += ../../Build ../../IO/expressions
+ QT += opengl
+-LIBS += -lTuvok -ltuvokexpr -lz
+-unix:LIBS += -lGL -lX11
++LIBS += -lTuvok -ltuvokexpr -lz -llua5.2 -lbz2 -lGLEW -ltiff
++unix:LIBS += -lGL -lX11 -llua5.2
unix:!macx:LIBS += -lGLU
# Try to link to GLU statically.
-Index: imagevis3d-2.1.0/CmdLineConverter/CmdLineConverter.pro
+-gludirs = /usr/lib /usr/lib/x86_64-linux-gnu
+-for(d, gludirs) {
+- if(exists($${d}/libGLU.a) && static) {
+- LIBS -= -lGLU;
+- LIBS += $${d}/libGLU.a
+- }
+-}
++#gludirs = /usr/lib /usr/lib/x86_64-linux-gnu
++#for(d, gludirs) {
++# if(exists($${d}/libGLU.a) && static) {
++# LIBS -= -lGLU;
++# LIBS += $${d}/libGLU.a
++# }
++#}
+ 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
===================================================================
---- imagevis3d-2.1.0.orig/CmdLineConverter/CmdLineConverter.pro 2012-07-04 07:30:55.586632297 +0000
-+++ imagevis3d-2.1.0/CmdLineConverter/CmdLineConverter.pro 2012-07-04 08:07:03.562671388 +0000
-@@ -19,6 +19,7 @@
+--- 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
+@@ -33,7 +33,7 @@
+ #include <vector>
+ #include "Controller/Controller.h"
+ #include "IO/TransferFunction1D.h"
+-#include "3rdParty/LUA/lua.hpp"
++#include "lua.hpp"
+ #include "../LuaScripting.h"
+ #include "../LuaClassRegistration.h"
+ #include "LuaTuvokTypes.h"
+Index: imagevis3d-2.1.1/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
QMAKE_LIBDIR += ../Tuvok/Build ../Tuvok/IO/expressions
LIBS = -lTuvok -ltuvokexpr
- unix:LIBS += -lz
-+unix:LIBS += -ltiff -lbz2 -llua5.2 -lGLEW
- macx:LIBS += -framework CoreFoundation
- win32:LIBS += shlwapi.lib
+-unix:LIBS += -lz
++unix:LIBS += -lz -llua5.2 -lGLEW -ljpeg -ltiff -lbz2
+ win3:LIBS += shlwapi.lib
unix:!macx:LIBS += -lGLU
-Index: imagevis3d-2.1.0/UVFReader/UVFReader.pro
+ macx:QMAKE_CXXFLAGS += -stdlib=libc++ -mmacosx-version-min=10.7
+ macx:QMAKE_CFLAGS += -mmacosx-version-min=10.7
+ macx:LIBS += -stdlib=libc++ -framework CoreFoundation -mmacosx-version-min=10.7
+ # Try to link to GLU statically.
+-gludirs = /usr/lib /usr/lib/x86_64-linux-gnu
+-for(d, gludirs) {
+- if(exists($${d}/libGLU.a) && static) {
+- LIBS -= -lGLU;
+- LIBS += $${d}/libGLU.a
+- }
+-}
++#gludirs = /usr/lib /usr/lib/x86_64-linux-gnu
++#for(d, gludirs) {
++# if(exists($${d}/libGLU.a) && static) {
++# LIBS -= -lGLU;
++# LIBS += $${d}/libGLU.a
++# }
++#}
+
+ # 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
===================================================================
---- imagevis3d-2.1.0.orig/UVFReader/UVFReader.pro 2012-07-04 07:30:55.598632297 +0000
-+++ imagevis3d-2.1.0/UVFReader/UVFReader.pro 2012-07-04 08:09:03.238673547 +0000
-@@ -16,6 +16,7 @@
+--- 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
+@@ -12,17 +12,17 @@
+ macx:QMAKE_LIBDIR+= /usr/X11R6/lib
+ QMAKE_LIBDIR += ../../Build ../../IO/expressions
+ QT += opengl
+-LIBS += -lTuvok -ltuvokexpr -lz
++LIBS += -lTuvok -ltuvokexpr -lz -llua5.2 -lGLEW -ltiff -lbz2
+ unix:LIBS += -lGL -lX11
+ unix:!macx:LIBS += -lGLU
+ # Try to link to GLU statically.
+-gludirs = /usr/lib /usr/lib/x86_64-linux-gnu
+-for(d, gludirs) {
+- if(exists($${d}/libGLU.a) && static) {
+- LIBS -= -lGLU;
+- LIBS += $${d}/libGLU.a
+- }
+-}
++#gludirs = /usr/lib /usr/lib/x86_64-linux-gnu
++#for(d, gludirs) {
++# if(exists($${d}/libGLU.a) && static) {
++# LIBS -= -lGLU;
++# LIBS += $${d}/libGLU.a
++# }
++#}
+ 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
+===================================================================
+--- 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
QMAKE_LIBDIR += ../Tuvok/Build ../Tuvok/IO/expressions
LIBS = -lTuvok -ltuvokexpr
- unix:LIBS += -lz
-+unix:LIBS += -ltiff -lbz2 -llua5.2 -lGLEW
- macx:LIBS += -framework CoreFoundation
+-unix:LIBS += -lz
++unix:LIBS += -lz -llua5.2 -lGLEW -ljpeg -ltiff -lbz2
win32:LIBS += shlwapi.lib
unix:!macx:LIBS += -lGLU
+ # Try to link to GLU statically.
+-gludirs = /usr/lib /usr/lib/x86_64-linux-gnu
+-for(d, gludirs) {
+- if(exists($${d}/libGLU.a) && static) {
+- LIBS -= -lGLU;
+- LIBS += $${d}/libGLU.a
+- }
+-}
++#gludirs = /usr/lib /usr/lib/x86_64-linux-gnu
++#for(d, gludirs) {
++# if(exists($${d}/libGLU.a) && static) {
++# LIBS -= -lGLU;
++# LIBS += $${d}/libGLU.a
++# }
++#}
+ unix:QMAKE_CXXFLAGS += -std=c++0x
+ unix:QMAKE_CXXFLAGS += -fno-strict-aliasing
+ unix:QMAKE_CFLAGS += -fno-strict-aliasing
Modified: trunk/packages/imagevis3d/trunk/debian/rules
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/rules 2012-09-20 12:47:40 UTC (rev 12243)
+++ trunk/packages/imagevis3d/trunk/debian/rules 2012-09-20 14:13:06 UTC (rev 12244)
@@ -24,4 +24,4 @@
dh_installman doc/uvfconvert.1
get-orig-source:
- ./debian/get-orig-source
+ uscan --verbose --force-download --rename
Added: trunk/packages/imagevis3d/trunk/debian/watch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/watch (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/watch 2012-09-20 14:13:06 UTC (rev 12244)
@@ -0,0 +1,3 @@
+version=3
+#http://www.sci.utah.edu/releases/imagevis3d_v([\d\.]+)/ImageVis3D-([\d\.]+)-src\.tar\.gz
+http://www.sci.utah.edu/download/imagevis3d.html .*/ImageVis3D-([\d\.]+)-src\.tar\.gz
More information about the debian-med-commit
mailing list