[med-svn] r12486 - in trunk/packages/imagevis3d/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat
Date: 2012-10-28 09:32:20 +0000 (Sun, 28 Oct 2012)
New Revision: 12486

Removed:
   trunk/packages/imagevis3d/trunk/debian/get-orig-source
Modified:
   trunk/packages/imagevis3d/trunk/debian/patches/systemlua.patch
Log:
Fix build issue

Deleted: trunk/packages/imagevis3d/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/get-orig-source	2012-10-28 09:08:15 UTC (rev 12485)
+++ trunk/packages/imagevis3d/trunk/debian/get-orig-source	2012-10-28 09:32:20 UTC (rev 12486)
@@ -1,53 +0,0 @@
-#!/bin/sh
-set -ex
-
-PACKAGE=imagevis3d
-
-VERSION=`dpkg-parsechangelog | sed -n -e 's/^Version: \(.*\)-[^-]*$/\1/p'`
-
-REVISION=`echo $VERSION | sed -e 's/^.*svn//g'`
-FOLDER=${PACKAGE}-${VERSION}
-
-TARFILE=${PACKAGE}_${VERSION}.orig.tar.gz
-
-# Do the svn:externals checkout ourself:
-# https://gforge.sci.utah.edu/svn/imagevis3d
-# https://code.sci.utah.edu/svn/Tuvok
-# https://gforge.sci.utah.edu/svn/basics
-# https://gforge.sci.utah.edu/svn/scio
-
-IMAGEVIS3D_REVISION=1672
-TUVOK_REVISION=1879
-BASICS_REVISION=153
-SCIO_REVISION=1623
-
-# put orig.tar in ../tarballs (-> default location for svn-buildpackage)
-mkdir -p ../tarballs
-cd ../tarballs
-
-svn checkout --quiet https://gforge.sci.utah.edu/svn/imagevis3d ${FOLDER}
-# fixup:
-#svn up -qr ${IMAGEVIS3D_REVISION} ${FOLDER}
-#svn up -qr ${TUVOK_REVISION}      ${FOLDER}/Tuvok
-#svn up -qr ${BASICS_REVISION}     ${FOLDER}/Tuvok/Basics
-#svn up -qr ${SCIO_REVISION}       ${FOLDER}/Tuvok/IO  
-#find ${FOLDER} -name .svn -exec rm -rf {} \;
-
-# convenients copies of:
-# boost/  bzip2/  cxxtest/  jpeglib/  tiff/  zlib/
-rm -rf ${FOLDER}/Tuvok/IO/3rdParty
-# tclap
-rm -rf ${FOLDER}/Tuvok/Basics/3rdParty
-# zlib again ?
-rm -rf ${FOLDER}/StandaloneTuvok/3rdParty
-# glew
-rm -rf ${FOLDER}/Tuvok/3rdParty
-
-# debian stuff:
-rm -rf ${FOLDER}/notdebian
-
-# remove test data, just in case:
-rm -rf ${FOLDER}/DemoData
-
-GZIP="--best --no-name" tar --exclude-vcs -czf ${TARFILE} ${FOLDER}
-rm -rf ${FOLDER}

Modified: trunk/packages/imagevis3d/trunk/debian/patches/systemlua.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/systemlua.patch	2012-10-28 09:08:15 UTC (rev 12485)
+++ trunk/packages/imagevis3d/trunk/debian/patches/systemlua.patch	2012-10-28 09:32:20 UTC (rev 12486)
@@ -313,3 +313,29 @@
  unix:QMAKE_CXXFLAGS += -std=c++0x
  unix:QMAKE_CXXFLAGS += -fno-strict-aliasing
  unix:QMAKE_CFLAGS += -fno-strict-aliasing
+Index: imagevis3d-3.0.0/Tuvok/LuaScripting/TuvokSpecific/LuaTransferFun2DProxy.cpp
+===================================================================
+--- imagevis3d-3.0.0.orig/Tuvok/LuaScripting/TuvokSpecific/LuaTransferFun2DProxy.cpp	2012-10-24 18:18:28.000000000 +0000
++++ imagevis3d-3.0.0/Tuvok/LuaScripting/TuvokSpecific/LuaTransferFun2DProxy.cpp	2012-10-28 09:25:46.669527806 +0000
+@@ -32,7 +32,7 @@
+ 
+ #include <vector>
+ #include "Controller/Controller.h"
+-#include "3rdParty/LUA/lua.hpp"
++#include <lua.hpp>
+ #include "../LuaScripting.h"
+ #include "../LuaClassRegistration.h"
+ #include "LuaTuvokTypes.h"
+Index: imagevis3d-3.0.0/Tuvok/LuaScripting/TuvokSpecific/LuaIOManagerProxy.cpp
+===================================================================
+--- imagevis3d-3.0.0.orig/Tuvok/LuaScripting/TuvokSpecific/LuaIOManagerProxy.cpp	2012-10-24 18:18:28.000000000 +0000
++++ imagevis3d-3.0.0/Tuvok/LuaScripting/TuvokSpecific/LuaIOManagerProxy.cpp	2012-10-28 09:26:19.933528003 +0000
+@@ -31,7 +31,7 @@
+   */
+ 
+ #include "Controller/Controller.h"
+-#include "3rdParty/LUA/lua.hpp"
++#include <lua.hpp>
+ #include "IO/IOManager.h"
+ #include "IO/FileBackedDataset.h"
+ #include "IO/uvfDataset.h"