[Pkg-octave-commit] rev 805 - in trunk/packages/octaviz/debian: .
patches
Thomas Weber
thomas-guest at alioth.debian.org
Tue Nov 21 08:35:50 CET 2006
Author: thomas-guest
Date: 2006-11-21 08:35:50 +0100 (Tue, 21 Nov 2006)
New Revision: 805
Modified:
trunk/packages/octaviz/debian/changelog
trunk/packages/octaviz/debian/patches/40-revamped-build-system.patch
Log:
Bug fix for #399576: add missing directories to CMakeList.txt
Modified: trunk/packages/octaviz/debian/changelog
===================================================================
--- trunk/packages/octaviz/debian/changelog 2006-11-16 20:19:34 UTC (rev 804)
+++ trunk/packages/octaviz/debian/changelog 2006-11-21 07:35:50 UTC (rev 805)
@@ -1,3 +1,9 @@
+octaviz (0.4.5-3) unstable; urgency=low
+
+ * Add missing directories to build system (Closes: 399576)
+
+ --
+
octaviz (0.4.5-2) unstable; urgency=low
[ Thomas Weber ]
Modified: trunk/packages/octaviz/debian/patches/40-revamped-build-system.patch
===================================================================
--- trunk/packages/octaviz/debian/patches/40-revamped-build-system.patch 2006-11-16 20:19:34 UTC (rev 804)
+++ trunk/packages/octaviz/debian/patches/40-revamped-build-system.patch 2006-11-21 07:35:50 UTC (rev 805)
@@ -1,7 +1,7 @@
-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,236 @@
+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.
-
@@ -382,10 +382,13 @@
+
+# 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)
@@ -403,16 +406,9 @@
+ ADD_SUBDIRECTORY(Patented)
+ SET(vtk_kits ${vtk_kits} Patented)
+ENDIF(VTK_USE_PATENTED)
-+IF(VTK_USE_PARALLEL)
-+ ADD_SUBDIRECTORY(Parallel)
-+ SET(vtk_kits ${vtk_kits} Parallel)
-+ENDIF(VTK_USE_PARALLEL)
-+
-+ADD_SUBDIRECTORY(Scripts)
-+ADD_SUBDIRECTORY(Examples)
-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
+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)
@@ -464,9 +460,9 @@
-
\ No newline at end of file
-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
+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
@@ -488,18 +484,18 @@
+# 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/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
+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/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
+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)
@@ -508,9 +504,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/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
+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}")
@@ -518,18 +514,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/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
+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/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
+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}")
@@ -537,18 +533,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/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
+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/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
+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}")
@@ -556,9 +552,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/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
+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}")
@@ -566,9 +562,9 @@
-#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/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
+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
@@ -599,18 +595,18 @@
+ENDFOREACH(MFILE)
-INSTALL_PROGRAMS(${M_INST_DIR}/octaviz ${M_SCRIPTS})
-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
+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/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
+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)
+
More information about the Pkg-octave-commit
mailing list