[Pkg-octave-commit] rev 799 - in trunk/packages/octaviz/debian: .
patches
Thomas Weber
thomas-guest at alioth.debian.org
Mon Nov 13 14:32:51 CET 2006
Author: thomas-guest
Date: 2006-11-13 14:32:51 +0100 (Mon, 13 Nov 2006)
New Revision: 799
Removed:
trunk/packages/octaviz/debian/patches/50-cast-pointer.patch
trunk/packages/octaviz/debian/patches/50-unescape-strings-for-gcc.patch
Modified:
trunk/packages/octaviz/debian/changelog
trunk/packages/octaviz/debian/control
trunk/packages/octaviz/debian/patches/40-revamped-build-system.patch
trunk/packages/octaviz/debian/patches/60-vtkdata-path.patch
trunk/packages/octaviz/debian/rules
Log:
Add a version to vtkdata's suggest, to ensure we have a package with its files
in /usr/share/VTKData
Modify 40-revamped-build-system.patch for new upstream version
Modify 60-vtkdata-path.path for new VTK_DATA_ROOT path
Drop patches that are applied upstream
Modified: trunk/packages/octaviz/debian/changelog
===================================================================
--- trunk/packages/octaviz/debian/changelog 2006-11-10 14:32:32 UTC (rev 798)
+++ trunk/packages/octaviz/debian/changelog 2006-11-13 13:32:51 UTC (rev 799)
@@ -1,18 +1,27 @@
-octaviz (0.4.0+cvs20060921-3) unstable; urgency=low
+octaviz (0.4.5-1) unstable; urgency=low
NOT YET RELEASED!
[ Thomas Weber ]
+ * New upstream release
* Dropped Patches:
50-out-of-tree-build.patch
50-exclude-unbuildable-headers.patch
+
These patches have been integrated into 40-revamped-build-system.patch
+ 50-cast-pointer.patch
+ 50-unescape-strings-for-gcc.patch
+ These patches have been integrated upstream.
* Adapted patches:
60-liboctaviz-version-independent.patch: adapted for
40-revamped-build-system
+ 60-vtkdata-path: adapted for new VTK_DATA_ROOT=/usr/share/VTKData
* New Patches:
70-add-widgets-kit.patch: Add Widgets/ subdirectory and parse it (Closes:
#396497)
+ 40-revamped-build-system: modify upstream's build system in a heavy way,
+ making it possible to do out-of-source builds and/or parallel builds
+ * Version the suggests on vtkdata for new VTK_DATA_ROOT path
--
Modified: trunk/packages/octaviz/debian/control
===================================================================
--- trunk/packages/octaviz/debian/control 2006-11-10 14:32:32 UTC (rev 798)
+++ trunk/packages/octaviz/debian/control 2006-11-13 13:32:51 UTC (rev 799)
@@ -10,7 +10,7 @@
Package: octaviz
Architecture: any
Depends: ${shlibs:Depends}, ${octave:Depends}
-Suggests: vtkdata
+Suggests: vtkdata (>= 5.0.0)
Description: 3D visualization system for Octave
Octaviz is a visualization system for Octave. It is a wrapper that
makes all VTK classes accessible from within Octave using the same
Modified: trunk/packages/octaviz/debian/patches/40-revamped-build-system.patch
===================================================================
--- trunk/packages/octaviz/debian/patches/40-revamped-build-system.patch 2006-11-10 14:32:32 UTC (rev 798)
+++ trunk/packages/octaviz/debian/patches/40-revamped-build-system.patch 2006-11-13 13:32:51 UTC (rev 799)
@@ -1,12 +1,22 @@
-diff -Nur octaviz-0.4.0+cvs20060921/CMakeLists.txt octaviz-0.4.0+cvs20060921.new/CMakeLists.txt
---- octaviz-0.4.0+cvs20060921/CMakeLists.txt 2004-10-28 01:58:52.000000000 +0000
-+++ octaviz-0.4.0+cvs20060921.new/CMakeLists.txt 2006-11-10 11:32:50.516244268 +0000
-@@ -1,147 +1,234 @@
+diff -Nur octaviz/CMakeLists.txt octaviz.new/CMakeLists.txt
+--- octaviz/CMakeLists.txt 2006-11-13 10:59:17.355774000 +0000
++++ octaviz.new/CMakeLists.txt 2006-11-13 12:25:35.647040165 +0000
+@@ -1,165 +1,234 @@
-# 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)
@@ -86,7 +96,15 @@
-
- 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})
@@ -383,10 +401,10 @@
+
+ADD_SUBDIRECTORY(Scripts)
+ADD_SUBDIRECTORY(Examples)
-diff -Nur octaviz-0.4.0+cvs20060921/Common/CMakeLists.txt octaviz-0.4.0+cvs20060921.new/Common/CMakeLists.txt
---- octaviz-0.4.0+cvs20060921/Common/CMakeLists.txt 2004-10-28 01:58:52.000000000 +0000
-+++ octaviz-0.4.0+cvs20060921.new/Common/CMakeLists.txt 2006-11-10 11:32:50.516244268 +0000
-@@ -1,30 +1,25 @@
+diff -Nur octaviz/Common/CMakeLists.txt octaviz.new/Common/CMakeLists.txt
+--- octaviz/Common/CMakeLists.txt 2006-11-13 10:59:17.355774000 +0000
++++ octaviz.new/Common/CMakeLists.txt 2006-11-13 12:26:03.570158332 +0000
+@@ -1,30 +1,24 @@
SET(KIT_WRAP_DEPS)
+# Build liboctaviz.so and the common .oct files
@@ -431,17 +449,16 @@
+ # install rule
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${src_file}.oct
+ DESTINATION ${OCTAVIZ_OCT_DIR})
-+ # FIXME: TW: Die permissions der so installierten Dateien noch ueberpruefen
+ENDFOREACH(src_file)
+
+INSTALL(TARGETS octaviz LIBRARY DESTINATION ${OCTAVIZ_LIBRARY_DIR})
-
\ No newline at end of file
-diff -Nur octaviz-0.4.0+cvs20060921/Examples/CMakeLists.txt octaviz-0.4.0+cvs20060921.new/Examples/CMakeLists.txt
---- octaviz-0.4.0+cvs20060921/Examples/CMakeLists.txt 2004-09-21 22:50:41.000000000 +0000
-+++ octaviz-0.4.0+cvs20060921.new/Examples/CMakeLists.txt 2006-11-10 11:32:50.517244058 +0000
-@@ -1,15 +1,13 @@
+diff -Nur octaviz/Examples/CMakeLists.txt octaviz.new/Examples/CMakeLists.txt
+--- octaviz/Examples/CMakeLists.txt 2006-11-13 10:59:17.356774000 +0000
++++ octaviz.new/Examples/CMakeLists.txt 2006-11-13 12:29:17.445320943 +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})
@@ -454,32 +471,26 @@
-ELSE(CURRENT_DIR_EXEC MATCHES "Examples")
- SET(CURR_DIR "Examples")
-ENDIF(CURRENT_DIR_EXEC MATCHES "Examples")
-+# copy them into an out-of-source build tree
-+# FOREACH(MFILE EXAMPLE_SCRIPTS)
-+# CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${MFILE}
-+# ${CMAKE_CURRENT_BINARY_DIR}/${MFILE}
-+# COPYONLY)
-+# ENDFOREACH(MFILE)
-
+-
-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
++# 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})
-+# TW: FIXME: evtl. current_binary_dir mit foreach schleife
-diff -Nur octaviz-0.4.0+cvs20060921/Filtering/CMakeLists.txt octaviz-0.4.0+cvs20060921.new/Filtering/CMakeLists.txt
---- octaviz-0.4.0+cvs20060921/Filtering/CMakeLists.txt 2004-09-21 22:50:44.000000000 +0000
-+++ octaviz-0.4.0+cvs20060921.new/Filtering/CMakeLists.txt 2006-11-10 11:32:50.517244058 +0000
+diff -Nur octaviz/Filtering/CMakeLists.txt octaviz.new/Filtering/CMakeLists.txt
+--- octaviz/Filtering/CMakeLists.txt 2006-11-13 10:59:17.356774000 +0000
++++ octaviz.new/Filtering/CMakeLists.txt 2006-11-13 12:25:35.648039955 +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.0+cvs20060921/Graphics/CMakeLists.txt octaviz-0.4.0+cvs20060921.new/Graphics/CMakeLists.txt
---- octaviz-0.4.0+cvs20060921/Graphics/CMakeLists.txt 2004-09-21 22:50:44.000000000 +0000
-+++ octaviz-0.4.0+cvs20060921.new/Graphics/CMakeLists.txt 2006-11-10 11:32:50.517244058 +0000
+diff -Nur octaviz/Graphics/CMakeLists.txt octaviz.new/Graphics/CMakeLists.txt
+--- octaviz/Graphics/CMakeLists.txt 2006-11-13 10:59:17.356774000 +0000
++++ octaviz.new/Graphics/CMakeLists.txt 2006-11-13 12:25:35.648039955 +0000
@@ -1,4 +1,3 @@
-SET(KIT_WRAP_DEPS Filtering)
+SET(KIT_WRAP_DEPS Filtering)
@@ -488,9 +499,9 @@
-#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.0+cvs20060921/Hybrid/CMakeLists.txt octaviz-0.4.0+cvs20060921.new/Hybrid/CMakeLists.txt
---- octaviz-0.4.0+cvs20060921/Hybrid/CMakeLists.txt 2004-09-21 22:50:39.000000000 +0000
-+++ octaviz-0.4.0+cvs20060921.new/Hybrid/CMakeLists.txt 2006-11-10 11:32:50.517244058 +0000
+diff -Nur octaviz/Hybrid/CMakeLists.txt octaviz.new/Hybrid/CMakeLists.txt
+--- octaviz/Hybrid/CMakeLists.txt 2006-11-13 10:59:17.356774000 +0000
++++ octaviz.new/Hybrid/CMakeLists.txt 2006-11-13 12:25:35.648039955 +0000
@@ -1,4 +1,3 @@
SET(KIT_WRAP_DEPS Rendering)
OCTAVE_WRAP_VTK(Hybrid HYBRID "${KIT_WRAP_DEPS}")
@@ -498,18 +509,18 @@
-#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.0+cvs20060921/IO/CMakeLists.txt octaviz-0.4.0+cvs20060921.new/IO/CMakeLists.txt
---- octaviz-0.4.0+cvs20060921/IO/CMakeLists.txt 2004-09-21 22:50:38.000000000 +0000
-+++ octaviz-0.4.0+cvs20060921.new/IO/CMakeLists.txt 2006-11-10 11:32:50.517244058 +0000
+diff -Nur octaviz/IO/CMakeLists.txt octaviz.new/IO/CMakeLists.txt
+--- octaviz/IO/CMakeLists.txt 2006-11-13 10:59:17.356774000 +0000
++++ octaviz.new/IO/CMakeLists.txt 2006-11-13 12:25:35.648039955 +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.0+cvs20060921/Imaging/CMakeLists.txt octaviz-0.4.0+cvs20060921.new/Imaging/CMakeLists.txt
---- octaviz-0.4.0+cvs20060921/Imaging/CMakeLists.txt 2004-09-21 22:50:39.000000000 +0000
-+++ octaviz-0.4.0+cvs20060921.new/Imaging/CMakeLists.txt 2006-11-10 11:32:50.517244058 +0000
+diff -Nur octaviz/Imaging/CMakeLists.txt octaviz.new/Imaging/CMakeLists.txt
+--- octaviz/Imaging/CMakeLists.txt 2006-11-13 10:59:17.356774000 +0000
++++ octaviz.new/Imaging/CMakeLists.txt 2006-11-13 12:25:35.648039955 +0000
@@ -1,4 +1,3 @@
SET(KIT_WRAP_DEPS Filtering)
OCTAVE_WRAP_VTK(Imaging IMAGING "${KIT_WRAP_DEPS}")
@@ -517,18 +528,18 @@
-#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.0+cvs20060921/Parallel/CMakeLists.txt octaviz-0.4.0+cvs20060921.new/Parallel/CMakeLists.txt
---- octaviz-0.4.0+cvs20060921/Parallel/CMakeLists.txt 2004-09-21 22:50:38.000000000 +0000
-+++ octaviz-0.4.0+cvs20060921.new/Parallel/CMakeLists.txt 2006-11-10 11:32:50.517244058 +0000
+diff -Nur octaviz/Parallel/CMakeLists.txt octaviz.new/Parallel/CMakeLists.txt
+--- octaviz/Parallel/CMakeLists.txt 2006-11-13 10:59:17.356774000 +0000
++++ octaviz.new/Parallel/CMakeLists.txt 2006-11-13 12:25:35.649039744 +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.0+cvs20060921/Patented/CMakeLists.txt octaviz-0.4.0+cvs20060921.new/Patented/CMakeLists.txt
---- octaviz-0.4.0+cvs20060921/Patented/CMakeLists.txt 2004-09-21 22:50:38.000000000 +0000
-+++ octaviz-0.4.0+cvs20060921.new/Patented/CMakeLists.txt 2006-11-10 11:32:50.518243847 +0000
+diff -Nur octaviz/Patented/CMakeLists.txt octaviz.new/Patented/CMakeLists.txt
+--- octaviz/Patented/CMakeLists.txt 2006-11-13 10:59:17.357774000 +0000
++++ octaviz.new/Patented/CMakeLists.txt 2006-11-13 12:25:35.649039744 +0000
@@ -1,4 +1,3 @@
SET(KIT_WRAP_DEPS Rendering)
OCTAVE_WRAP_VTK(Patented PATENTED "${KIT_WRAP_DEPS}")
@@ -536,9 +547,9 @@
-#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.0+cvs20060921/Rendering/CMakeLists.txt octaviz-0.4.0+cvs20060921.new/Rendering/CMakeLists.txt
---- octaviz-0.4.0+cvs20060921/Rendering/CMakeLists.txt 2004-09-21 22:50:39.000000000 +0000
-+++ octaviz-0.4.0+cvs20060921.new/Rendering/CMakeLists.txt 2006-11-10 11:32:50.518243847 +0000
+diff -Nur octaviz/Rendering/CMakeLists.txt octaviz.new/Rendering/CMakeLists.txt
+--- octaviz/Rendering/CMakeLists.txt 2006-11-13 10:59:17.357774000 +0000
++++ octaviz.new/Rendering/CMakeLists.txt 2006-11-13 12:25:35.649039744 +0000
@@ -1,4 +1,3 @@
SET(KIT_WRAP_DEPS Graphics Imaging IO)
OCTAVE_WRAP_VTK(Rendering RENDERING "${KIT_WRAP_DEPS}")
@@ -546,10 +557,10 @@
-#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.0+cvs20060921/Scripts/CMakeLists.txt octaviz-0.4.0+cvs20060921.new/Scripts/CMakeLists.txt
---- octaviz-0.4.0+cvs20060921/Scripts/CMakeLists.txt 2004-09-21 22:50:43.000000000 +0000
-+++ octaviz-0.4.0+cvs20060921.new/Scripts/CMakeLists.txt 2006-11-10 11:32:50.518243847 +0000
-@@ -1,15 +1,24 @@
+diff -Nur octaviz/Scripts/CMakeLists.txt octaviz.new/Scripts/CMakeLists.txt
+--- octaviz/Scripts/CMakeLists.txt 2006-11-13 10:59:17.357774000 +0000
++++ octaviz.new/Scripts/CMakeLists.txt 2006-11-13 12:33:38.423398007 +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})
@@ -566,38 +577,31 @@
+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}
-+ COPYONLY)
++ ${CMAKE_CURRENT_BINARY_DIR}/${MFILE})
++
+ # install rule for each file; we take the BINARY_DIR because
-+ # vtkGetDataRoot changes
++ # vtkGetDataRoot.m changes
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${MFILE}
+ DESTINATION ${OCTAVIZ_SCRIPTS_M_DIR})
+ENDFOREACH(MFILE)
--EXEC_PROGRAM("ls" ${CURR_DIR} ARGS "*.m" OUTPUT_VARIABLE M_SCRIPTS_EXEC)
--STRING(REGEX MATCHALL "[^\n]+" M_SCRIPTS ${M_SCRIPTS_EXEC})
-+# Insert VTK_DATA_ROOT given to cmake into vtkGetDataRoot.m;
-+# We overwrite the former copied file
-+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/vtkGetDataRoot.m
-+ ${CMAKE_CURRENT_BINARY_DIR}/vtkGetDataRoot.m)
-
-INSTALL_PROGRAMS(${M_INST_DIR}/octaviz ${M_SCRIPTS})
-+# where they go
-+# INSTALL(FILES ${M_SCRIPTS} DESTINATION ${OCTAVIZ_SCRIPTS_M_DIR})
-+# TW: FIXME: evtl. current_binary_dir mit foreach schleife
-diff -Nur octaviz-0.4.0+cvs20060921/Testing/CMakeLists.txt octaviz-0.4.0+cvs20060921.new/Testing/CMakeLists.txt
---- octaviz-0.4.0+cvs20060921/Testing/CMakeLists.txt 2004-09-21 22:50:44.000000000 +0000
-+++ octaviz-0.4.0+cvs20060921.new/Testing/CMakeLists.txt 2006-11-10 11:32:50.518243847 +0000
+diff -Nur octaviz/Testing/CMakeLists.txt octaviz.new/Testing/CMakeLists.txt
+--- octaviz/Testing/CMakeLists.txt 2006-11-13 10:59:17.357774000 +0000
++++ octaviz.new/Testing/CMakeLists.txt 2006-11-13 12:25:35.649039744 +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.0+cvs20060921/Wrapping/CMakeLists.txt octaviz-0.4.0+cvs20060921.new/Wrapping/CMakeLists.txt
---- octaviz-0.4.0+cvs20060921/Wrapping/CMakeLists.txt 2004-09-21 22:50:40.000000000 +0000
-+++ octaviz-0.4.0+cvs20060921.new/Wrapping/CMakeLists.txt 2006-11-10 11:32:50.518243847 +0000
+diff -Nur octaviz/Wrapping/CMakeLists.txt octaviz.new/Wrapping/CMakeLists.txt
+--- octaviz/Wrapping/CMakeLists.txt 2006-11-13 10:59:17.357774000 +0000
++++ octaviz.new/Wrapping/CMakeLists.txt 2006-11-13 12:25:35.649039744 +0000
@@ -1 +1,6 @@
ADD_EXECUTABLE(vtkWrapOctave vtkWrapOctave.c vtkParse.tab.c)
+
Deleted: trunk/packages/octaviz/debian/patches/50-cast-pointer.patch
Deleted: trunk/packages/octaviz/debian/patches/50-unescape-strings-for-gcc.patch
Modified: trunk/packages/octaviz/debian/patches/60-vtkdata-path.patch
===================================================================
--- trunk/packages/octaviz/debian/patches/60-vtkdata-path.patch 2006-11-10 14:32:32 UTC (rev 798)
+++ trunk/packages/octaviz/debian/patches/60-vtkdata-path.patch 2006-11-13 13:32:51 UTC (rev 799)
@@ -6,6 +6,6 @@
## 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 = "/usr/share/vtkdata";
++ f = "/usr/share/VTKData";
endfunction
Modified: trunk/packages/octaviz/debian/rules
===================================================================
--- trunk/packages/octaviz/debian/rules 2006-11-10 14:32:32 UTC (rev 798)
+++ trunk/packages/octaviz/debian/rules 2006-11-13 13:32:51 UTC (rev 799)
@@ -45,7 +45,7 @@
-DOCTAVE_OCT_DIR:PATH=$(OCTDIR) \
-DOCTAVE_M_DIR:PATH=$(MDIR) \
-DOCTAVIZ_OCT_DIR:PATH=$(OCTDIR)/octaviz \
- -DOCTAVIZ_EXAMPLE_M_DIR:PATH=/usr/share/doc/octaviz/examples \
+ -DOCTAVIZ_EXAMPLE_M_DIR:PATH=$(docdir)/examples \
-DOCTAVIZ_SCRIPTS_M_DIR:PATH=$(MDIR)/octaviz \
-DOCTAVIZ_LIBRARY_DIR:PATH=/usr/lib/octaviz \
.. )
@@ -63,16 +63,12 @@
rm -rf build build-stamp cmake-stamp
binary-install/octaviz::
- ( cd build ; $(MAKE) install DESTDIR=../$(debdir) )
+ ( cd build ; $(MAKE) install DESTDIR=$(debdir) )
binary-post-install/octaviz::
dh_installdirs $(docdir) $(OCTDIR) $(MDIR)
find $(debdir) -name \*.m | xargs -if chmod -x f
- mv `find $(debdir)/usr/share/octave -name Examples` $(debdoc)/examples
- mv `find $(debdir)/usr/share/octave -name octaviz` $(debfcn)
- mv `find $(debdir)/usr/lib/octave -name octaviz` $(deboct)
- rm -rf $(debdir)/usr/*/octave/2.1*
binary-predeb/octaviz::
octave-depends
More information about the Pkg-octave-commit
mailing list