[med-svn] r10693 - trunk/packages/imagevis3d/trunk/debian/patches
Mathieu Malaterre
malat at alioth.debian.org
Fri May 4 13:58:20 UTC 2012
Author: malat
Date: 2012-05-04 13:58:20 +0000 (Fri, 04 May 2012)
New Revision: 10693
Added:
trunk/packages/imagevis3d/trunk/debian/patches/convenientlibs.patch
trunk/packages/imagevis3d/trunk/debian/patches/missingsharedlibs.patch
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/systemtiff.patch
trunk/packages/imagevis3d/trunk/debian/patches/systemzlib.patch
Removed:
trunk/packages/imagevis3d/trunk/debian/patches/bzip2.patch
trunk/packages/imagevis3d/trunk/debian/patches/bzip22.patch
trunk/packages/imagevis3d/trunk/debian/patches/glew.patch
trunk/packages/imagevis3d/trunk/debian/patches/jpeg.patch
trunk/packages/imagevis3d/trunk/debian/patches/jpeg2.patch
trunk/packages/imagevis3d/trunk/debian/patches/jpeg3.patch
trunk/packages/imagevis3d/trunk/debian/patches/libs3.patch
trunk/packages/imagevis3d/trunk/debian/patches/remove_convenientlibs.patch
trunk/packages/imagevis3d/trunk/debian/patches/tiff.patch
trunk/packages/imagevis3d/trunk/debian/patches/tiff4.patch
trunk/packages/imagevis3d/trunk/debian/patches/zlib.patch
Modified:
trunk/packages/imagevis3d/trunk/debian/patches/series
Log:
Patch cleanups
Deleted: trunk/packages/imagevis3d/trunk/debian/patches/bzip2.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/bzip2.patch 2012-05-04 13:56:44 UTC (rev 10692)
+++ trunk/packages/imagevis3d/trunk/debian/patches/bzip2.patch 2012-05-04 13:58:20 UTC (rev 10693)
@@ -1,158 +0,0 @@
-Description: Remove convenient jpeg copy
-Forwarded: not-needed
-Author: Mathieu Malaterre <malat at debian.org>
-
-Index: imagevis3d-2.0.1/Tuvok/tvk.pro
-===================================================================
---- imagevis3d-2.0.1.orig/Tuvok/tvk.pro 2011-12-09 09:51:15.000000000 +0100
-+++ imagevis3d-2.0.1/Tuvok/tvk.pro 2011-12-09 09:51:22.000000000 +0100
-@@ -70,34 +70,6 @@
- DebugOut/ConsoleOut.h \
- DebugOut/MultiplexOut.h \
- DebugOut/TextfileOut.h \
-- IO/3rdParty/bzip2/bzlib_private.h \
-- IO/3rdParty/jpeglib/cderror.h \
-- IO/3rdParty/jpeglib/cdjpeg.h \
-- IO/3rdParty/jpeglib/jchuff.h \
-- IO/3rdParty/jpeglib/jconfig.h \
-- IO/3rdParty/jpeglib/jdct.h \
-- IO/3rdParty/jpeglib/jdhuff.h \
-- IO/3rdParty/jpeglib/jerror.h \
-- IO/3rdParty/jpeglib/jinclude.h \
-- IO/3rdParty/jpeglib/jlossls.h \
-- IO/3rdParty/jpeglib/jlossy.h \
-- IO/3rdParty/jpeglib/jmemsys.h \
-- IO/3rdParty/jpeglib/jmorecfg.h \
-- IO/3rdParty/jpeglib/jpegint.h \
-- IO/3rdParty/jpeglib/jpeglib.h \
-- IO/3rdParty/jpeglib/jversion.h \
-- IO/3rdParty/jpeglib/mangle_jpeg.h \
-- IO/3rdParty/jpeglib/transupp.h \
-- IO/3rdParty/tiff/t4.h \
-- IO/3rdParty/tiff/tif_dir.h \
-- IO/3rdParty/tiff/tif_fax3.h \
-- IO/3rdParty/tiff/tiffconf.h \
-- IO/3rdParty/tiff/tiff.h \
-- IO/3rdParty/tiff/tiffio.h \
-- IO/3rdParty/tiff/tiffiop.h \
-- IO/3rdParty/tiff/tiffvers.h \
-- IO/3rdParty/tiff/tif_predict.h \
-- IO/3rdParty/tiff/uvcode.h \
- IO/AbstrConverter.h \
- IO/AnalyzeConverter.h \
- IO/BOVConverter.h \
-@@ -210,114 +182,6 @@
- DebugOut/ConsoleOut.cpp \
- DebugOut/MultiplexOut.cpp \
- DebugOut/TextfileOut.cpp \
-- IO/3rdParty/bzip2/blocksort.c \
-- IO/3rdParty/bzip2/bzlib.c \
-- IO/3rdParty/bzip2/compress.c \
-- IO/3rdParty/bzip2/crctable.c \
-- IO/3rdParty/bzip2/decompress.c \
-- IO/3rdParty/bzip2/huffman.c \
-- IO/3rdParty/bzip2/randtable.c \
-- IO/3rdParty/jpeglib/cdjpeg.c \
-- IO/3rdParty/jpeglib/jcapimin.c \
-- IO/3rdParty/jpeglib/jcapistd.c \
-- IO/3rdParty/jpeglib/jccoefct.c \
-- IO/3rdParty/jpeglib/jccolor.c \
-- IO/3rdParty/jpeglib/jcdctmgr.c \
-- IO/3rdParty/jpeglib/jcdiffct.c \
-- IO/3rdParty/jpeglib/jchuff.c \
-- IO/3rdParty/jpeglib/jcinit.c \
-- IO/3rdParty/jpeglib/jclhuff.c \
-- IO/3rdParty/jpeglib/jclossls.c \
-- IO/3rdParty/jpeglib/jclossy.c \
-- IO/3rdParty/jpeglib/jcmainct.c \
-- IO/3rdParty/jpeglib/jcmarker.c \
-- IO/3rdParty/jpeglib/jcmaster.c \
-- IO/3rdParty/jpeglib/jcodec.c \
-- IO/3rdParty/jpeglib/jcomapi.c \
-- IO/3rdParty/jpeglib/jcparam.c \
-- IO/3rdParty/jpeglib/jcphuff.c \
-- IO/3rdParty/jpeglib/jcpred.c \
-- IO/3rdParty/jpeglib/jcprepct.c \
-- IO/3rdParty/jpeglib/jcsample.c \
-- IO/3rdParty/jpeglib/jcscale.c \
-- IO/3rdParty/jpeglib/jcshuff.c \
-- IO/3rdParty/jpeglib/jctrans.c \
-- IO/3rdParty/jpeglib/jdapimin.c \
-- IO/3rdParty/jpeglib/jdapistd.c \
-- IO/3rdParty/jpeglib/jdatadst.c \
-- IO/3rdParty/jpeglib/jdatasrc.c \
-- IO/3rdParty/jpeglib/jdcoefct.c \
-- IO/3rdParty/jpeglib/jdcolor.c \
-- IO/3rdParty/jpeglib/jddctmgr.c \
-- IO/3rdParty/jpeglib/jddiffct.c \
-- IO/3rdParty/jpeglib/jdhuff.c \
-- IO/3rdParty/jpeglib/jdinput.c \
-- IO/3rdParty/jpeglib/jdlhuff.c \
-- IO/3rdParty/jpeglib/jdlossls.c \
-- IO/3rdParty/jpeglib/jdlossy.c \
-- IO/3rdParty/jpeglib/jdmainct.c \
-- IO/3rdParty/jpeglib/jdmarker.c \
-- IO/3rdParty/jpeglib/jdmaster.c \
-- IO/3rdParty/jpeglib/jdmerge.c \
-- IO/3rdParty/jpeglib/jdphuff.c \
-- IO/3rdParty/jpeglib/jdpostct.c \
-- IO/3rdParty/jpeglib/jdpred.c \
-- IO/3rdParty/jpeglib/jdsample.c \
-- IO/3rdParty/jpeglib/jdscale.c \
-- IO/3rdParty/jpeglib/jdshuff.c \
-- IO/3rdParty/jpeglib/jdtrans.c \
-- IO/3rdParty/jpeglib/jerror.c \
-- IO/3rdParty/jpeglib/jfdctflt.c \
-- IO/3rdParty/jpeglib/jfdctfst.c \
-- IO/3rdParty/jpeglib/jfdctint.c \
-- IO/3rdParty/jpeglib/jidctflt.c \
-- IO/3rdParty/jpeglib/jidctfst.c \
-- IO/3rdParty/jpeglib/jidctint.c \
-- IO/3rdParty/jpeglib/jidctred.c \
-- IO/3rdParty/jpeglib/jmemmgr.c \
-- IO/3rdParty/jpeglib/jmemnobs.c \
-- IO/3rdParty/jpeglib/jquant1.c \
-- IO/3rdParty/jpeglib/jquant2.c \
-- IO/3rdParty/jpeglib/jutils.c \
-- IO/3rdParty/jpeglib/rdcolmap.c \
-- IO/3rdParty/jpeglib/rdswitch.c \
-- IO/3rdParty/jpeglib/transupp.c \
-- IO/3rdParty/tiff/tif_aux.c \
-- IO/3rdParty/tiff/tif_close.c \
-- IO/3rdParty/tiff/tif_codec.c \
-- IO/3rdParty/tiff/tif_color.c \
-- IO/3rdParty/tiff/tif_compress.c \
-- IO/3rdParty/tiff/tif_dir.c \
-- IO/3rdParty/tiff/tif_dirinfo.c \
-- IO/3rdParty/tiff/tif_dirread.c \
-- IO/3rdParty/tiff/tif_dirwrite.c \
-- IO/3rdParty/tiff/tif_dumpmode.c \
-- IO/3rdParty/tiff/tif_error.c \
-- IO/3rdParty/tiff/tif_extension.c \
-- IO/3rdParty/tiff/tif_fax3.c \
-- IO/3rdParty/tiff/tif_fax3sm.c \
-- IO/3rdParty/tiff/tif_flush.c \
-- IO/3rdParty/tiff/tif_getimage.c \
-- IO/3rdParty/tiff/tif_luv.c \
-- IO/3rdParty/tiff/tif_lzw.c \
-- IO/3rdParty/tiff/tif_next.c \
-- IO/3rdParty/tiff/tif_open.c \
-- IO/3rdParty/tiff/tif_packbits.c \
-- IO/3rdParty/tiff/tif_pixarlog.c \
-- IO/3rdParty/tiff/tif_predict.c \
-- IO/3rdParty/tiff/tif_print.c \
-- IO/3rdParty/tiff/tif_read.c \
-- IO/3rdParty/tiff/tif_strip.c \
-- IO/3rdParty/tiff/tif_swab.c \
-- IO/3rdParty/tiff/tif_thunder.c \
-- IO/3rdParty/tiff/tif_tile.c \
-- IO/3rdParty/tiff/tif_version.c \
-- IO/3rdParty/tiff/tif_warning.c \
-- IO/3rdParty/tiff/tif_write.c \
-- IO/3rdParty/tiff/tif_zip.c \
-- IO/3rdParty/tiff/tif_jbig.c \
-- IO/3rdParty/tiff/tif_jpeg.c \
-- IO/3rdParty/tiff/tif_ojpeg.c \
- IO/AbstrConverter.cpp \
- IO/AnalyzeConverter.cpp \
- IO/BOVConverter.cpp \
Deleted: trunk/packages/imagevis3d/trunk/debian/patches/bzip22.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/bzip22.patch 2012-05-04 13:56:44 UTC (rev 10692)
+++ trunk/packages/imagevis3d/trunk/debian/patches/bzip22.patch 2012-05-04 13:58:20 UTC (rev 10693)
@@ -1,17 +0,0 @@
-Description: Allow compilation with system install bzip2 lib
-Forwarded: not-needed
-Author: Mathieu Malaterre <malat at debian.org>
-
-Index: imagevis3d-2.1.0/Tuvok/IO/RAWConverter.cpp
-===================================================================
---- imagevis3d-2.1.0.orig/Tuvok/IO/RAWConverter.cpp 2011-12-08 18:11:45.000000000 +0100
-+++ imagevis3d-2.1.0/Tuvok/IO/RAWConverter.cpp 2011-12-08 18:12:00.000000000 +0100
-@@ -38,7 +38,7 @@
- #include <cstring>
- #include <iterator>
- #include <list>
--#include "3rdParty/bzip2/bzlib.h"
-+#include "bzlib.h"
- #include "boost/cstdint.hpp"
-
- #include "RAWConverter.h"
Added: trunk/packages/imagevis3d/trunk/debian/patches/convenientlibs.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/convenientlibs.patch (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/convenientlibs.patch 2012-05-04 13:58:20 UTC (rev 10693)
@@ -0,0 +1,343 @@
+Description: Remove convenient libs copy
+Forwarded: not-needed
+Author: Mathieu Malaterre <malat at debian.org>
+
+Index: imagevis3d-2.0.1/Tuvok/tvk.pro
+===================================================================
+--- imagevis3d-2.0.1.orig/Tuvok/tvk.pro 2012-05-04 15:43:41.216793679 +0200
++++ imagevis3d-2.0.1/Tuvok/tvk.pro 2012-05-04 15:47:45.416784866 +0200
+@@ -47,9 +47,6 @@
+
+ # Input
+ HEADERS += \
+- 3rdParty/GLEW/GL/glew.h \
+- 3rdParty/GLEW/GL/glxew.h \
+- 3rdParty/GLEW/GL/wglew.h \
+ Basics/Appendix.h \
+ Basics/ArcBall.h \
+ Basics/Checksums/crc32.h \
+@@ -73,34 +70,6 @@
+ DebugOut/ConsoleOut.h \
+ DebugOut/MultiplexOut.h \
+ DebugOut/TextfileOut.h \
+- IO/3rdParty/bzip2/bzlib_private.h \
+- IO/3rdParty/jpeglib/cderror.h \
+- IO/3rdParty/jpeglib/cdjpeg.h \
+- IO/3rdParty/jpeglib/jchuff.h \
+- IO/3rdParty/jpeglib/jconfig.h \
+- IO/3rdParty/jpeglib/jdct.h \
+- IO/3rdParty/jpeglib/jdhuff.h \
+- IO/3rdParty/jpeglib/jerror.h \
+- IO/3rdParty/jpeglib/jinclude.h \
+- IO/3rdParty/jpeglib/jlossls.h \
+- IO/3rdParty/jpeglib/jlossy.h \
+- IO/3rdParty/jpeglib/jmemsys.h \
+- IO/3rdParty/jpeglib/jmorecfg.h \
+- IO/3rdParty/jpeglib/jpegint.h \
+- IO/3rdParty/jpeglib/jpeglib.h \
+- IO/3rdParty/jpeglib/jversion.h \
+- IO/3rdParty/jpeglib/mangle_jpeg.h \
+- IO/3rdParty/jpeglib/transupp.h \
+- IO/3rdParty/tiff/t4.h \
+- IO/3rdParty/tiff/tif_dir.h \
+- IO/3rdParty/tiff/tif_fax3.h \
+- IO/3rdParty/tiff/tiffconf.h \
+- IO/3rdParty/tiff/tiff.h \
+- IO/3rdParty/tiff/tiffio.h \
+- IO/3rdParty/tiff/tiffiop.h \
+- IO/3rdParty/tiff/tiffvers.h \
+- IO/3rdParty/tiff/tif_predict.h \
+- IO/3rdParty/tiff/uvcode.h \
+ IO/AbstrConverter.h \
+ IO/AnalyzeConverter.h \
+ IO/BOVConverter.h \
+@@ -195,7 +164,6 @@
+ StdTuvokDefines.h
+
+ SOURCES += \
+- 3rdParty/GLEW/GL/glew.c \
+ Basics/Appendix.cpp \
+ Basics/ArcBall.cpp \
+ Basics/Checksums/MD5.cpp \
+@@ -214,114 +182,6 @@
+ DebugOut/ConsoleOut.cpp \
+ DebugOut/MultiplexOut.cpp \
+ DebugOut/TextfileOut.cpp \
+- IO/3rdParty/bzip2/blocksort.c \
+- IO/3rdParty/bzip2/bzlib.c \
+- IO/3rdParty/bzip2/compress.c \
+- IO/3rdParty/bzip2/crctable.c \
+- IO/3rdParty/bzip2/decompress.c \
+- IO/3rdParty/bzip2/huffman.c \
+- IO/3rdParty/bzip2/randtable.c \
+- IO/3rdParty/jpeglib/cdjpeg.c \
+- IO/3rdParty/jpeglib/jcapimin.c \
+- IO/3rdParty/jpeglib/jcapistd.c \
+- IO/3rdParty/jpeglib/jccoefct.c \
+- IO/3rdParty/jpeglib/jccolor.c \
+- IO/3rdParty/jpeglib/jcdctmgr.c \
+- IO/3rdParty/jpeglib/jcdiffct.c \
+- IO/3rdParty/jpeglib/jchuff.c \
+- IO/3rdParty/jpeglib/jcinit.c \
+- IO/3rdParty/jpeglib/jclhuff.c \
+- IO/3rdParty/jpeglib/jclossls.c \
+- IO/3rdParty/jpeglib/jclossy.c \
+- IO/3rdParty/jpeglib/jcmainct.c \
+- IO/3rdParty/jpeglib/jcmarker.c \
+- IO/3rdParty/jpeglib/jcmaster.c \
+- IO/3rdParty/jpeglib/jcodec.c \
+- IO/3rdParty/jpeglib/jcomapi.c \
+- IO/3rdParty/jpeglib/jcparam.c \
+- IO/3rdParty/jpeglib/jcphuff.c \
+- IO/3rdParty/jpeglib/jcpred.c \
+- IO/3rdParty/jpeglib/jcprepct.c \
+- IO/3rdParty/jpeglib/jcsample.c \
+- IO/3rdParty/jpeglib/jcscale.c \
+- IO/3rdParty/jpeglib/jcshuff.c \
+- IO/3rdParty/jpeglib/jctrans.c \
+- IO/3rdParty/jpeglib/jdapimin.c \
+- IO/3rdParty/jpeglib/jdapistd.c \
+- IO/3rdParty/jpeglib/jdatadst.c \
+- IO/3rdParty/jpeglib/jdatasrc.c \
+- IO/3rdParty/jpeglib/jdcoefct.c \
+- IO/3rdParty/jpeglib/jdcolor.c \
+- IO/3rdParty/jpeglib/jddctmgr.c \
+- IO/3rdParty/jpeglib/jddiffct.c \
+- IO/3rdParty/jpeglib/jdhuff.c \
+- IO/3rdParty/jpeglib/jdinput.c \
+- IO/3rdParty/jpeglib/jdlhuff.c \
+- IO/3rdParty/jpeglib/jdlossls.c \
+- IO/3rdParty/jpeglib/jdlossy.c \
+- IO/3rdParty/jpeglib/jdmainct.c \
+- IO/3rdParty/jpeglib/jdmarker.c \
+- IO/3rdParty/jpeglib/jdmaster.c \
+- IO/3rdParty/jpeglib/jdmerge.c \
+- IO/3rdParty/jpeglib/jdphuff.c \
+- IO/3rdParty/jpeglib/jdpostct.c \
+- IO/3rdParty/jpeglib/jdpred.c \
+- IO/3rdParty/jpeglib/jdsample.c \
+- IO/3rdParty/jpeglib/jdscale.c \
+- IO/3rdParty/jpeglib/jdshuff.c \
+- IO/3rdParty/jpeglib/jdtrans.c \
+- IO/3rdParty/jpeglib/jerror.c \
+- IO/3rdParty/jpeglib/jfdctflt.c \
+- IO/3rdParty/jpeglib/jfdctfst.c \
+- IO/3rdParty/jpeglib/jfdctint.c \
+- IO/3rdParty/jpeglib/jidctflt.c \
+- IO/3rdParty/jpeglib/jidctfst.c \
+- IO/3rdParty/jpeglib/jidctint.c \
+- IO/3rdParty/jpeglib/jidctred.c \
+- IO/3rdParty/jpeglib/jmemmgr.c \
+- IO/3rdParty/jpeglib/jmemnobs.c \
+- IO/3rdParty/jpeglib/jquant1.c \
+- IO/3rdParty/jpeglib/jquant2.c \
+- IO/3rdParty/jpeglib/jutils.c \
+- IO/3rdParty/jpeglib/rdcolmap.c \
+- IO/3rdParty/jpeglib/rdswitch.c \
+- IO/3rdParty/jpeglib/transupp.c \
+- IO/3rdParty/tiff/tif_aux.c \
+- IO/3rdParty/tiff/tif_close.c \
+- IO/3rdParty/tiff/tif_codec.c \
+- IO/3rdParty/tiff/tif_color.c \
+- IO/3rdParty/tiff/tif_compress.c \
+- IO/3rdParty/tiff/tif_dir.c \
+- IO/3rdParty/tiff/tif_dirinfo.c \
+- IO/3rdParty/tiff/tif_dirread.c \
+- IO/3rdParty/tiff/tif_dirwrite.c \
+- IO/3rdParty/tiff/tif_dumpmode.c \
+- IO/3rdParty/tiff/tif_error.c \
+- IO/3rdParty/tiff/tif_extension.c \
+- IO/3rdParty/tiff/tif_fax3.c \
+- IO/3rdParty/tiff/tif_fax3sm.c \
+- IO/3rdParty/tiff/tif_flush.c \
+- IO/3rdParty/tiff/tif_getimage.c \
+- IO/3rdParty/tiff/tif_luv.c \
+- IO/3rdParty/tiff/tif_lzw.c \
+- IO/3rdParty/tiff/tif_next.c \
+- IO/3rdParty/tiff/tif_open.c \
+- IO/3rdParty/tiff/tif_packbits.c \
+- IO/3rdParty/tiff/tif_pixarlog.c \
+- IO/3rdParty/tiff/tif_predict.c \
+- IO/3rdParty/tiff/tif_print.c \
+- IO/3rdParty/tiff/tif_read.c \
+- IO/3rdParty/tiff/tif_strip.c \
+- IO/3rdParty/tiff/tif_swab.c \
+- IO/3rdParty/tiff/tif_thunder.c \
+- IO/3rdParty/tiff/tif_tile.c \
+- IO/3rdParty/tiff/tif_version.c \
+- IO/3rdParty/tiff/tif_warning.c \
+- IO/3rdParty/tiff/tif_write.c \
+- IO/3rdParty/tiff/tif_zip.c \
+- IO/3rdParty/tiff/tif_jbig.c \
+- IO/3rdParty/tiff/tif_jpeg.c \
+- IO/3rdParty/tiff/tif_ojpeg.c \
+ IO/AbstrConverter.cpp \
+ IO/AnalyzeConverter.cpp \
+ IO/BOVConverter.cpp \
+@@ -402,8 +262,6 @@
+ Renderer/TFScaling.cpp \
+ Scripting/Scripting.cpp
+
+-unix:SOURCES += IO/3rdParty/tiff/tif_unix.c
+-
+ win32 {
+ HEADERS += \
+ Basics/DynamicDX.h \
+Index: imagevis3d-2.0.1/Tuvok/IO/scio.pro
+===================================================================
+--- imagevis3d-2.0.1.orig/Tuvok/IO/scio.pro 2012-05-04 15:43:42.132793648 +0200
++++ imagevis3d-2.0.1/Tuvok/IO/scio.pro 2012-05-04 15:47:45.416784866 +0200
+@@ -31,113 +31,6 @@
+
+ # Input
+ SOURCES += \
+- ./3rdParty/bzip2/blocksort.c \
+- ./3rdParty/bzip2/bzlib.c \
+- ./3rdParty/bzip2/compress.c \
+- ./3rdParty/bzip2/crctable.c \
+- ./3rdParty/bzip2/decompress.c \
+- ./3rdParty/bzip2/huffman.c \
+- ./3rdParty/bzip2/randtable.c \
+- ./3rdParty/jpeglib/cdjpeg.c \
+- ./3rdParty/jpeglib/jcapimin.c \
+- ./3rdParty/jpeglib/jcapistd.c \
+- ./3rdParty/jpeglib/jccoefct.c \
+- ./3rdParty/jpeglib/jccolor.c \
+- ./3rdParty/jpeglib/jcdctmgr.c \
+- ./3rdParty/jpeglib/jcdiffct.c \
+- ./3rdParty/jpeglib/jchuff.c \
+- ./3rdParty/jpeglib/jcinit.c \
+- ./3rdParty/jpeglib/jclhuff.c \
+- ./3rdParty/jpeglib/jclossls.c \
+- ./3rdParty/jpeglib/jclossy.c \
+- ./3rdParty/jpeglib/jcmainct.c \
+- ./3rdParty/jpeglib/jcmarker.c \
+- ./3rdParty/jpeglib/jcmaster.c \
+- ./3rdParty/jpeglib/jcodec.c \
+- ./3rdParty/jpeglib/jcomapi.c \
+- ./3rdParty/jpeglib/jcparam.c \
+- ./3rdParty/jpeglib/jcphuff.c \
+- ./3rdParty/jpeglib/jcpred.c \
+- ./3rdParty/jpeglib/jcprepct.c \
+- ./3rdParty/jpeglib/jcsample.c \
+- ./3rdParty/jpeglib/jcscale.c \
+- ./3rdParty/jpeglib/jcshuff.c \
+- ./3rdParty/jpeglib/jctrans.c \
+- ./3rdParty/jpeglib/jdapimin.c \
+- ./3rdParty/jpeglib/jdapistd.c \
+- ./3rdParty/jpeglib/jdatadst.c \
+- ./3rdParty/jpeglib/jdatasrc.c \
+- ./3rdParty/jpeglib/jdcoefct.c \
+- ./3rdParty/jpeglib/jdcolor.c \
+- ./3rdParty/jpeglib/jddctmgr.c \
+- ./3rdParty/jpeglib/jddiffct.c \
+- ./3rdParty/jpeglib/jdhuff.c \
+- ./3rdParty/jpeglib/jdinput.c \
+- ./3rdParty/jpeglib/jdlhuff.c \
+- ./3rdParty/jpeglib/jdlossls.c \
+- ./3rdParty/jpeglib/jdlossy.c \
+- ./3rdParty/jpeglib/jdmainct.c \
+- ./3rdParty/jpeglib/jdmarker.c \
+- ./3rdParty/jpeglib/jdmaster.c \
+- ./3rdParty/jpeglib/jdmerge.c \
+- ./3rdParty/jpeglib/jdphuff.c \
+- ./3rdParty/jpeglib/jdpostct.c \
+- ./3rdParty/jpeglib/jdpred.c \
+- ./3rdParty/jpeglib/jdsample.c \
+- ./3rdParty/jpeglib/jdscale.c \
+- ./3rdParty/jpeglib/jdshuff.c \
+- ./3rdParty/jpeglib/jdtrans.c \
+- ./3rdParty/jpeglib/jerror.c \
+- ./3rdParty/jpeglib/jfdctflt.c \
+- ./3rdParty/jpeglib/jfdctfst.c \
+- ./3rdParty/jpeglib/jfdctint.c \
+- ./3rdParty/jpeglib/jidctflt.c \
+- ./3rdParty/jpeglib/jidctfst.c \
+- ./3rdParty/jpeglib/jidctint.c \
+- ./3rdParty/jpeglib/jidctred.c \
+- ./3rdParty/jpeglib/jmemmgr.c \
+- ./3rdParty/jpeglib/jmemnobs.c \
+- ./3rdParty/jpeglib/jmemsrc.c \
+- ./3rdParty/jpeglib/jquant1.c \
+- ./3rdParty/jpeglib/jquant2.c \
+- ./3rdParty/jpeglib/jutils.c \
+- ./3rdParty/jpeglib/rdcolmap.c \
+- ./3rdParty/jpeglib/rdswitch.c \
+- ./3rdParty/jpeglib/transupp.c \
+- ./3rdParty/tiff/tif_aux.c \
+- ./3rdParty/tiff/tif_close.c \
+- ./3rdParty/tiff/tif_codec.c \
+- ./3rdParty/tiff/tif_color.c \
+- ./3rdParty/tiff/tif_compress.c \
+- ./3rdParty/tiff/tif_dir.c \
+- ./3rdParty/tiff/tif_dirinfo.c \
+- ./3rdParty/tiff/tif_dirread.c \
+- ./3rdParty/tiff/tif_dirwrite.c \
+- ./3rdParty/tiff/tif_dumpmode.c \
+- ./3rdParty/tiff/tif_error.c \
+- ./3rdParty/tiff/tif_extension.c \
+- ./3rdParty/tiff/tif_fax3.c \
+- ./3rdParty/tiff/tif_fax3sm.c \
+- ./3rdParty/tiff/tif_flush.c \
+- ./3rdParty/tiff/tif_getimage.c \
+- ./3rdParty/tiff/tif_luv.c \
+- ./3rdParty/tiff/tif_lzw.c \
+- ./3rdParty/tiff/tif_next.c \
+- ./3rdParty/tiff/tif_open.c \
+- ./3rdParty/tiff/tif_packbits.c \
+- ./3rdParty/tiff/tif_pixarlog.c \
+- ./3rdParty/tiff/tif_predict.c \
+- ./3rdParty/tiff/tif_print.c \
+- ./3rdParty/tiff/tif_read.c \
+- ./3rdParty/tiff/tif_strip.c \
+- ./3rdParty/tiff/tif_swab.c \
+- ./3rdParty/tiff/tif_thunder.c \
+- ./3rdParty/tiff/tif_tile.c \
+- ./3rdParty/tiff/tif_unix.c \
+- ./3rdParty/tiff/tif_version.c \
+- ./3rdParty/tiff/tif_warning.c \
+- ./3rdParty/tiff/tif_write.c \
+- ./3rdParty/tiff/tif_zip.c \
+ ./AbstrConverter.cpp \
+ ./AbstrGeoConverter.cpp \
+ ./AnalyzeConverter.cpp \
+@@ -190,38 +83,6 @@
+ ./VGStudioConverter.cpp
+
+ HEADERS += \
+- ./3rdParty/bzip2/bzlib.h \
+- ./3rdParty/bzip2/bzlib_private.h \
+- ./3rdParty/jpeglib/cderror.h \
+- ./3rdParty/jpeglib/cdjpeg.h \
+- ./3rdParty/jpeglib/jchuff.h \
+- ./3rdParty/jpeglib/jconfig.h \
+- ./3rdParty/jpeglib/jdct.h \
+- ./3rdParty/jpeglib/jdhuff.h \
+- ./3rdParty/jpeglib/jerror.h \
+- ./3rdParty/jpeglib/jinclude.h \
+- ./3rdParty/jpeglib/jlossls.h \
+- ./3rdParty/jpeglib/jlossy.h \
+- ./3rdParty/jpeglib/jmemsys.h \
+- ./3rdParty/jpeglib/jmorecfg.h \
+- ./3rdParty/jpeglib/jpegint.h \
+- ./3rdParty/jpeglib/jpeglib.h \
+- ./3rdParty/jpeglib/jversion.h \
+- ./3rdParty/jpeglib/mangle_jpeg.h \
+- ./3rdParty/jpeglib/transupp.h \
+- ./3rdParty/tiff/t4.h \
+- ./3rdParty/tiff/tif_config.h \
+- ./3rdParty/tiff/tif_dir.h \
+- ./3rdParty/tiff/tif_fax3.h \
+- ./3rdParty/tiff/tiffconf.h \
+- ./3rdParty/tiff/tiff.h \
+- ./3rdParty/tiff/tiffio.h \
+- ./3rdParty/tiff/tiffiop.h \
+- ./3rdParty/tiff/tiffvers.h \
+- ./3rdParty/tiff/tif_predict.h \
+- ./3rdParty/tiff/uvcode.h \
+- ./3rdParty/zlib/zconf.h \
+- ./3rdParty/zlib/zlib.h \
+ ./AbstrConverter.h \
+ ./AbstrGeoConverter.h \
+ ./AnalyzeConverter.h \
+
Deleted: trunk/packages/imagevis3d/trunk/debian/patches/glew.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/glew.patch 2012-05-04 13:56:44 UTC (rev 10692)
+++ trunk/packages/imagevis3d/trunk/debian/patches/glew.patch 2012-05-04 13:58:20 UTC (rev 10693)
@@ -1,65 +0,0 @@
-Description: Remove convenient glew copy
-Forwarded: not-needed
-Author: Mathieu Malaterre <malat at debian.org>
-
-Index: imagevis3d-2.0.1/Tuvok/tvk.pro
-===================================================================
---- imagevis3d-2.0.1.orig/Tuvok/tvk.pro 2011-12-09 09:49:40.000000000 +0100
-+++ imagevis3d-2.0.1/Tuvok/tvk.pro 2011-12-09 09:51:15.000000000 +0100
-@@ -47,9 +47,6 @@
-
- # Input
- HEADERS += \
-- 3rdParty/GLEW/GL/glew.h \
-- 3rdParty/GLEW/GL/glxew.h \
-- 3rdParty/GLEW/GL/wglew.h \
- Basics/Appendix.h \
- Basics/ArcBall.h \
- Basics/Checksums/crc32.h \
-@@ -195,7 +192,6 @@
- StdTuvokDefines.h
-
- SOURCES += \
-- 3rdParty/GLEW/GL/glew.c \
- Basics/Appendix.cpp \
- Basics/ArcBall.cpp \
- Basics/Checksums/MD5.cpp \
-Index: imagevis3d-2.0.1/Tuvok/Renderer/GPUMemMan/GPUMemMan.h
-===================================================================
---- imagevis3d-2.0.1.orig/Tuvok/Renderer/GPUMemMan/GPUMemMan.h 2011-12-09 09:49:40.000000000 +0100
-+++ imagevis3d-2.0.1/Tuvok/Renderer/GPUMemMan/GPUMemMan.h 2011-12-09 09:51:15.000000000 +0100
-@@ -41,7 +41,7 @@
- #include <deque>
- #include <utility>
- #include "../../StdTuvokDefines.h"
--#include "3rdParty/GLEW/GL/glew.h"
-+#include "GL/glew.h"
- #include "Basics/Vectors.h"
- #include "GPUMemManDataStructs.h"
-
-Index: imagevis3d-2.0.1/Tuvok/Renderer/GPUMemMan/GPUMemManDataStructs.h
-===================================================================
---- imagevis3d-2.0.1.orig/Tuvok/Renderer/GPUMemMan/GPUMemManDataStructs.h 2011-12-09 09:49:40.000000000 +0100
-+++ imagevis3d-2.0.1/Tuvok/Renderer/GPUMemMan/GPUMemManDataStructs.h 2011-12-09 09:51:15.000000000 +0100
-@@ -49,7 +49,7 @@
- #include <deque>
- #include <string>
- #include <vector>
--#include "3rdParty/GLEW/GL/glew.h"
-+#include "GL/glew.h"
- #include "boost/noncopyable.hpp"
- #include "Basics/Vectors.h"
- #include "IO/Brick.h"
-Index: imagevis3d-2.0.1/Tuvok/Renderer/GL/GLInclude.h
-===================================================================
---- imagevis3d-2.0.1.orig/Tuvok/Renderer/GL/GLInclude.h 2011-12-09 09:49:40.000000000 +0100
-+++ imagevis3d-2.0.1/Tuvok/Renderer/GL/GLInclude.h 2011-12-09 09:51:15.000000000 +0100
-@@ -40,7 +40,7 @@
- #define TUVOK_GLINCLUDE_H
-
- #include "../../StdTuvokDefines.h"
--#include "3rdParty/GLEW/GL/glew.h"
-+#include "GL/glew.h"
-
- #ifdef WIN32
- #define NOMINMAX
Deleted: trunk/packages/imagevis3d/trunk/debian/patches/jpeg.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/jpeg.patch 2012-05-04 13:56:44 UTC (rev 10692)
+++ trunk/packages/imagevis3d/trunk/debian/patches/jpeg.patch 2012-05-04 13:58:20 UTC (rev 10693)
@@ -1,26 +0,0 @@
-Description: Allow compilation with system install jpeg lib
-Forwarded: not-needed
-Author: Mathieu Malaterre <malat at debian.org>
-
-Index: imagevis3d-2.0.1/Tuvok/IO/IOManager.cpp
-===================================================================
---- imagevis3d-2.0.1.orig/Tuvok/IO/IOManager.cpp 2011-12-09 09:50:19.000000000 +0100
-+++ imagevis3d-2.0.1/Tuvok/IO/IOManager.cpp 2011-12-09 09:51:27.000000000 +0100
-@@ -45,7 +45,7 @@
- #include <map>
- #include <memory>
- #include "boost/cstdint.hpp"
--#include "3rdParty/jpeglib/jconfig.h"
-+#include "jconfig.h"
-
- #include "IOManager.h"
-
-@@ -339,7 +339,7 @@
-
- const char *jpeg_data = jpg.data();
- copy(jpeg_data, jpeg_data + jpg.size(), &vData[0]);
-- pDICOMStack->m_iAllocated = BITS_IN_JSAMPLE;
-+ pDICOMStack->m_iAllocated = 8; //BITS_IN_JSAMPLE;
- } else {
- pDICOMStack->m_Elements[j]->GetData(vData);
- MESSAGE("Creating intermediate file %s\n%u%%",
Deleted: trunk/packages/imagevis3d/trunk/debian/patches/jpeg2.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/jpeg2.patch 2012-05-04 13:56:44 UTC (rev 10692)
+++ trunk/packages/imagevis3d/trunk/debian/patches/jpeg2.patch 2012-05-04 13:58:20 UTC (rev 10693)
@@ -1,26 +0,0 @@
-Description: Allow compilation with system install jpeg lib
-Forwarded: not-needed
-Author: Mathieu Malaterre <malat at debian.org>
-
-Index: imagevis3d-2.0.1/Tuvok/IO/TuvokJPEG.cpp
-===================================================================
---- imagevis3d-2.0.1.orig/Tuvok/IO/TuvokJPEG.cpp 2011-12-09 09:48:39.000000000 +0100
-+++ imagevis3d-2.0.1/Tuvok/IO/TuvokJPEG.cpp 2011-12-09 09:51:35.000000000 +0100
-@@ -39,7 +39,7 @@
- #include <fstream>
- #include <iterator>
- #include <vector>
--#include "3rdParty/jpeglib/jpeglib.h"
-+#include "jpeglib.h"
- #include "TuvokJPEG.h"
- #include "Controller/Controller.h"
-
-@@ -92,7 +92,7 @@
- void set_data(const std::vector<char>& mem) {
- this->data = mem;
- this->jinfo.src->bytes_in_buffer = this->data.size();
-- this->jinfo.src->next_input_byte = &(this->data.at(0));
-+ this->jinfo.src->next_input_byte = (const JOCTET*)&(this->data.at(0));
- if(jpeg_read_header(&(this->jinfo), TRUE) != JPEG_HEADER_OK) {
- T_ERROR("Could not read JPEG header, bailing...");
- return;
Deleted: trunk/packages/imagevis3d/trunk/debian/patches/jpeg3.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/jpeg3.patch 2012-05-04 13:56:44 UTC (rev 10692)
+++ trunk/packages/imagevis3d/trunk/debian/patches/jpeg3.patch 2012-05-04 13:58:20 UTC (rev 10693)
@@ -1,39 +0,0 @@
-Description: Allow compilation with system install jpeg lib
-Forwarded: not-needed
-Author: Mathieu Malaterre <malat at debian.org>
-
-Index: imagevis3d-2.1.0/ImageVis3D/UI/QDataRadioButton.cpp
-===================================================================
---- imagevis3d-2.1.0.orig/ImageVis3D/UI/QDataRadioButton.cpp 2011-12-08 21:56:41.000000000 +0100
-+++ imagevis3d-2.1.0/ImageVis3D/UI/QDataRadioButton.cpp 2011-12-08 21:57:13.000000000 +0100
-@@ -39,7 +39,7 @@
- #include <QtGui/QMouseEvent>
- #include "../Tuvok/IO/TuvokJPEG.h"
- #include "../Tuvok/IO/DICOM/DICOMParser.h"
--#include "../Tuvok/IO/3rdParty/jpeglib/jconfig.h"
-+#include "jconfig.h"
-
- QDataRadioButton::QDataRadioButton(std::tr1::shared_ptr<FileStackInfo> stack,
- QWidget *parent) :
-@@ -103,7 +103,7 @@
- (m_stackInfo->m_Elements[i])->GetOffsetToData());
- const char *jpg_data = jpg.data();
- // JPEG library automagically downsamples the data.
-- m_stackInfo->m_iAllocated = BITS_IN_JSAMPLE;
-+ m_stackInfo->m_iAllocated = 8; //BITS_IN_JSAMPLE;
- vData.resize(jpg.size());
- std::copy(jpg_data, jpg_data + jpg.size(), &vData[0]);
- } else {
-Index: imagevis3d-2.1.0/ImageVis3D/UI/RenderWindowGL.cpp
-===================================================================
---- imagevis3d-2.1.0.orig/ImageVis3D/UI/RenderWindowGL.cpp 2011-12-08 21:57:42.000000000 +0100
-+++ imagevis3d-2.1.0/ImageVis3D/UI/RenderWindowGL.cpp 2011-12-08 21:57:48.000000000 +0100
-@@ -37,7 +37,7 @@
-
- #include "../Tuvok/StdTuvokDefines.h"
- #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
Deleted: trunk/packages/imagevis3d/trunk/debian/patches/libs3.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/libs3.patch 2012-05-04 13:56:44 UTC (rev 10692)
+++ trunk/packages/imagevis3d/trunk/debian/patches/libs3.patch 2012-05-04 13:58:20 UTC (rev 10693)
@@ -1,50 +0,0 @@
-Description: Add missing shared library links
-Forwarded: not-needed
-Author: Mathieu Malaterre <malat at debian.org>
-
-Index: imagevis3d-2.0.1/ImageVis3D/ImageVis3D.pro
-===================================================================
---- imagevis3d-2.0.1.orig/ImageVis3D/ImageVis3D.pro 2011-12-09 10:45:24.000000000 +0100
-+++ imagevis3d-2.0.1/ImageVis3D/ImageVis3D.pro 2011-12-09 11:29:55.000000000 +0100
-@@ -20,11 +20,12 @@
- INCLUDEPATH += $$incpath
- #INCLUDEPATH += . ../Tuvok/IO/3rdParty/boost ../Tuvok/3rdParty/GLEW ../Tuvok
- QT += opengl network
--LIBS = -L../Tuvok/Build -L../Tuvok/IO/expressions -lTuvok
-+LIBS = -L../Tuvok/Build -L../Tuvok/IO/expressions -lTuvok -ltuvokexpr
- RESOURCES = ImageVis3D.qrc
- RC_FILE = Resources/ImageVis3D.rc
- QMAKE_INFO_PLIST = ../IV3D.plist
- ICON = Resources/ImageVis3D.icns
-+unix:LIBS +=-lGLEW -ljpeg -ltiff -lbz2 -lz
- macx:LIBS +=-framework CoreFoundation
- unix:QMAKE_CXXFLAGS += -fno-strict-aliasing
- unix:QMAKE_CFLAGS += -fno-strict-aliasing
-Index: imagevis3d-2.0.1/CmdLineConverter/CmdLineConverter.pro
-===================================================================
---- imagevis3d-2.0.1.orig/CmdLineConverter/CmdLineConverter.pro 2011-12-09 10:45:24.000000000 +0100
-+++ imagevis3d-2.0.1/CmdLineConverter/CmdLineConverter.pro 2011-12-09 11:30:48.000000000 +0100
-@@ -16,7 +16,8 @@
- incpath += ../Tuvok/Basics/3rdParty ../Tuvok
- DEPENDPATH += $$incpath
- INCLUDEPATH += $$incpath
--LIBS = -L../Tuvok/Build -L../Tuvok/IO/expressions -lTuvok
-+LIBS = -L../Tuvok/Build -L../Tuvok/IO/expressions -lTuvok -ltuvokexpr
-+unix:LIBS += -lGLEW -ljpeg -ltiff -lbz2 -lz
- unix:QMAKE_CXXFLAGS += -fno-strict-aliasing
- unix:QMAKE_CFLAGS += -fno-strict-aliasing
-
-Index: imagevis3d-2.0.1/UVFReader/UVFReader.pro
-===================================================================
---- imagevis3d-2.0.1.orig/UVFReader/UVFReader.pro 2011-12-09 10:45:24.000000000 +0100
-+++ imagevis3d-2.0.1/UVFReader/UVFReader.pro 2011-12-09 11:31:31.000000000 +0100
-@@ -13,7 +13,8 @@
- DEPENDPATH += .
- INCLUDEPATH += . ../Tuvok/IO/3rdParty/boost ../Tuvok/3rdParty/GLEW
- INCLUDEPATH += ../Tuvok ../Tuvok/Basics/3rdParty ../Tuvok/Basics
--LIBS = -L../Tuvok/Build -L../Tuvok/IO/expressions -lTuvok
-+LIBS = -L../Tuvok/Build -L../Tuvok/IO/expressions -lTuvok -ltuvokexpr
-+unix:LIBS += -lGLEW -ltiff -ljpeg -lbz2 -lz
- unix:QMAKE_CXXFLAGS += -fno-strict-aliasing
- unix:QMAKE_CFLAGS += -fno-strict-aliasing
-
Copied: trunk/packages/imagevis3d/trunk/debian/patches/missingsharedlibs.patch (from rev 10691, trunk/packages/imagevis3d/trunk/debian/patches/libs3.patch)
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/missingsharedlibs.patch (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/missingsharedlibs.patch 2012-05-04 13:58:20 UTC (rev 10693)
@@ -0,0 +1,50 @@
+Description: Add missing shared library links
+Forwarded: not-needed
+Author: Mathieu Malaterre <malat at debian.org>
+
+Index: imagevis3d-2.0.1/ImageVis3D/ImageVis3D.pro
+===================================================================
+--- imagevis3d-2.0.1.orig/ImageVis3D/ImageVis3D.pro 2011-12-09 10:45:24.000000000 +0100
++++ imagevis3d-2.0.1/ImageVis3D/ImageVis3D.pro 2011-12-09 11:29:55.000000000 +0100
+@@ -20,11 +20,12 @@
+ INCLUDEPATH += $$incpath
+ #INCLUDEPATH += . ../Tuvok/IO/3rdParty/boost ../Tuvok/3rdParty/GLEW ../Tuvok
+ QT += opengl network
+-LIBS = -L../Tuvok/Build -L../Tuvok/IO/expressions -lTuvok
++LIBS = -L../Tuvok/Build -L../Tuvok/IO/expressions -lTuvok -ltuvokexpr
+ RESOURCES = ImageVis3D.qrc
+ RC_FILE = Resources/ImageVis3D.rc
+ QMAKE_INFO_PLIST = ../IV3D.plist
+ ICON = Resources/ImageVis3D.icns
++unix:LIBS +=-lGLEW -ljpeg -ltiff -lbz2 -lz
+ macx:LIBS +=-framework CoreFoundation
+ unix:QMAKE_CXXFLAGS += -fno-strict-aliasing
+ unix:QMAKE_CFLAGS += -fno-strict-aliasing
+Index: imagevis3d-2.0.1/CmdLineConverter/CmdLineConverter.pro
+===================================================================
+--- imagevis3d-2.0.1.orig/CmdLineConverter/CmdLineConverter.pro 2011-12-09 10:45:24.000000000 +0100
++++ imagevis3d-2.0.1/CmdLineConverter/CmdLineConverter.pro 2011-12-09 11:30:48.000000000 +0100
+@@ -16,7 +16,8 @@
+ incpath += ../Tuvok/Basics/3rdParty ../Tuvok
+ DEPENDPATH += $$incpath
+ INCLUDEPATH += $$incpath
+-LIBS = -L../Tuvok/Build -L../Tuvok/IO/expressions -lTuvok
++LIBS = -L../Tuvok/Build -L../Tuvok/IO/expressions -lTuvok -ltuvokexpr
++unix:LIBS += -lGLEW -ljpeg -ltiff -lbz2 -lz
+ unix:QMAKE_CXXFLAGS += -fno-strict-aliasing
+ unix:QMAKE_CFLAGS += -fno-strict-aliasing
+
+Index: imagevis3d-2.0.1/UVFReader/UVFReader.pro
+===================================================================
+--- imagevis3d-2.0.1.orig/UVFReader/UVFReader.pro 2011-12-09 10:45:24.000000000 +0100
++++ imagevis3d-2.0.1/UVFReader/UVFReader.pro 2011-12-09 11:31:31.000000000 +0100
+@@ -13,7 +13,8 @@
+ DEPENDPATH += .
+ INCLUDEPATH += . ../Tuvok/IO/3rdParty/boost ../Tuvok/3rdParty/GLEW
+ INCLUDEPATH += ../Tuvok ../Tuvok/Basics/3rdParty ../Tuvok/Basics
+-LIBS = -L../Tuvok/Build -L../Tuvok/IO/expressions -lTuvok
++LIBS = -L../Tuvok/Build -L../Tuvok/IO/expressions -lTuvok -ltuvokexpr
++unix:LIBS += -lGLEW -ltiff -ljpeg -lbz2 -lz
+ unix:QMAKE_CXXFLAGS += -fno-strict-aliasing
+ unix:QMAKE_CFLAGS += -fno-strict-aliasing
+
Deleted: trunk/packages/imagevis3d/trunk/debian/patches/remove_convenientlibs.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/remove_convenientlibs.patch 2012-05-04 13:56:44 UTC (rev 10692)
+++ trunk/packages/imagevis3d/trunk/debian/patches/remove_convenientlibs.patch 2012-05-04 13:58:20 UTC (rev 10693)
@@ -1,122 +0,0 @@
-Description: Remove convenient libraries
-Forwarded: not-needed
-Author: Mathieu Malaterre <malat at debian.org>
-
-Index: imagevis3d-2.1.0/Tuvok/IO/scio.pro
-===================================================================
---- imagevis3d-2.1.0.orig/Tuvok/IO/scio.pro 2011-12-08 17:44:01.000000000 +0100
-+++ imagevis3d-2.1.0/Tuvok/IO/scio.pro 2011-12-08 17:44:19.000000000 +0100
-@@ -31,113 +31,6 @@
-
- # Input
- SOURCES += \
-- ./3rdParty/bzip2/blocksort.c \
-- ./3rdParty/bzip2/bzlib.c \
-- ./3rdParty/bzip2/compress.c \
-- ./3rdParty/bzip2/crctable.c \
-- ./3rdParty/bzip2/decompress.c \
-- ./3rdParty/bzip2/huffman.c \
-- ./3rdParty/bzip2/randtable.c \
-- ./3rdParty/jpeglib/cdjpeg.c \
-- ./3rdParty/jpeglib/jcapimin.c \
-- ./3rdParty/jpeglib/jcapistd.c \
-- ./3rdParty/jpeglib/jccoefct.c \
-- ./3rdParty/jpeglib/jccolor.c \
-- ./3rdParty/jpeglib/jcdctmgr.c \
-- ./3rdParty/jpeglib/jcdiffct.c \
-- ./3rdParty/jpeglib/jchuff.c \
-- ./3rdParty/jpeglib/jcinit.c \
-- ./3rdParty/jpeglib/jclhuff.c \
-- ./3rdParty/jpeglib/jclossls.c \
-- ./3rdParty/jpeglib/jclossy.c \
-- ./3rdParty/jpeglib/jcmainct.c \
-- ./3rdParty/jpeglib/jcmarker.c \
-- ./3rdParty/jpeglib/jcmaster.c \
-- ./3rdParty/jpeglib/jcodec.c \
-- ./3rdParty/jpeglib/jcomapi.c \
-- ./3rdParty/jpeglib/jcparam.c \
-- ./3rdParty/jpeglib/jcphuff.c \
-- ./3rdParty/jpeglib/jcpred.c \
-- ./3rdParty/jpeglib/jcprepct.c \
-- ./3rdParty/jpeglib/jcsample.c \
-- ./3rdParty/jpeglib/jcscale.c \
-- ./3rdParty/jpeglib/jcshuff.c \
-- ./3rdParty/jpeglib/jctrans.c \
-- ./3rdParty/jpeglib/jdapimin.c \
-- ./3rdParty/jpeglib/jdapistd.c \
-- ./3rdParty/jpeglib/jdatadst.c \
-- ./3rdParty/jpeglib/jdatasrc.c \
-- ./3rdParty/jpeglib/jdcoefct.c \
-- ./3rdParty/jpeglib/jdcolor.c \
-- ./3rdParty/jpeglib/jddctmgr.c \
-- ./3rdParty/jpeglib/jddiffct.c \
-- ./3rdParty/jpeglib/jdhuff.c \
-- ./3rdParty/jpeglib/jdinput.c \
-- ./3rdParty/jpeglib/jdlhuff.c \
-- ./3rdParty/jpeglib/jdlossls.c \
-- ./3rdParty/jpeglib/jdlossy.c \
-- ./3rdParty/jpeglib/jdmainct.c \
-- ./3rdParty/jpeglib/jdmarker.c \
-- ./3rdParty/jpeglib/jdmaster.c \
-- ./3rdParty/jpeglib/jdmerge.c \
-- ./3rdParty/jpeglib/jdphuff.c \
-- ./3rdParty/jpeglib/jdpostct.c \
-- ./3rdParty/jpeglib/jdpred.c \
-- ./3rdParty/jpeglib/jdsample.c \
-- ./3rdParty/jpeglib/jdscale.c \
-- ./3rdParty/jpeglib/jdshuff.c \
-- ./3rdParty/jpeglib/jdtrans.c \
-- ./3rdParty/jpeglib/jerror.c \
-- ./3rdParty/jpeglib/jfdctflt.c \
-- ./3rdParty/jpeglib/jfdctfst.c \
-- ./3rdParty/jpeglib/jfdctint.c \
-- ./3rdParty/jpeglib/jidctflt.c \
-- ./3rdParty/jpeglib/jidctfst.c \
-- ./3rdParty/jpeglib/jidctint.c \
-- ./3rdParty/jpeglib/jidctred.c \
-- ./3rdParty/jpeglib/jmemmgr.c \
-- ./3rdParty/jpeglib/jmemnobs.c \
-- ./3rdParty/jpeglib/jmemsrc.c \
-- ./3rdParty/jpeglib/jquant1.c \
-- ./3rdParty/jpeglib/jquant2.c \
-- ./3rdParty/jpeglib/jutils.c \
-- ./3rdParty/jpeglib/rdcolmap.c \
-- ./3rdParty/jpeglib/rdswitch.c \
-- ./3rdParty/jpeglib/transupp.c \
-- ./3rdParty/tiff/tif_aux.c \
-- ./3rdParty/tiff/tif_close.c \
-- ./3rdParty/tiff/tif_codec.c \
-- ./3rdParty/tiff/tif_color.c \
-- ./3rdParty/tiff/tif_compress.c \
-- ./3rdParty/tiff/tif_dir.c \
-- ./3rdParty/tiff/tif_dirinfo.c \
-- ./3rdParty/tiff/tif_dirread.c \
-- ./3rdParty/tiff/tif_dirwrite.c \
-- ./3rdParty/tiff/tif_dumpmode.c \
-- ./3rdParty/tiff/tif_error.c \
-- ./3rdParty/tiff/tif_extension.c \
-- ./3rdParty/tiff/tif_fax3.c \
-- ./3rdParty/tiff/tif_fax3sm.c \
-- ./3rdParty/tiff/tif_flush.c \
-- ./3rdParty/tiff/tif_getimage.c \
-- ./3rdParty/tiff/tif_luv.c \
-- ./3rdParty/tiff/tif_lzw.c \
-- ./3rdParty/tiff/tif_next.c \
-- ./3rdParty/tiff/tif_open.c \
-- ./3rdParty/tiff/tif_packbits.c \
-- ./3rdParty/tiff/tif_pixarlog.c \
-- ./3rdParty/tiff/tif_predict.c \
-- ./3rdParty/tiff/tif_print.c \
-- ./3rdParty/tiff/tif_read.c \
-- ./3rdParty/tiff/tif_strip.c \
-- ./3rdParty/tiff/tif_swab.c \
-- ./3rdParty/tiff/tif_thunder.c \
-- ./3rdParty/tiff/tif_tile.c \
-- ./3rdParty/tiff/tif_unix.c \
-- ./3rdParty/tiff/tif_version.c \
-- ./3rdParty/tiff/tif_warning.c \
-- ./3rdParty/tiff/tif_write.c \
-- ./3rdParty/tiff/tif_zip.c \
- ./AbstrConverter.cpp \
- ./AbstrGeoConverter.cpp \
- ./AnalyzeConverter.cpp \
Modified: trunk/packages/imagevis3d/trunk/debian/patches/series
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/series 2012-05-04 13:56:44 UTC (rev 10692)
+++ trunk/packages/imagevis3d/trunk/debian/patches/series 2012-05-04 13:58:20 UTC (rev 10693)
@@ -1,14 +1,10 @@
-remove_convenientlibs.patch
-glew.patch
-bzip2.patch
-zlib.patch
-jpeg.patch
-bzip22.patch
-tiff.patch
-jpeg2.patch
-jpeg3.patch
-tiff4.patch
-libs3.patch
+convenientlibs.patch
+systemglew.patch
+systemzlib.patch
+systemjpeg.patch
+systembzip2.patch
+systemtiff.patch
+missingsharedlibs.patch
tuvok_details.patch
maxpath.patch
overflow.patch
Copied: trunk/packages/imagevis3d/trunk/debian/patches/systembzip2.patch (from rev 10691, trunk/packages/imagevis3d/trunk/debian/patches/bzip22.patch)
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/systembzip2.patch (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/systembzip2.patch 2012-05-04 13:58:20 UTC (rev 10693)
@@ -0,0 +1,17 @@
+Description: Allow compilation with system install bzip2 lib
+Forwarded: not-needed
+Author: Mathieu Malaterre <malat at debian.org>
+
+Index: imagevis3d-2.1.0/Tuvok/IO/RAWConverter.cpp
+===================================================================
+--- imagevis3d-2.1.0.orig/Tuvok/IO/RAWConverter.cpp 2011-12-08 18:11:45.000000000 +0100
++++ imagevis3d-2.1.0/Tuvok/IO/RAWConverter.cpp 2011-12-08 18:12:00.000000000 +0100
+@@ -38,7 +38,7 @@
+ #include <cstring>
+ #include <iterator>
+ #include <list>
+-#include "3rdParty/bzip2/bzlib.h"
++#include "bzlib.h"
+ #include "boost/cstdint.hpp"
+
+ #include "RAWConverter.h"
Added: trunk/packages/imagevis3d/trunk/debian/patches/systemglew.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/systemglew.patch (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/systemglew.patch 2012-05-04 13:58:20 UTC (rev 10693)
@@ -0,0 +1,57 @@
+Description: Allow compilation with system installed glew lib
+Forwarded: not-needed
+Author: Mathieu Malaterre <malat at debian.org>
+
+Index: imagevis3d-2.0.1/Tuvok/Renderer/GPUMemMan/GPUMemMan.h
+===================================================================
+--- imagevis3d-2.0.1.orig/Tuvok/Renderer/GPUMemMan/GPUMemMan.h 2012-05-04 15:43:41.224793681 +0200
++++ imagevis3d-2.0.1/Tuvok/Renderer/GPUMemMan/GPUMemMan.h 2012-05-04 15:47:45.416784866 +0200
+@@ -41,7 +41,7 @@
+ #include <deque>
+ #include <utility>
+ #include "../../StdTuvokDefines.h"
+-#include "3rdParty/GLEW/GL/glew.h"
++#include "GL/glew.h"
+ #include "Basics/Vectors.h"
+ #include "GPUMemManDataStructs.h"
+
+Index: imagevis3d-2.0.1/Tuvok/Renderer/GPUMemMan/GPUMemManDataStructs.h
+===================================================================
+--- imagevis3d-2.0.1.orig/Tuvok/Renderer/GPUMemMan/GPUMemManDataStructs.h 2012-05-04 15:43:41.236793681 +0200
++++ imagevis3d-2.0.1/Tuvok/Renderer/GPUMemMan/GPUMemManDataStructs.h 2012-05-04 15:47:45.416784866 +0200
+@@ -49,7 +49,7 @@
+ #include <deque>
+ #include <string>
+ #include <vector>
+-#include "3rdParty/GLEW/GL/glew.h"
++#include "GL/glew.h"
+ #include "boost/noncopyable.hpp"
+ #include "Basics/Vectors.h"
+ #include "IO/Brick.h"
+Index: imagevis3d-2.0.1/ImageVis3D/UI/RenderWindowGL.cpp
+===================================================================
+--- imagevis3d-2.0.1.orig/ImageVis3D/UI/RenderWindowGL.cpp 2012-05-04 15:43:39.000793759 +0200
++++ imagevis3d-2.0.1/ImageVis3D/UI/RenderWindowGL.cpp 2012-05-04 15:47:45.416784866 +0200
+@@ -37,7 +37,7 @@
+
+ #include "../Tuvok/StdTuvokDefines.h"
+ #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.0.1/Tuvok/Renderer/GL/GLInclude.h
+===================================================================
+--- imagevis3d-2.0.1.orig/Tuvok/Renderer/GL/GLInclude.h 2012-05-04 15:43:41.248793678 +0200
++++ imagevis3d-2.0.1/Tuvok/Renderer/GL/GLInclude.h 2012-05-04 15:47:45.416784866 +0200
+@@ -40,7 +40,7 @@
+ #define TUVOK_GLINCLUDE_H
+
+ #include "../../StdTuvokDefines.h"
+-#include "3rdParty/GLEW/GL/glew.h"
++#include "GL/glew.h"
+
+ #ifdef WIN32
+ #define NOMINMAX
+
Added: trunk/packages/imagevis3d/trunk/debian/patches/systemjpeg.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/systemjpeg.patch (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/systemjpeg.patch 2012-05-04 13:58:20 UTC (rev 10693)
@@ -0,0 +1,70 @@
+Description: Allow compilation with system installed jpeg lib
+Forwarded: not-needed
+Author: Mathieu Malaterre <malat at debian.org>
+
+Index: imagevis3d-2.0.1/Tuvok/IO/TuvokJPEG.cpp
+===================================================================
+--- imagevis3d-2.0.1.orig/Tuvok/IO/TuvokJPEG.cpp 2012-05-04 15:41:39.124798086 +0200
++++ imagevis3d-2.0.1/Tuvok/IO/TuvokJPEG.cpp 2012-05-04 15:43:01.860795102 +0200
+@@ -39,7 +39,7 @@
+ #include <fstream>
+ #include <iterator>
+ #include <vector>
+-#include "3rdParty/jpeglib/jpeglib.h"
++#include "jpeglib.h"
+ #include "TuvokJPEG.h"
+ #include "Controller/Controller.h"
+
+@@ -92,7 +92,7 @@
+ void set_data(const std::vector<char>& mem) {
+ this->data = mem;
+ this->jinfo.src->bytes_in_buffer = this->data.size();
+- this->jinfo.src->next_input_byte = &(this->data.at(0));
++ this->jinfo.src->next_input_byte = (const JOCTET*)&(this->data.at(0));
+ if(jpeg_read_header(&(this->jinfo), TRUE) != JPEG_HEADER_OK) {
+ T_ERROR("Could not read JPEG header, bailing...");
+ return;
+Index: imagevis3d-2.0.1/ImageVis3D/UI/QDataRadioButton.cpp
+===================================================================
+--- imagevis3d-2.0.1.orig/ImageVis3D/UI/QDataRadioButton.cpp 2012-05-04 15:41:38.548798107 +0200
++++ imagevis3d-2.0.1/ImageVis3D/UI/QDataRadioButton.cpp 2012-05-04 15:43:01.960795095 +0200
+@@ -39,7 +39,7 @@
+ #include <QtGui/QMouseEvent>
+ #include "../Tuvok/IO/TuvokJPEG.h"
+ #include "../Tuvok/IO/DICOM/DICOMParser.h"
+-#include "../Tuvok/IO/3rdParty/jpeglib/jconfig.h"
++#include "jconfig.h"
+
+ QDataRadioButton::QDataRadioButton(std::tr1::shared_ptr<FileStackInfo> stack,
+ QWidget *parent) :
+@@ -103,7 +103,7 @@
+ (m_stackInfo->m_Elements[i])->GetOffsetToData());
+ const char *jpg_data = jpg.data();
+ // JPEG library automagically downsamples the data.
+- m_stackInfo->m_iAllocated = BITS_IN_JSAMPLE;
++ m_stackInfo->m_iAllocated = 8; //BITS_IN_JSAMPLE;
+ vData.resize(jpg.size());
+ std::copy(jpg_data, jpg_data + jpg.size(), &vData[0]);
+ } else {
+Index: imagevis3d-2.0.1/Tuvok/IO/IOManager.cpp
+===================================================================
+--- imagevis3d-2.0.1.orig/Tuvok/IO/IOManager.cpp 2012-05-04 15:41:40.804798029 +0200
++++ imagevis3d-2.0.1/Tuvok/IO/IOManager.cpp 2012-05-04 15:43:01.964795097 +0200
+@@ -45,7 +45,7 @@
+ #include <map>
+ #include <memory>
+ #include "boost/cstdint.hpp"
+-#include "3rdParty/jpeglib/jconfig.h"
++#include "jconfig.h"
+
+ #include "IOManager.h"
+
+@@ -339,7 +339,7 @@
+
+ const char *jpeg_data = jpg.data();
+ copy(jpeg_data, jpeg_data + jpg.size(), &vData[0]);
+- pDICOMStack->m_iAllocated = BITS_IN_JSAMPLE;
++ pDICOMStack->m_iAllocated = 8; //BITS_IN_JSAMPLE;
+ } else {
+ pDICOMStack->m_Elements[j]->GetData(vData);
+ MESSAGE("Creating intermediate file %s\n%u%%",
Copied: trunk/packages/imagevis3d/trunk/debian/patches/systemtiff.patch (from rev 10691, trunk/packages/imagevis3d/trunk/debian/patches/tiff.patch)
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/systemtiff.patch (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/systemtiff.patch 2012-05-04 13:58:20 UTC (rev 10693)
@@ -0,0 +1,30 @@
+Description: Allow compilation with system install tiff lib
+Forwarded: not-needed
+Author: Mathieu Malaterre <malat at debian.org>
+
+Index: imagevis3d-2.1.0/Tuvok/IO/StkConverter.cpp
+===================================================================
+--- imagevis3d-2.1.0.orig/Tuvok/IO/StkConverter.cpp 2011-12-08 21:40:24.000000000 +0100
++++ imagevis3d-2.1.0/Tuvok/IO/StkConverter.cpp 2011-12-08 21:40:32.000000000 +0100
+@@ -34,7 +34,7 @@
+ */
+ #include "boost/cstdint.hpp"
+ #ifndef TUVOK_NO_IO
+-# include "3rdParty/tiff/tiffio.h"
++# include "tiffio.h"
+ #else
+ struct TIFF;
+ #endif
+Index: imagevis3d-2.1.0/Tuvok/IO/TiffVolumeConverter.cpp
+===================================================================
+--- imagevis3d-2.1.0.orig/Tuvok/IO/TiffVolumeConverter.cpp 2011-12-08 21:44:44.000000000 +0100
++++ imagevis3d-2.1.0/Tuvok/IO/TiffVolumeConverter.cpp 2011-12-08 21:44:51.000000000 +0100
+@@ -35,7 +35,7 @@
+ #include <cstring>
+ #include "boost/cstdint.hpp"
+ #ifndef TUVOK_NO_IO
+-# include "3rdParty/tiff/tiffio.h"
++# include "tiffio.h"
+ #else
+ struct TIFF;
+ #endif
Added: trunk/packages/imagevis3d/trunk/debian/patches/systemzlib.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/systemzlib.patch (rev 0)
+++ trunk/packages/imagevis3d/trunk/debian/patches/systemzlib.patch 2012-05-04 13:58:20 UTC (rev 10693)
@@ -0,0 +1,30 @@
+Description: Allow compilation with system installed zlib lib
+Forwarded: not-needed
+Author: Mathieu Malaterre <malat at debian.org>
+
+Index: imagevis3d-2.0.1/Tuvok/IO/IASSConverter.cpp
+===================================================================
+--- imagevis3d-2.0.1.orig/Tuvok/IO/IASSConverter.cpp 2012-05-04 15:43:40.084793720 +0200
++++ imagevis3d-2.0.1/Tuvok/IO/IASSConverter.cpp 2012-05-04 15:47:45.416784866 +0200
+@@ -38,7 +38,7 @@
+ #include <sstream>
+ #include "boost/cstdint.hpp"
+ #ifndef TUVOK_NO_ZLIB
+-# include "3rdParty/zlib/zlib.h"
++# include "zlib.h"
+ #endif
+ #include "IASSConverter.h"
+ #include <Basics/EndianConvert.h>
+Index: imagevis3d-2.0.1/Tuvok/IO/gzio.h
+===================================================================
+--- imagevis3d-2.0.1.orig/Tuvok/IO/gzio.h 2012-05-04 15:43:40.096793723 +0200
++++ imagevis3d-2.0.1/Tuvok/IO/gzio.h 2012-05-04 15:47:45.416784866 +0200
+@@ -31,7 +31,7 @@
+ #define IV3D_GZIO_H
+
+ #include <stdio.h>
+-#include "3rdParty/zlib/zlib.h"
++#include "zlib.h"
+
+ #ifdef __cplusplus
+ extern "C" {
Deleted: trunk/packages/imagevis3d/trunk/debian/patches/tiff.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/tiff.patch 2012-05-04 13:56:44 UTC (rev 10692)
+++ trunk/packages/imagevis3d/trunk/debian/patches/tiff.patch 2012-05-04 13:58:20 UTC (rev 10693)
@@ -1,30 +0,0 @@
-Description: Allow compilation with system install tiff lib
-Forwarded: not-needed
-Author: Mathieu Malaterre <malat at debian.org>
-
-Index: imagevis3d-2.1.0/Tuvok/IO/StkConverter.cpp
-===================================================================
---- imagevis3d-2.1.0.orig/Tuvok/IO/StkConverter.cpp 2011-12-08 21:40:24.000000000 +0100
-+++ imagevis3d-2.1.0/Tuvok/IO/StkConverter.cpp 2011-12-08 21:40:32.000000000 +0100
-@@ -34,7 +34,7 @@
- */
- #include "boost/cstdint.hpp"
- #ifndef TUVOK_NO_IO
--# include "3rdParty/tiff/tiffio.h"
-+# include "tiffio.h"
- #else
- struct TIFF;
- #endif
-Index: imagevis3d-2.1.0/Tuvok/IO/TiffVolumeConverter.cpp
-===================================================================
---- imagevis3d-2.1.0.orig/Tuvok/IO/TiffVolumeConverter.cpp 2011-12-08 21:44:44.000000000 +0100
-+++ imagevis3d-2.1.0/Tuvok/IO/TiffVolumeConverter.cpp 2011-12-08 21:44:51.000000000 +0100
-@@ -35,7 +35,7 @@
- #include <cstring>
- #include "boost/cstdint.hpp"
- #ifndef TUVOK_NO_IO
--# include "3rdParty/tiff/tiffio.h"
-+# include "tiffio.h"
- #else
- struct TIFF;
- #endif
Deleted: trunk/packages/imagevis3d/trunk/debian/patches/tiff4.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/tiff4.patch 2012-05-04 13:56:44 UTC (rev 10692)
+++ trunk/packages/imagevis3d/trunk/debian/patches/tiff4.patch 2012-05-04 13:58:20 UTC (rev 10693)
@@ -1,17 +0,0 @@
-Description: Allow compilation with system install tiff lib
-Forwarded: not-needed
-Author: Mathieu Malaterre <malat at debian.org>
-
-Index: imagevis3d-2.0.1/Tuvok/tvk.pro
-===================================================================
---- imagevis3d-2.0.1.orig/Tuvok/tvk.pro 2011-12-09 09:55:33.000000000 +0100
-+++ imagevis3d-2.0.1/Tuvok/tvk.pro 2011-12-09 09:55:50.000000000 +0100
-@@ -262,8 +262,6 @@
- Renderer/TFScaling.cpp \
- Scripting/Scripting.cpp
-
--unix:SOURCES += IO/3rdParty/tiff/tif_unix.c
--
- win32 {
- HEADERS += \
- Basics/DynamicDX.h \
Deleted: trunk/packages/imagevis3d/trunk/debian/patches/zlib.patch
===================================================================
--- trunk/packages/imagevis3d/trunk/debian/patches/zlib.patch 2012-05-04 13:56:44 UTC (rev 10692)
+++ trunk/packages/imagevis3d/trunk/debian/patches/zlib.patch 2012-05-04 13:58:20 UTC (rev 10693)
@@ -1,73 +0,0 @@
-Description: Remove convenient zlib copy
-Forwarded: not-needed
-Author: Mathieu Malaterre <malat at debian.org>
-
-Index: imagevis3d-2.0.1/Tuvok/IO/scio.pro
-===================================================================
---- imagevis3d-2.0.1.orig/Tuvok/IO/scio.pro 2011-12-09 09:50:51.000000000 +0100
-+++ imagevis3d-2.0.1/Tuvok/IO/scio.pro 2011-12-09 09:51:24.000000000 +0100
-@@ -83,38 +83,6 @@
- ./VGStudioConverter.cpp
-
- HEADERS += \
-- ./3rdParty/bzip2/bzlib.h \
-- ./3rdParty/bzip2/bzlib_private.h \
-- ./3rdParty/jpeglib/cderror.h \
-- ./3rdParty/jpeglib/cdjpeg.h \
-- ./3rdParty/jpeglib/jchuff.h \
-- ./3rdParty/jpeglib/jconfig.h \
-- ./3rdParty/jpeglib/jdct.h \
-- ./3rdParty/jpeglib/jdhuff.h \
-- ./3rdParty/jpeglib/jerror.h \
-- ./3rdParty/jpeglib/jinclude.h \
-- ./3rdParty/jpeglib/jlossls.h \
-- ./3rdParty/jpeglib/jlossy.h \
-- ./3rdParty/jpeglib/jmemsys.h \
-- ./3rdParty/jpeglib/jmorecfg.h \
-- ./3rdParty/jpeglib/jpegint.h \
-- ./3rdParty/jpeglib/jpeglib.h \
-- ./3rdParty/jpeglib/jversion.h \
-- ./3rdParty/jpeglib/mangle_jpeg.h \
-- ./3rdParty/jpeglib/transupp.h \
-- ./3rdParty/tiff/t4.h \
-- ./3rdParty/tiff/tif_config.h \
-- ./3rdParty/tiff/tif_dir.h \
-- ./3rdParty/tiff/tif_fax3.h \
-- ./3rdParty/tiff/tiffconf.h \
-- ./3rdParty/tiff/tiff.h \
-- ./3rdParty/tiff/tiffio.h \
-- ./3rdParty/tiff/tiffiop.h \
-- ./3rdParty/tiff/tiffvers.h \
-- ./3rdParty/tiff/tif_predict.h \
-- ./3rdParty/tiff/uvcode.h \
-- ./3rdParty/zlib/zconf.h \
-- ./3rdParty/zlib/zlib.h \
- ./AbstrConverter.h \
- ./AbstrGeoConverter.h \
- ./AnalyzeConverter.h \
-Index: imagevis3d-2.0.1/Tuvok/IO/IASSConverter.cpp
-===================================================================
---- imagevis3d-2.0.1.orig/Tuvok/IO/IASSConverter.cpp 2011-12-09 09:48:39.000000000 +0100
-+++ imagevis3d-2.0.1/Tuvok/IO/IASSConverter.cpp 2011-12-09 09:51:24.000000000 +0100
-@@ -38,7 +38,7 @@
- #include <sstream>
- #include "boost/cstdint.hpp"
- #ifndef TUVOK_NO_ZLIB
--# include "3rdParty/zlib/zlib.h"
-+# include "zlib.h"
- #endif
- #include "IASSConverter.h"
- #include <Basics/EndianConvert.h>
-Index: imagevis3d-2.0.1/Tuvok/IO/gzio.h
-===================================================================
---- imagevis3d-2.0.1.orig/Tuvok/IO/gzio.h 2011-12-09 09:48:39.000000000 +0100
-+++ imagevis3d-2.0.1/Tuvok/IO/gzio.h 2011-12-09 09:51:24.000000000 +0100
-@@ -31,7 +31,7 @@
- #define IV3D_GZIO_H
-
- #include <stdio.h>
--#include "3rdParty/zlib/zlib.h"
-+#include "zlib.h"
-
- #ifdef __cplusplus
- extern "C" {
More information about the debian-med-commit
mailing list