[med-svn] r17050 - trunk/packages/imagevis3d/trunk/debian/patches

[Mathieu Malaterre]

Author: malat
Date: 2014-06-06 12:27:57 +0000 (Fri, 06 Jun 2014)
New Revision: 17050

Added:
   trunk/packages/imagevis3d/trunk/debian/patches/thirdparty.patch
Modified:
   trunk/packages/imagevis3d/trunk/debian/patches/series
Log:
make sure to now use 3rd party

Modified: trunk/packages/imagevis3d/trunk/debian/patches/series
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/series	2014-06-06 12:14:47 UTC (rev 17049)
+++ trunk/packages/imagevis3d/trunk/debian/patches/series	2014-06-06 12:27:57 UTC (rev 17050)
@@ -10,3 +10,4 @@
 #linkjpeg.patch
 typos.patch
 fopenmp.patch
+thirdparty.patch

Added: trunk/packages/imagevis3d/trunk/debian/patches/thirdparty.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/thirdparty.patch	                        (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/thirdparty.patch	2014-06-06 12:27:57 UTC (rev 17050)
@@ -0,0 +1,76 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ imagevis3d (3.1.0-1) unstable; urgency=low
+ .
+   * New upstream
+   * Update debian patches (lua mostly)
+   * Add new deps (lz4 + lzma)
+Author: Mathieu Malaterre <malat at debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- imagevis3d-3.1.0.orig/ImageVis3D/UI/RenderWindowDX.cpp
++++ imagevis3d-3.1.0/ImageVis3D/UI/RenderWindowDX.cpp
+@@ -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
+ /// GLEW before GL includes.
+-#include "3rdParty/GLEW/GL/glew.h"
++#include <GL/glew.h>
+ 
+ #include "RenderWindowDX.h"
+ #include "ImageVis3D.h"
+--- imagevis3d-3.1.0.orig/StandaloneTuvok/GLContext.cpp
++++ imagevis3d-3.1.0/StandaloneTuvok/GLContext.cpp
+@@ -1,10 +1,10 @@
+ #include "GLContext.h"
+-#include "3rdParty/GLEW/GL/glew.h"
++#include <GL/glew.h>
+ 
+ #ifdef DETECTED_OS_WINDOWS
+-#include "3rdParty/GLEW/GL/wglew.h"
++#include <GL/wglew.h>
+ #else
+-#include "3rdParty/GLEW/GL/glxew.h"
++#include <GL/glxew.h>
+ #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
+@@ -6,7 +6,7 @@
+ #include "BzlibCompression.h"
+ 
+ extern "C" {
+-#include "IO/3rdParty/bzip2/bzlib.h"
++#include <bzlib.h>
+ }
+ 
+ namespace {
+--- imagevis3d-3.1.0.orig/Tuvok/Renderer/GL/GLInclude.h
++++ imagevis3d-3.1.0/Tuvok/Renderer/GL/GLInclude.h
+@@ -44,7 +44,7 @@
+ 
+ #ifdef WIN32
+   #define NOMINMAX
+-  #include "3rdParty/GLEW/GL/wglew.h"
++  #include <GL/wglew.h>
+   #include <windows.h>
+   // undef stupid windows defines to max and min
+   #ifdef max