[Pkg-octave-commit] r1142 - in octaviz/trunk/debian: . patches
Thomas Weber
thomas-guest at alioth.debian.org
Tue Dec 25 19:18:36 UTC 2007
tags 401608 pending
thanks
Author: thomas-guest
Date: 2007-12-25 19:18:36 +0000 (Tue, 25 Dec 2007)
New Revision: 1142
Removed:
octaviz/trunk/debian/patches/40-revamped-build-system.patch
octaviz/trunk/debian/patches/60-liboctaviz-version-independent.patch
octaviz/trunk/debian/patches/60-vtkdata-path.patch
octaviz/trunk/debian/patches/70-add-widgets-kit.patch
Modified:
octaviz/trunk/debian/changelog
octaviz/trunk/debian/control
octaviz/trunk/debian/rules
Log:
Prepare for Octave 3.0.
New build system, making some patches superfluous.
Other patches integrated upstream.
Modified: octaviz/trunk/debian/changelog
===================================================================
--- octaviz/trunk/debian/changelog 2007-12-24 15:09:54 UTC (rev 1141)
+++ octaviz/trunk/debian/changelog 2007-12-25 19:18:36 UTC (rev 1142)
@@ -1,12 +1,24 @@
-octaviz (0.4.5-6) UNRELEASED; urgency=high
+octaviz (0.4.6+cvs20071225-1) UNRELEASED; urgency=high
+ [ Thomas Weber]
+ * Use upstream CVS snapshot
+ * This version is meant to work with Octave 3.0 (closes: #401608).
+ * Removed (all) patches:
+ - 40-revamped-build-system.patch
+ - 70-add-widgets-kit.patch
+ - 60-liboctaviz-version-independent.patch
+ - 60-vtkdata-path.patch
+ The patches have either been integrated upstream (widgets, vtkdata) or are
+ obsoleted by the new build system (revamped, liboctaviz)
+ * debian/rules: adapted to revamped build system
+ * debian/control: Build-depend on octave3.0-headers
+
[ Cyril Brulebois ]
* debian/control:
- Updated versioned B-D on octave2.1-headers (from 2.1.72-9 to 1:2.1.73-1)
to ensure the switch from gfortran to g77 occured, because gfortran
points now to gfortran-4.2, which leads to FTBFS:
``/usr/bin/ld: cannot find -lgfortranbegin'' (Closes: #432378).
- Urgency set to ``high'' accordingly.
- Added myself to the Uploaders field.
[ Rafael Laboissiere ]
Modified: octaviz/trunk/debian/control
===================================================================
--- octaviz/trunk/debian/control 2007-12-24 15:09:54 UTC (rev 1141)
+++ octaviz/trunk/debian/control 2007-12-25 19:18:36 UTC (rev 1142)
@@ -5,7 +5,7 @@
Uploaders: Rafael Laboissiere <rafael at debian.org>,
Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>
Build-Depends: debhelper (>= 5.0.0), cmake, libvtk5-dev (>= 5.0.1-4),
- octave2.1-headers (>= 1:2.1.73-14), lesstif2-dev, cdbs
+ octave3.0-headers, lesstif2-dev, cdbs
Standards-Version: 3.7.3
Homepage: http://octaviz.sourceforge.net/
Vcs-Svn: svn://svn.debian.org/svn/pkg-octave/octaviz/
Deleted: octaviz/trunk/debian/patches/40-revamped-build-system.patch
===================================================================
--- octaviz/trunk/debian/patches/40-revamped-build-system.patch 2007-12-24 15:09:54 UTC (rev 1141)
+++ octaviz/trunk/debian/patches/40-revamped-build-system.patch 2007-12-25 19:18:36 UTC (rev 1142)
@@ -1,616 +0,0 @@
-diff -Nur octaviz-0.4.5/CMakeLists.txt octaviz-0.4.5.new/CMakeLists.txt
---- octaviz-0.4.5/CMakeLists.txt 2006-10-23 01:01:33.000000000 +0000
-+++ octaviz-0.4.5.new/CMakeLists.txt 2006-11-21 06:40:13.635065943 +0000
-@@ -1,165 +1,239 @@
--# This file is a hacked CMakeLists.txt from ParaView/Octave
--# Thanks to Brad King.
--
--PROJECT(OCTAVIZ)
--
-- ## added from cmake FAQ, JJS 3/29/05; also needs the file cmake_uninstall.cmake.in
-- CONFIGURE_FILE(
-- "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
-- "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-- IMMEDIATE @ONLY)
--
-- ADD_CUSTOM_TARGET(uninstall
-- "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
-- ##
--
-- OPTION(USE_PREC_HEADERS "Use precompiled headers" OFF)
-- STRING(COMPARE EQUAL ${USE_PREC_HEADERS} "OFF" PCH_ON)
-- IF(PCH_ON)
-- SET(CXX_COMPILER_PCH "g++-3.4" CACHE STRING "CMake overides compiler environment varibles. Put the compiler name here.")
-- ENDIF(PCH_ON)
--
-- SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} /usr/local/lib/vtk /usr/lib/vtk)
--
-- FIND_PACKAGE(VTK)
-- IF(NOT VTK_FOUND)
-- MESSAGE(FATAL_ERROR "VTK is required. Please set VTK_DIR.")
-- ENDIF(NOT VTK_FOUND)
--
-- # load the needed compiler and linker settings to use VTK.
-- INCLUDE(${VTK_USE_FILE})
--
-- FIND_PACKAGE(X11)
-- IF(NOT X11_FOUND)
-- MESSAGE(FATAL_ERROR "X11 is required. Please install X11 development libraries.")
-- ENDIF(NOT X11_FOUND)
-- LINK_LIBRARIES(${X11_LIBRARIES} Xt)
--
-- # find octave-config
-- FIND_PROGRAM(OCTAVE_CONFIG octave-config)
-- IF(NOT OCTAVE_CONFIG)
-- MESSAGE(FATAL_ERROR "Octave is required. Please install Octave and rerun cmake.")
-- ENDIF(NOT OCTAVE_CONFIG)
--
-- # Set prefix from octave prefix
-- EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "-p PREFIX" OUTPUT_VARIABLE OCT_PREFIX_EXEC)
--
-- # check to see if OCT_PREFIX_EXEC is unset
-- # unset variables match exactly the name of the variable
-- IF(OCT_PREFIX_EXEC MATCHES "^OCT_PREFIX_EXEC$")
-- ELSE(OCT_PREFIX_EXEC MATCHES "^OCT_PREFIX_EXEC$")
-- # if OCT_PREFIX_EXEC has a value then cache the value
-- # so that OCT_PREFIX can be seen in all sub directories of
-- # the project
-- SET(OCT_PREFIX ${OCT_PREFIX_EXEC} CACHE INTERNAL "" FORCE)
-- ENDIF(OCT_PREFIX_EXEC MATCHES "^OCT_PREFIX_EXEC$")
-- SET(CMAKE_INSTALL_PREFIX ${OCT_PREFIX} CACHE PATH "Specifies the directory where .oct files will be installed." FORCE)
--
-- # Build the vtkOctave wrapping utility first.
-- SUBDIRS(Wrapping)
--
-- # Build octave wrappers for VTK kits.
-- SUBDIRS(Common Filtering Imaging Graphics IO)
-- SET(vtk_kits Common Filtering Imaging Graphics IO)
-- IF(VTK_USE_RENDERING)
-- SUBDIRS(Rendering)
-- SET(vtk_kits ${vtk_kits} Rendering)
-- ENDIF(VTK_USE_RENDERING)
-- IF(VTK_USE_HYBRID)
-- SUBDIRS(Hybrid)
-- SET(vtk_kits ${vtk_kits} Hybrid)
-- ENDIF(VTK_USE_HYBRID)
-- IF(VTK_USE_PATENTED)
-- SUBDIRS(Patented)
-- SET(vtk_kits ${vtk_kits} Patented)
-- ENDIF(VTK_USE_PATENTED)
-- IF(VTK_USE_PARALLEL)
-- SUBDIRS(Parallel)
-- SET(vtk_kits ${vtk_kits} Parallel)
-- ENDIF(VTK_USE_PARALLEL)
--
-- # Hack that creates symbolic links to functions
-- #ADD_CUSTOM_TARGET(create_links echo "Symbolic links created.")
-- #FOREACH(kit ${vtk_kits})
-- # ADD_CUSTOM_TARGET(create_links_${kit} cd ${kit}\; ${CMAKE_MAKE_PROGRAM} create_links)
-- # ADD_DEPENDENCIES(create_links create_links_${kit})
-- #ENDFOREACH(kit)
--
-- # Macro to create Octave wrapper functions
-- MACRO(OCTAVE_WRAP_VTK kit ukit deps)
-- # Hack for symbolic links
-- # ADD_CUSTOM_TARGET(create_links echo "Symlinked ${kit}")
--
-- INCLUDE(${VTK_KITS_DIR}/vtk${kit}Kit.cmake)
-- INCLUDE(${VTK_KITS_DIR}/vtk${kit}Kit.cmake)
--
-- # what we don't want or can't build;
-- # this is an ugly hack[TM] and should be fixed by e.g.
-- # including a list of not-to-be-built-functions shipped with
-- # Octaviz
-- SET(VTK_CLASS_WRAP_EXCLUDE_vtkLongLongArray 1)
-- SET(VTK_CLASS_WRAP_EXCLUDE_vtkSignedCharArray 1)
-- SET(VTK_CLASS_WRAP_EXCLUDE_vtkUnsignedLongLongArray 1)
--
-- SET(all_oct)
-- FOREACH(class ${VTK_${ukit}_CLASSES})
-- IF(NOT VTK_CLASS_WRAP_EXCLUDE_${class})
-- SET(all_oct ${all_oct} ${class}.oct)
-- ENDIF(NOT VTK_CLASS_WRAP_EXCLUDE_${class})
-- ENDFOREACH(class)
--
--# ADD_CUSTOM_TARGET(vtk${kit}.cc ALL cat ${all_ccs} > vtk${kit}.cc)
--
-- SET(oct_flags -I${VTK_${ukit}_HEADER_DIR} -I../Common)
-- SET(oct_link_flags -L${X11_LIBRARY_DIR} -lX11 -lXt -L${VTK_LIBRARY_DIRS} -lvtkCommon -lvtk${kit} -lvtkFiltering -lvtkGraphics)
--# ADD_CUSTOM_TARGET(vtk${kit}.oct ALL sleep 0\; mkoctfile ${oct_flags} ${oct_link_flags} -L../Common -loctaviz vtk${kit}.cc)
--
-- # Precompiled headers
-- IF(USE_PREC_HEADERS)
-- # Which flags will mkoctfile use?
-- SET (PCHFLAGS "")
--
-- EXEC_PROGRAM("mkoctfile" ARGS "-p CXXPICFLAG" OUTPUT_VARIABLE MKOCT_FLAGS_EXEC)
-- STRING(REGEX MATCHALL "[^ ]+" MKOCT_FLAGS_LIST ${MKOCT_FLAGS_EXEC})
-- FOREACH (flag ${MKOCT_FLAGS_LIST})
-- SET (PCHFLAGS ${PCHFLAGS} ${flag})
-- ENDFOREACH (flag ${MKOCT_FLAGS_LIST})
--
-- EXEC_PROGRAM("mkoctfile" ARGS "-p INCFLAGS" OUTPUT_VARIABLE MKOCT_FLAGS_EXEC)
-- STRING(REGEX MATCHALL "[^ ]+" MKOCT_FLAGS_LIST ${MKOCT_FLAGS_EXEC})
-- FOREACH (flag ${MKOCT_FLAGS_LIST})
-- SET (PCHFLAGS ${PCHFLAGS} ${flag})
-- ENDFOREACH (flag ${MKOCT_FLAGS_LIST})
--
-- EXEC_PROGRAM("mkoctfile" ARGS "-p XTRA_CXXFLAGS" OUTPUT_VARIABLE MKOCT_FLAGS_EXEC)
-- STRING(REGEX MATCHALL "[^ ]+" MKOCT_FLAGS_LIST ${MKOCT_FLAGS_EXEC})
-- FOREACH (flag ${MKOCT_FLAGS_LIST})
-- SET (PCHFLAGS ${PCHFLAGS} ${flag})
-- ENDFOREACH (flag ${MKOCT_FLAGS_LIST})
--
-- #MESSAGE(${PCHFLAGS})
--
-- ADD_CUSTOM_TARGET(OctavizCommon.h.gch ALL ${CXX_COMPILER_PCH} "-c" ${PCHFLAGS} ${oct_flags} ../Common/OctavizCommon.h)
-- ENDIF(USE_PREC_HEADERS)
--
-- EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "--oct-site-dir" OUTPUT_VARIABLE OCT_INST_DIR_EXEC)
-- # Remove prefix from oct install dir
-- STRING(REGEX REPLACE "${CMAKE_INSTALL_PREFIX}" "" OCT_INST_DIR ${OCT_INST_DIR_EXEC})
--
-- FOREACH(class ${VTK_${ukit}_CLASSES})
-- SET(full_name "${VTK_${ukit}_HEADER_DIR}/${class}.h")
-- IF(NOT VTK_CLASS_WRAP_EXCLUDE_${class})
-- ADD_CUSTOM_TARGET(${class}.cc ALL ../Wrapping/vtkWrapOctave ${full_name} ../Wrapping/hints 1 ${class}.cc)
-- ADD_CUSTOM_TARGET(${class}.oct ALL sleep 0 \; mkoctfile ${oct_flags} ${oct_link_flags} -L../Common -loctaviz ${class}.cc)
--# ADD_DEPENDENCIES(vtk${kit}.cc ${class}.cc)
-- # Hack for symbolic links
--# ADD_CUSTOM_TARGET(${class}_link echo Symlinking ${class}\; ln -s ${CMAKE_INSTALL_PREFIX}${OCT_INST_DIR}/octaviz/vtk${kit}.oct ${CMAKE_INSTALL_PREFIX}${OCT_INST_DIR}/octaviz/${class}.oct)
--# ADD_DEPENDENCIES(create_links ${class}_link)
-- ENDIF(NOT VTK_CLASS_WRAP_EXCLUDE_${class})
-- ENDFOREACH(class)
-- ENDMACRO(OCTAVE_WRAP_VTK)
--
-- # MARK_AS_ADVANCED(CMAKE_INSTALL_PREFIX)
--
-- SUBDIRS(Scripts)
-- SUBDIRS(Examples)
-+# This file is a hacked CMakeLists.txt from ParaView/Octave
-+# Thanks to Brad King.
-+
-+### A few notes:
-+# Install commands are always called with full paths; thus we don't need to
-+# strip CMAKE_INSTALL_PREFIX or any other prefix from them
-+#
-+# All calls to octave-config are done in this file; values are then put into
-+# the cache and used by subsequent CMakeLists.txt files. This makes it easier
-+# to adjust paths, for example for distributions
-+
-+
-+PROJECT(OCTAVIZ)
-+
-+OPTION(USE_PREC_HEADERS "Use precompiled headers" OFF)
-+STRING(COMPARE EQUAL ${USE_PREC_HEADERS} "OFF" PCH_ON)
-+IF(PCH_ON)
-+ SET(CXX_COMPILER_PCH "g++" CACHE STRING "CMake overides compiler environment variables. Put the compiler name here.")
-+ENDIF(PCH_ON)
-+
-+# We look in /usr/local/lib/vtk and /usr/lib/vtk for FindVTK.cmake
-+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} /usr/local/lib/vtk /usr/lib/vtk)
-+
-+FIND_PACKAGE(VTK)
-+IF(NOT VTK_FOUND)
-+ MESSAGE(FATAL_ERROR "VTK is required. Please set VTK_DIR.")
-+ENDIF(NOT VTK_FOUND)
-+
-+# Load the needed compiler and linker settings to use VTK.
-+INCLUDE(${VTK_USE_FILE})
-+
-+
-+# Find and link X11
-+FIND_PACKAGE(X11)
-+IF(NOT X11_FOUND)
-+ MESSAGE(FATAL_ERROR "X11 is required. Please install X11 development libraries.")
-+ENDIF(NOT X11_FOUND)
-+LINK_LIBRARIES(${X11_LIBRARIES} Xt)
-+
-+
-+# Find octave-config
-+FIND_PROGRAM(OCTAVE_CONFIG octave-config DOC "octave-config was found here")
-+IF(NOT OCTAVE_CONFIG)
-+ MESSAGE(FATAL_ERROR "Octave is required, but octave-config wasn't found. Please install Octave and rerun cmake.")
-+ENDIF(NOT OCTAVE_CONFIG)
-+
-+
-+
-+
-+### Get paths from octave-config and put them into the cache ###
-+
-+# Set cmake's install prefix from octave prefix
-+EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "-p PREFIX" OUTPUT_VARIABLE OCTAVE_PREFIX)
-+SET(CMAKE_INSTALL_PREFIX ${OCTAVE_PREFIX})
-+
-+
-+EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "--oct-site-dir"
-+ OUTPUT_VARIABLE OCTAVE_OCT_DIR)
-+SET(OCTAVIZ_OCT_DIR ${OCTAVE_OCT_DIR}/octaviz CACHE PATH
-+ "Octaviz's .oct files go into this directory")
-+
-+EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "--m-site-dir"
-+ OUTPUT_VARIABLE OCTAVE_M_DIR)
-+SET(OCTAVIZ_EXAMPLE_M_DIR ${OCTAVE_M_DIR}/octaviz/Examples CACHE PATH
-+ "Octaviz's example m-files go into this directory")
-+SET(OCTAVIZ_SCRIPTS_M_DIR ${OCTAVE_M_DIR}/octaviz/Scripts CACHE PATH
-+ "Octaviz's script m-files go into this directory")
-+
-+EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "-p OCTLIBDIR" OUTPUT_VARIABLE
-+ OCTAVE_LIBRARY_DIR_TEMP)
-+SET(OCTAVE_LIBRARY_DIR ${OCTAVE_LIBRARY_DIR_TEMP} CACHE PATH
-+ "Octave's library directory")
-+SET(OCTAVIZ_LIBRARY_DIR ${OCTAVE_LIBRARY_DIR} CACHE PATH
-+ "Octaviz's library goes into this directory")
-+
-+EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "-p OCTINCLUDEDIR" OUTPUT_VARIABLE
-+ OCTAVE_INCLUDE_DIR_TEMP)
-+SET(OCTAVE_INCLUDE_DIR ${OCTAVE_INCLUDE_DIR_TEMP} CACHE PATH
-+ "Octave's include directory")
-+
-+# These are normally not needed for the user
-+MARK_AS_ADVANCED(OCTAVE_LIBRARY_DIR OCTAVE_INCLUDE_DIR)
-+
-+### Setup include and link directories for all source files
-+INCLUDE_DIRECTORIES(${OCTAVE_INCLUDE_DIR} "${OCTAVE_INCLUDE_DIR}/octave" )
-+
-+
-+### helper macros ***
-+
-+# All helper macros add dummy .stamp targets to the global ALL target and add
-+# dependencies to the files they generate. This avoids unnecessary recompiles
-+
-+# convert a VTK header into a .cc file;
-+# we must have vtkWrapOctave before we begin with the .cc files, so we depend
-+# on it; also, the octaviz library in Common/ must have been built, since we
-+# link against it. This is a top-level target for cmake, so its (=the
-+# library's) name is sufficient
-+MACRO(ADD_OCTAVE_WRAPPER class full_name)
-+ ADD_CUSTOM_COMMAND(
-+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${class}.cc
-+ COMMAND ../Wrapping/vtkWrapOctave ${full_name}
-+ ../Wrapping/hints 1 ${class}.cc
-+ DEPENDS ${full_name} vtkWrapOctave octaviz
-+ COMMENT "Convert ${full_name} => ${class}.cc"
-+ )
-+ ADD_CUSTOM_TARGET(${class}.cc.stamp ALL
-+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${class}.cc)
-+ENDMACRO(ADD_OCTAVE_WRAPPER)
-+
-+
-+# convert a *generated* .cc file into a .oct file
-+# this macro assumes that the .cc source file lies in CMAKE_CURRENT_BINARY_DIR,
-+# i.e. it is a generated .cc file!
-+MACRO(ADD_OCT_FILE class flags)
-+ # command for building the .oct file from the generated .cc file
-+ ADD_CUSTOM_COMMAND(
-+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${class}.oct
-+ COMMAND mkoctfile ${flags}
-+ --output ${CMAKE_CURRENT_BINARY_DIR}/${class}.oct
-+ ${CMAKE_CURRENT_BINARY_DIR}/${class}.cc
-+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${class}.cc
-+ COMMENT "Compile VTK ${class}.cc => ${class}.oct"
-+ )
-+ ADD_CUSTOM_TARGET(${class}.oct.stamp ALL
-+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${class}.oct)
-+ENDMACRO(ADD_OCT_FILE)
-+
-+
-+
-+# convert a *typed* .cc file into a .oct file
-+# this macro assumes that the .cc source file lies in CMAKE_CURRENT_SOURCE_DIR,
-+# i.e. it is a .cc file typed with an editor! We copy the .cc files into the
-+# BINARY dir, because mkoctfile drops .o files in the directory where the .cc
-+# file resides
-+# This macro is used for Octaviz Common/ files
-+MACRO(ADD_OCTAVIZ_OCT_FILE class flags)
-+ ADD_CUSTOM_COMMAND(
-+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${class}.oct
-+ COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/${class}.cc
-+ ${CMAKE_CURRENT_BINARY_DIR}/${class}.cc
-+ COMMAND mkoctfile ${flags}
-+ --output ${CMAKE_CURRENT_BINARY_DIR}/${class}.oct
-+ ${CMAKE_CURRENT_BINARY_DIR}/${class}.cc
-+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${class}.cc octaviz
-+ COMMENT "Compile Octaviz ${class}.cc => ${class}.oct"
-+ )
-+ ADD_CUSTOM_TARGET(${class}.oct.stamp ALL
-+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${class}.oct)
-+ # we need the depends on octaviz in the above because we use it for the
-+ # .cc files in Common/, like vtk_init.cc. These files are not generated
-+ # by ADD_OCTAVE_WRAPPER, so they are not guaranteed to be built before
-+ # liboctaviz.so (in a parallel build environment, this shows!)
-+ENDMACRO(ADD_OCTAVIZ_OCT_FILE class flags)
-+
-+### Macro to create Octave wrapper functions ###
-+MACRO(OCTAVE_WRAP_VTK kit ukit deps)
-+
-+ INCLUDE(${VTK_KITS_DIR}/vtk${kit}Kit.cmake)
-+
-+ # what we don't want or can't build;
-+ # this is an ugly hack[TM] and should be fixed by e.g.
-+ # including a list of not-to-be-built-functions shipped with Octaviz
-+ SET(VTK_CLASS_WRAP_EXCLUDE_vtkLongLongArray 1)
-+ SET(VTK_CLASS_WRAP_EXCLUDE_vtkSignedCharArray 1)
-+ SET(VTK_CLASS_WRAP_EXCLUDE_vtkUnsignedLongLongArray 1)
-+
-+ # list all headers that should be built
-+ SET(all_oct)
-+ FOREACH(class ${VTK_${ukit}_CLASSES})
-+ IF(NOT VTK_CLASS_WRAP_EXCLUDE_${class})
-+ SET(all_oct ${all_oct} ${class}.oct)
-+ ENDIF(NOT VTK_CLASS_WRAP_EXCLUDE_${class})
-+ ENDFOREACH(class)
-+
-+ SET(oct_flags -I${VTK_${ukit}_HEADER_DIR} -I${CMAKE_SOURCE_DIR}/Common)
-+ SET(oct_link_flags -L${X11_LIBRARY_DIR} -lX11 -lXt
-+ -L${VTK_LIBRARY_DIRS} -lvtkCommon -lvtk${kit} -lvtkFiltering
-+ -lvtkGraphics -L${CMAKE_BINARY_DIR}/Common -loctaviz)
-+ # use CMAKE variables for paths, so we can do out-of-source
-+ # builds; we use the SOURCE version for the headers, because
-+ # they don't change and the BINARY version for the libraries,
-+ # because they are generated during the build
-+ #
-+ # for an explanation of these variables, see
-+ # http://www.cmake.org/Wiki/CMake_Useful_Variables
-+
-+ # Build .oct files for each member of a class
-+ FOREACH(class ${VTK_${ukit}_CLASSES})
-+ SET(full_name "${VTK_${ukit}_HEADER_DIR}/${class}.h")
-+ IF(NOT VTK_CLASS_WRAP_EXCLUDE_${class})
-+ # generate .cc file
-+ ADD_OCTAVE_WRAPPER(${class} ${full_name})
-+
-+ # compile .oct file
-+ SET(flags ${oct_flags} ${oct_link_flags})
-+ ADD_OCT_FILE(${class} "${flags}")
-+
-+ # install .oct file
-+ # use the PROGRAMS signature, so the .oct files have
-+ # their executable bit set; this is the default for
-+ # mkoctfilg
-+ INSTALL(PROGRAMS
-+ ${CMAKE_CURRENT_BINARY_DIR}/${class}.oct
-+ DESTINATION ${OCTAVIZ_OCT_DIR})
-+ ENDIF(NOT VTK_CLASS_WRAP_EXCLUDE_${class})
-+ ENDFOREACH(class)
-+ENDMACRO(OCTAVE_WRAP_VTK)
-+
-+
-+
-+# Build the vtkOctave wrapping utility first.
-+ADD_SUBDIRECTORY(Wrapping)
-+
-+# Build octave wrappers for VTK kits.
-+ADD_SUBDIRECTORY(Common)
-+ADD_SUBDIRECTORY(Examples)
-+ADD_SUBDIRECTORY(Filtering)
-+ADD_SUBDIRECTORY(Imaging)
-+ADD_SUBDIRECTORY(Graphics)
-+ADD_SUBDIRECTORY(IO)
-+ADD_SUBDIRECTORY(Parallel)
-+ADD_SUBDIRECTORY(Scripts)
-+SET(vtk_kits Common Filtering Imaging Graphics IO)
-+
-+IF(VTK_USE_RENDERING)
-+ ADD_SUBDIRECTORY(Rendering)
-+ SET(vtk_kits ${vtk_kits} Rendering)
-+ # Hybrid and Widgets are toggled by Rendering
-+ # http://public.kitware.com/pipermail/vtk-developers/2005-July/003385.html
-+ ADD_SUBDIRECTORY(Hybrid)
-+ SET(vtk_kits ${vtk_kits} Hybrid)
-+ ADD_SUBDIRECTORY(Widgets)
-+ SET(vtk_kits ${vtk_kits} Widgets)
-+ENDIF(VTK_USE_RENDERING)
-+
-+IF(VTK_USE_PATENTED)
-+ ADD_SUBDIRECTORY(Patented)
-+ SET(vtk_kits ${vtk_kits} Patented)
-+ENDIF(VTK_USE_PATENTED)
-diff -Nur octaviz-0.4.5/Common/CMakeLists.txt octaviz-0.4.5.new/Common/CMakeLists.txt
---- octaviz-0.4.5/Common/CMakeLists.txt 2004-10-28 01:58:52.000000000 +0000
-+++ octaviz-0.4.5.new/Common/CMakeLists.txt 2006-11-21 06:38:05.335042083 +0000
-@@ -1,30 +1,24 @@
- SET(KIT_WRAP_DEPS)
-
-+# Build liboctaviz.so and the common .oct files
-+ADD_LIBRARY(octaviz SHARED octaviz.cc)
-+
- OCTAVE_WRAP_VTK(Common COMMON "${KIT_WRAP_DEPS}")
--EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "-p OCTINCLUDEDIR" OUTPUT_VARIABLE OCT_INC_DIR)
--EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "-p OCTLIBDIR" OUTPUT_VARIABLE OCT_LIB_DIR)
--INCLUDE_DIRECTORIES(${OCT_INC_DIR} "${OCT_INC_DIR}/octave" )
-+
-+# We link all .oct files in this directory against the following libraries
- LINK_LIBRARIES(octinterp octave cruft vtkCommon)
--LINK_DIRECTORIES(${OCT_LIB_DIR})
--ADD_LIBRARY(octaviz SHARED octaviz.cc)
--ADD_CUSTOM_TARGET(vtk_init.oct ALL mkoctfile ${oct_flags} ${oct_link_flags} -loctaviz -L. vtk_init.cc)
--ADD_CUSTOM_TARGET(vtkInitializeInteractor.oct ALL mkoctfile ${oct_flags} ${oct_link_flags} -loctaviz -L. vtkInitializeInteractor.cc)
--ADD_CUSTOM_TARGET(vtkRaiseWindow.oct ALL mkoctfile ${oct_flags} ${oct_link_flags} -loctaviz -L. vtkRaiseWindow.cc)
--ADD_CUSTOM_TARGET(vtk_print_ref_table.oct ALL mkoctfile ${oct_flags} ${oct_link_flags} -loctaviz -L. vtk_print_ref_table.cc)
--ADD_CUSTOM_TARGET(vtk_get_pointer.oct ALL mkoctfile ${oct_flags} ${oct_link_flags} -loctaviz -L. vtk_get_pointer.cc)
--
--#ADD_CUSTOM_TARGET(vtkWindow.oct ALL mkoctfile ${oct_flags} ${oct_link_flags} vtkWindow.cc)
--
--# Get octave lib install directory
--EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "-p OCTLIBDIR" OUTPUT_VARIABLE OCT_LIB_DIR)
--INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz vtkInitializeInteractor.oct vtk_init.oct vtkRaiseWindow.oct vtk_get_pointer.oct vtk_print_ref_table.oct)
--INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz ${all_oct})
--#MESSAGE(${all_oct})
--
--# Get octave lib install directory
--EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "-p OCTLIBDIR" OUTPUT_VARIABLE OCT_LIB_DIR)
--# Remove prefix from octave lib install dir
--STRING(REGEX REPLACE "${CMAKE_INSTALL_PREFIX}" "" OUT_MTCH ${OCT_LIB_DIR})
--INSTALL_TARGETS(${OUT_MTCH} octaviz)
-+LINK_DIRECTORIES(${OCTAVE_LIBRARY_DIR})
-+
-+
-+FOREACH(src_file "vtk_init" "vtkInitializeInteractor" "vtkRaiseWindow"
-+ "vtk_print_ref_table" "vtk_get_pointer")
-+ # compile rule
-+ SET (flags ${oct_flags} ${oct_link_flags} -loctaviz -L.)
-+ ADD_OCTAVIZ_OCT_FILE(${src_file} "${flags}")
-+ # install rule
-+ INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${src_file}.oct
-+ DESTINATION ${OCTAVIZ_OCT_DIR})
-+ENDFOREACH(src_file)
-+
-+INSTALL(TARGETS octaviz LIBRARY DESTINATION ${OCTAVIZ_LIBRARY_DIR})
-
--
-\ No newline at end of file
-diff -Nur octaviz-0.4.5/Examples/CMakeLists.txt octaviz-0.4.5.new/Examples/CMakeLists.txt
---- octaviz-0.4.5/Examples/CMakeLists.txt 2004-09-21 22:50:41.000000000 +0000
-+++ octaviz-0.4.5.new/Examples/CMakeLists.txt 2006-11-21 06:38:05.335042083 +0000
-@@ -1,15 +1,6 @@
--EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "--m-site-dir" OUTPUT_VARIABLE M_INST_DIR_EXEC)
--# Remove prefix from scripts install dir
--STRING(REGEX REPLACE "${CMAKE_INSTALL_PREFIX}" "" M_INST_DIR ${M_INST_DIR_EXEC})
-+# all .m files
-+FILE (GLOB EXAMPLE_SCRIPTS *.m)
-
--EXEC_PROGRAM("pwd" OUTPUT_VARIABLE CURRENT_DIR_EXEC)
--IF(CURRENT_DIR_EXEC MATCHES "Examples")
-- SET(CURR_DIR "")
--ELSE(CURRENT_DIR_EXEC MATCHES "Examples")
-- SET(CURR_DIR "Examples")
--ENDIF(CURRENT_DIR_EXEC MATCHES "Examples")
--
--EXEC_PROGRAM("ls" ${CURR_DIR} ARGS "*.m" OUTPUT_VARIABLE EXAMPLE_SCRIPTS_EXEC)
--STRING(REGEX MATCHALL "[^\n]+" EXAMPLE_SCRIPTS ${EXAMPLE_SCRIPTS_EXEC})
--
--INSTALL_PROGRAMS(${M_INST_DIR}/octaviz/Examples ${EXAMPLE_SCRIPTS})
-+# and where they go (we don't change them, so we take them directly from the
-+# source directory
-+INSTALL(FILES ${EXAMPLE_SCRIPTS} DESTINATION ${OCTAVIZ_EXAMPLE_M_DIR})
-diff -Nur octaviz-0.4.5/Filtering/CMakeLists.txt octaviz-0.4.5.new/Filtering/CMakeLists.txt
---- octaviz-0.4.5/Filtering/CMakeLists.txt 2004-09-21 22:50:44.000000000 +0000
-+++ octaviz-0.4.5.new/Filtering/CMakeLists.txt 2006-11-21 06:38:05.335042083 +0000
-@@ -1,4 +1,4 @@
- SET(KIT_WRAP_DEPS Common)
- OCTAVE_WRAP_VTK(Filtering FILTERING "${KIT_WRAP_DEPS}")
--INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz ${all_oct})
-+# INSTALL(FILES ${all_oct} DESTINATION ${OCTAVIZ_OCT_DIR})
- #INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz vtkFiltering.oct)
-diff -Nur octaviz-0.4.5/Graphics/CMakeLists.txt octaviz-0.4.5.new/Graphics/CMakeLists.txt
---- octaviz-0.4.5/Graphics/CMakeLists.txt 2004-09-21 22:50:44.000000000 +0000
-+++ octaviz-0.4.5.new/Graphics/CMakeLists.txt 2006-11-21 06:38:05.336041873 +0000
-@@ -1,4 +1,3 @@
--SET(KIT_WRAP_DEPS Filtering)
-+SET(KIT_WRAP_DEPS Filtering)
- OCTAVE_WRAP_VTK(Graphics GRAPHICS "${KIT_WRAP_DEPS}")
--INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz ${all_oct})
--#INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz vtkGraphics.oct)
-\ No newline at end of file
-+# INSTALL(FILES ${all_oct} DESTINATION ${OCTAVIZ_OCT_DIR})
-diff -Nur octaviz-0.4.5/Hybrid/CMakeLists.txt octaviz-0.4.5.new/Hybrid/CMakeLists.txt
---- octaviz-0.4.5/Hybrid/CMakeLists.txt 2004-09-21 22:50:39.000000000 +0000
-+++ octaviz-0.4.5.new/Hybrid/CMakeLists.txt 2006-11-21 06:38:05.336041873 +0000
-@@ -1,4 +1,3 @@
- SET(KIT_WRAP_DEPS Rendering)
- OCTAVE_WRAP_VTK(Hybrid HYBRID "${KIT_WRAP_DEPS}")
--INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz ${all_oct})
--#INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz vtkHybrid.oct)
-\ No newline at end of file
-+# INSTALL(FILES ${all_oct} DESTINATION ${OCTAVIZ_OCT_DIR})
-diff -Nur octaviz-0.4.5/IO/CMakeLists.txt octaviz-0.4.5.new/IO/CMakeLists.txt
---- octaviz-0.4.5/IO/CMakeLists.txt 2004-09-21 22:50:38.000000000 +0000
-+++ octaviz-0.4.5.new/IO/CMakeLists.txt 2006-11-21 06:38:05.336041873 +0000
-@@ -1,4 +1,3 @@
- SET(KIT_WRAP_DEPS Filtering)
- OCTAVE_WRAP_VTK(IO IO "${KIT_WRAP_DEPS}")
--INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz ${all_oct})
--#INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz vtkIO.oct)
-+# INSTALL(FILES ${all_oct} DESTINATION ${OCTAVIZ_OCT_DIR})
-diff -Nur octaviz-0.4.5/Imaging/CMakeLists.txt octaviz-0.4.5.new/Imaging/CMakeLists.txt
---- octaviz-0.4.5/Imaging/CMakeLists.txt 2004-09-21 22:50:39.000000000 +0000
-+++ octaviz-0.4.5.new/Imaging/CMakeLists.txt 2006-11-21 06:38:05.336041873 +0000
-@@ -1,4 +1,3 @@
- SET(KIT_WRAP_DEPS Filtering)
- OCTAVE_WRAP_VTK(Imaging IMAGING "${KIT_WRAP_DEPS}")
--INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz ${all_oct})
--#INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz vtkImaging.oct)
-\ No newline at end of file
-+# INSTALL(FILES ${all_oct} DESTINATION ${OCTAVIZ_OCT_DIR})
-diff -Nur octaviz-0.4.5/Parallel/CMakeLists.txt octaviz-0.4.5.new/Parallel/CMakeLists.txt
---- octaviz-0.4.5/Parallel/CMakeLists.txt 2004-09-21 22:50:38.000000000 +0000
-+++ octaviz-0.4.5.new/Parallel/CMakeLists.txt 2006-11-21 06:38:05.336041873 +0000
-@@ -1,4 +1,3 @@
- SET(KIT_WRAP_DEPS Rendering)
- OCTAVE_WRAP_VTK(Parallel PARALLEL "${KIT_WRAP_DEPS}")
--#INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz vtkRendering.oct)
--INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz ${all_oct})
-+# INSTALL(FILES ${all_oct} DESTINATION ${OCTAVIZ_OCT_DIR})
-diff -Nur octaviz-0.4.5/Patented/CMakeLists.txt octaviz-0.4.5.new/Patented/CMakeLists.txt
---- octaviz-0.4.5/Patented/CMakeLists.txt 2004-09-21 22:50:38.000000000 +0000
-+++ octaviz-0.4.5.new/Patented/CMakeLists.txt 2006-11-21 06:38:05.336041873 +0000
-@@ -1,4 +1,3 @@
- SET(KIT_WRAP_DEPS Rendering)
- OCTAVE_WRAP_VTK(Patented PATENTED "${KIT_WRAP_DEPS}")
--INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz ${all_oct})
--#INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz vtkPatented.oct)
-\ No newline at end of file
-+# INSTALL(FILES ${all_oct} DESTINATION ${(OCTAVIZ_OCT_DIR})
-diff -Nur octaviz-0.4.5/Rendering/CMakeLists.txt octaviz-0.4.5.new/Rendering/CMakeLists.txt
---- octaviz-0.4.5/Rendering/CMakeLists.txt 2004-09-21 22:50:39.000000000 +0000
-+++ octaviz-0.4.5.new/Rendering/CMakeLists.txt 2006-11-21 06:38:05.336041873 +0000
-@@ -1,4 +1,3 @@
- SET(KIT_WRAP_DEPS Graphics Imaging IO)
- OCTAVE_WRAP_VTK(Rendering RENDERING "${KIT_WRAP_DEPS}")
--INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz ${all_oct})
--#INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz vtkRendering.oct)
-\ No newline at end of file
-+# INSTALL(FILES ${all_oct} DESTINATION ${OCTAVIZ_OCT_DIR})
-diff -Nur octaviz-0.4.5/Scripts/CMakeLists.txt octaviz-0.4.5.new/Scripts/CMakeLists.txt
---- octaviz-0.4.5/Scripts/CMakeLists.txt 2004-09-21 22:50:43.000000000 +0000
-+++ octaviz-0.4.5.new/Scripts/CMakeLists.txt 2006-11-21 06:38:05.336041873 +0000
-@@ -1,15 +1,17 @@
--EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "--m-site-dir" OUTPUT_VARIABLE M_INST_DIR_EXEC)
--# Remove prefix from scripts install dir
--STRING(REGEX REPLACE "${CMAKE_INSTALL_PREFIX}" "" M_INST_DIR ${M_INST_DIR_EXEC})
-+# all .m files
-+FILE(GLOB M_SCRIPTS "*.m")
-
--EXEC_PROGRAM("pwd" OUTPUT_VARIABLE CURRENT_DIR_EXEC)
--IF(CURRENT_DIR_EXEC MATCHES "Scripts")
-- SET(CURR_DIR "")
--ELSE(CURRENT_DIR_EXEC MATCHES "Scripts")
-- SET(CURR_DIR "Scripts")
--ENDIF(CURRENT_DIR_EXEC MATCHES "Scripts")
-+# copy them into an out-of-source build tree
-+FOREACH(MFILE ${M_SCRIPTS})
-+ # strip the path from MFILE
-+ GET_FILENAME_COMPONENT(MFILE ${MFILE} NAME)
-
--EXEC_PROGRAM("ls" ${CURR_DIR} ARGS "*.m" OUTPUT_VARIABLE M_SCRIPTS_EXEC)
--STRING(REGEX MATCHALL "[^\n]+" M_SCRIPTS ${M_SCRIPTS_EXEC})
-+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${MFILE}
-+ ${CMAKE_CURRENT_BINARY_DIR}/${MFILE})
-+
-+ # install rule for each file; we take the BINARY_DIR because
-+ # vtkGetDataRoot.m changes
-+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${MFILE}
-+ DESTINATION ${OCTAVIZ_SCRIPTS_M_DIR})
-+ENDFOREACH(MFILE)
-
--INSTALL_PROGRAMS(${M_INST_DIR}/octaviz ${M_SCRIPTS})
-diff -Nur octaviz-0.4.5/Testing/CMakeLists.txt octaviz-0.4.5.new/Testing/CMakeLists.txt
---- octaviz-0.4.5/Testing/CMakeLists.txt 2004-09-21 22:50:44.000000000 +0000
-+++ octaviz-0.4.5.new/Testing/CMakeLists.txt 2006-11-21 06:38:05.337041663 +0000
-@@ -1,3 +1,5 @@
-+# This file is not used!!!
-+
- INCLUDE_DIRECTORIES(${PARAVIEW_SOURCE_DIR}/ClientServer)
-
- ADD_EXECUTABLE(TestThreads TestThreads.cxx)
-diff -Nur octaviz-0.4.5/Wrapping/CMakeLists.txt octaviz-0.4.5.new/Wrapping/CMakeLists.txt
---- octaviz-0.4.5/Wrapping/CMakeLists.txt 2004-09-21 22:50:40.000000000 +0000
-+++ octaviz-0.4.5.new/Wrapping/CMakeLists.txt 2006-11-21 06:38:05.337041663 +0000
-@@ -1 +1,6 @@
- ADD_EXECUTABLE(vtkWrapOctave vtkWrapOctave.c vtkParse.tab.c)
-+
-+# We need the hints file after we have built vtkWrapOctave
-+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/hints
-+ ${CMAKE_CURRENT_BINARY_DIR}/hints
-+ COPYONLY)
Deleted: octaviz/trunk/debian/patches/60-liboctaviz-version-independent.patch
===================================================================
--- octaviz/trunk/debian/patches/60-liboctaviz-version-independent.patch 2007-12-24 15:09:54 UTC (rev 1141)
+++ octaviz/trunk/debian/patches/60-liboctaviz-version-independent.patch 2007-12-25 19:18:36 UTC (rev 1142)
@@ -1,13 +0,0 @@
-diff -Nur octaviz-0.4.0+cvs20060921/CMakeLists.txt octaviz-0.4.0+cvs20060921.new/CMakeLists.txt
---- octaviz-0.4.0+cvs20060921/CMakeLists.txt 2006-11-10 11:38:07.486605842 +0000
-+++ octaviz-0.4.0+cvs20060921.new/CMakeLists.txt 2006-11-10 11:39:25.762147402 +0000
-@@ -171,7 +171,8 @@
- SET(oct_flags -I${VTK_${ukit}_HEADER_DIR} -I${CMAKE_SOURCE_DIR}/Common)
- SET(oct_link_flags -L${X11_LIBRARY_DIR} -lX11 -lXt
- -L${VTK_LIBRARY_DIRS} -lvtkCommon -lvtk${kit} -lvtkFiltering
-- -lvtkGraphics -L${CMAKE_BINARY_DIR}/Common -loctaviz)
-+ -lvtkGraphics -L${CMAKE_BINARY_DIR}/Common -loctaviz
-+ -Wl,-rpath=/usr/lib/octaviz)
- # use CMAKE variables for paths, so we can do out-of-source
- # builds; we use the SOURCE version for the headers, because
- # they don't change and the BINARY version for the libraries,
Deleted: octaviz/trunk/debian/patches/60-vtkdata-path.patch
===================================================================
--- octaviz/trunk/debian/patches/60-vtkdata-path.patch 2007-12-24 15:09:54 UTC (rev 1141)
+++ octaviz/trunk/debian/patches/60-vtkdata-path.patch 2007-12-25 19:18:36 UTC (rev 1142)
@@ -1,98 +0,0 @@
-diff -Nur octaviz-0.4.5/Examples/PolyCut.m octaviz-0.4.5.new/Examples/PolyCut.m
---- octaviz-0.4.5/Examples/PolyCut.m 2004-09-21 22:50:41.000000000 +0000
-+++ octaviz-0.4.5.new/Examples/PolyCut.m 2006-11-24 14:18:32.509476763 +0000
-@@ -6,7 +6,9 @@
- % First start by reading a cow model. We also generate surface normals for;
- % prettier rendering.;
- cow = vtkBYUReader();
--cow.SetGeometryFileName("/usr/share/vtkdata/Data/Viewpoint/cow.g");
-+##cow.SetGeometryFileName("/usr/share/vtkdata/Data/Viewpoint/cow.g");
-+VTK_DATA_ROOT = vtkGetDataRoot();
-+cow.SetGeometryFileName(strcat(VTK_DATA_ROOT,"/Data/Viewpoint/cow.g"));
- cowNormals = vtkPolyDataNormals();
- cowNormals.SetInput(cow.GetOutput());
-
-@@ -103,4 +105,4 @@
-
- %renWin.SetSize(300, 300);
-
--vtk_update(f);
-\ No newline at end of file
-+vtk_update(f);
-diff -Nur octaviz-0.4.5/Examples/vtk_image_demo.m octaviz-0.4.5.new/Examples/vtk_image_demo.m
---- octaviz-0.4.5/Examples/vtk_image_demo.m 2004-09-21 22:50:43.000000000 +0000
-+++ octaviz-0.4.5.new/Examples/vtk_image_demo.m 2006-11-24 14:18:32.510476553 +0000
-@@ -18,7 +18,9 @@
-
- reader = vtkPNGReader();
- reader.SetDataSpacing(0.8, 0.8, 1.5)
--reader.SetFileName("/usr/share/vtkdata/Data/fullhead15.png")
-+% reader.SetFileName("/usr/share/vtkdata/Data/fullhead15.png")
-+VTK_DATA_ROOT = vtkGetDataRoot();
-+reader.SetFileName(strcat(VTK_DATA_ROOT,"/Data/fullhead15.png"));
- shiftScale = vtkImageShiftScale();
- shiftScale.SetInput(reader.GetOutput())
- shiftScale.SetShift(0)
-diff -Nur octaviz-0.4.5/Examples/xyPlot.m octaviz-0.4.5.new/Examples/xyPlot.m
---- octaviz-0.4.5/Examples/xyPlot.m 2004-09-21 22:50:41.000000000 +0000
-+++ octaviz-0.4.5.new/Examples/xyPlot.m 2006-11-24 14:18:32.510476553 +0000
-@@ -14,10 +14,11 @@
-
- vtk_init
-
-+VTK_DATA_ROOT = vtkGetDataRoot();
- % Create a PLOT3D reader and load the data.
- pl3d = vtkPLOT3DReader("New");
-- pl3d.SetXYZFileName("/usr/share/vtkdata/Data/combxyz.bin")
-- pl3d.SetQFileName("/usr/share/vtkdata/Data/combq.bin")
-+ pl3d.SetXYZFileName(strcat(VTK_DATA_ROOT,"/Data/combxyz.bin"));
-+ pl3d.SetQFileName(strcat(VTK_DATA_ROOT,"/Data/combq.bin"));
- pl3d.SetScalarFunctionNumber(100)
- pl3d.SetVectorFunctionNumber(202)
- pl3d.Update()
-diff -Nur octaviz-0.4.5/Scripts/vtkGetDataRoot.m octaviz-0.4.5.new/Scripts/vtkGetDataRoot.m
---- octaviz-0.4.5/Scripts/vtkGetDataRoot.m 2005-04-21 17:04:22.000000000 +0000
-+++ octaviz-0.4.5.new/Scripts/vtkGetDataRoot.m 2006-11-24 14:22:58.446568914 +0000
-@@ -2,6 +2,41 @@
-
- ## I guess this is a locally set variable; should put this in documents
- ## f = "/usr/share/vtkdata";
-- f = "/usr/local/share/vtk/VTKData-release-4-4";
-+
-+ f = "";
-+
-+ ## The file that marks the VTKData/ directory
-+ readme = "VTKData.readme";
-+
-+ ## check for a possible environmental variable
-+ env_data_root = getenv("VTK_DATA_ROOT");
-+
-+ ## set at Octaviz's compile time
-+ oct_data_root = "@VTK_DATA_ROOT@";
-+
-+ ## locally set path
-+ local_data_root = "/usr/local/share/VTKData";
-+
-+ data_root_path = [ env_data_root; local_data_root; oct_data_root ];
-+
-+ ## check where we have the readme file
-+ if (! isempty(data_root_path))
-+ for i=[1:rows(data_root_path)]
-+ curpath = strrep(data_root_path(i, :), " ", "");
-+ ## remove all spaces; Octave pads all strings in data_root_path to the
-+ ## same length
-+ filename = [curpath, filesep, readme];
-+ if (! isempty(stat(filename)))
-+ f = curpath;
-+ break;
-+ endif
-+ endfor
-+ else
-+ error("Empty search path for VTK_DATA_ROOT!");
-+ endif
-+
-+ if (isempty(f))
-+ error([readme, " not found! \n\t Did you install the vtkdata package?"]);
-+ endif
-
- endfunction
Deleted: octaviz/trunk/debian/patches/70-add-widgets-kit.patch
===================================================================
--- octaviz/trunk/debian/patches/70-add-widgets-kit.patch 2007-12-24 15:09:54 UTC (rev 1141)
+++ octaviz/trunk/debian/patches/70-add-widgets-kit.patch 2007-12-25 19:18:36 UTC (rev 1142)
@@ -1,7 +0,0 @@
-diff -Nur octaviz-0.4.0+cvs20060921/Widgets/CMakeLists.txt octaviz-0.4.0+cvs20060921.new/Widgets/CMakeLists.txt
---- octaviz-0.4.0+cvs20060921/Widgets/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000
-+++ octaviz-0.4.0+cvs20060921.new/Widgets/CMakeLists.txt 2006-11-10 11:44:00.332409624 +0000
-@@ -0,0 +1,3 @@
-+SET(KIT_WRAP_DEPS Rendering)
-+OCTAVE_WRAP_VTK(Widgets WIDGETS "${KIT_WRAP_DEPS}")
-+#INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz vtkWidgets.oct)
Modified: octaviz/trunk/debian/rules
===================================================================
--- octaviz/trunk/debian/rules 2007-12-24 15:09:54 UTC (rev 1141)
+++ octaviz/trunk/debian/rules 2007-12-25 19:18:36 UTC (rev 1142)
@@ -29,14 +29,6 @@
deboct = $(debdir)$(OCTDIR)
debfcn = $(debdir)$(MDIR)
-# Needed to override dangling symlink on the autobuilders. The issues with the
-# autobuilders need to be resolved post-etch
-OCT_VER = $(shell octave --version | grep --only-matching 2.1.[[:xdigit:]]*)
-
-# avoid warnings coming down from VTK
-CXXFLAGS += -Wno-deprecated
-export CXXFLAGS
-
cmake: cmake-stamp
cmake-stamp:
dh_testdir
@@ -48,18 +40,14 @@
( cd build ; \
cmake \
-DCMAKE_SKIP_RPATH:BOOL=YES \
+ -DOCTAVIZ_RPATH:PATH=/usr/lib/octaviz \
+ -DOCTAVIZ_SHARED_DIR:PATH=/usr/lib/octaviz \
-DVTK_DIR:PATH=/usr/lib/vtk-5.0 \
-DVTK_DATA_ROOT:PATH=/usr/share/VTKData \
- -DOCTAVE_CONFIG:FILEPATH=/usr/bin/octave-config-$(OCT_VER) \
- -DOCTAVE_OCT_DIR:PATH=$(OCTDIR) \
- -DOCTAVE_M_DIR:PATH=$(MDIR) \
-DOCTAVIZ_OCT_DIR:PATH=$(OCTDIR)/octaviz \
- -DOCTAVIZ_EXAMPLE_M_DIR:PATH=$(docdir)/examples \
- -DOCTAVIZ_SCRIPTS_M_DIR:PATH=$(MDIR)/octaviz \
- -DOCTAVIZ_LIBRARY_DIR:PATH=/usr/lib/octaviz \
+ -DOCTAVIZ_EXAMPLES_DIR:PATH=$(docdir)/examples \
+ -DOCTAVIZ_M_DIR:PATH=$(MDIR)/octaviz \
.. )
- # we must set the OCTAVIZ_* variables directly; changes in
- # OCTAVE_OCT_DIR are not passed to them!
touch cmake-stamp
build: build-stamp
@@ -77,7 +65,7 @@
binary-post-install/octaviz::
dh_installdirs $(docdir) $(OCTDIR) $(MDIR)
- find $(debdir) -name \*.m | xargs -if chmod -x f
+ #find $(debdir) -name \*.m | xargs -if chmod -x f
binary-predeb/octaviz::
octave-depends
More information about the Pkg-octave-commit
mailing list