[Pkg-octave-commit] rev 430 - in trunk/packages/octaviz/debian: . patches

[Rafael Laboissiere]

Author: rafael
Date: 2006-01-18 20:41:58 +0000 (Wed, 18 Jan 2006)
New Revision: 430

Added:
   trunk/packages/octaviz/debian/patches/55-octave-config-path.patch
Modified:
   trunk/packages/octaviz/debian/changelog
   trunk/packages/octaviz/debian/rules
Log:
Debian release octaviz_0.4.0-16

Modified: trunk/packages/octaviz/debian/changelog
===================================================================
--- trunk/packages/octaviz/debian/changelog	2006-01-18 17:03:44 UTC (rev 429)
+++ trunk/packages/octaviz/debian/changelog	2006-01-18 20:41:58 UTC (rev 430)
@@ -1,3 +1,18 @@
+octaviz (0.4.0-16) unstable; urgency=low
+
+   +++ Changes by Rafael Laboissiere
+
+  * debian/patches/55-octave-config-path.patch: Desperate try to change
+    the CMakeLists.txt file in order to get the package through the
+    autobuilders (currently failing on s390, mips, ia64, powerpc, arm, and
+    alpha with a cryptic "Octave is required" error message).
+
+  * debian/rules: Added "Mister Proper" actions to remove all
+    files/directories left after build which are not cleaned by the
+    upstream "make clean".
+
+ -- Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>  Wed, 18 Jan 2006 17:27:17 +0100
+
 octaviz (0.4.0-15) unstable; urgency=low
 
    +++ Changes by Rafael Laboissiere

Added: trunk/packages/octaviz/debian/patches/55-octave-config-path.patch
===================================================================
--- trunk/packages/octaviz/debian/patches/55-octave-config-path.patch	2006-01-18 17:03:44 UTC (rev 429)
+++ trunk/packages/octaviz/debian/patches/55-octave-config-path.patch	2006-01-18 20:41:58 UTC (rev 430)
@@ -0,0 +1,17 @@
+diff -Nur octaviz-0.4.0/CMakeLists.txt octaviz-0.4.0.new/CMakeLists.txt
+--- octaviz-0.4.0/CMakeLists.txt	2006-01-18 16:07:52.639521112 +0100
++++ octaviz-0.4.0.new/CMakeLists.txt	2006-01-18 16:08:56.031884008 +0100
+@@ -26,10 +26,10 @@
+ 	LINK_LIBRARIES(${X11_LIBRARIES} Xt)
+ 
+ 	# find octave-config
+-	FIND_PROGRAM(OCTAVE_CONFIG octave-config)
+-	IF(NOT OCTAVE_CONFIG)
++	FIND_PROGRAM(OCTAVE_CONFIG octave-config /usr/bin)
++	IF(OCTAVE_CONFIG MATCHES -NOTFOUND$)
+ 		 MESSAGE(FATAL_ERROR "Octave is required.  Please install Octave and rerun cmake.")
+-	ENDIF(NOT OCTAVE_CONFIG)
++	ENDIF(OCTAVE_CONFIG MATCHES -NOTFOUND$)
+ 	
+ 	# Set prefix from octave prefix
+ 	EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "-p PREFIX" OUTPUT_VARIABLE OCT_PREFIX_EXEC)

Modified: trunk/packages/octaviz/debian/rules
===================================================================
--- trunk/packages/octaviz/debian/rules	2006-01-18 17:03:44 UTC (rev 429)
+++ trunk/packages/octaviz/debian/rules	2006-01-18 20:41:58 UTC (rev 430)
@@ -33,6 +33,7 @@
 cmake-stamp:
 	dh_testdir
 	ls -l /usr/bin/oct*
+	ls -l /etc/alternatives/oct*
 	cmake -DCMAKE_SKIP_RPATH:BOOL=YES .
 	touch cmake-stamp
 
@@ -45,10 +46,18 @@
 clean::
 	rm -f build-stamp cmake-stamp
 	-$(MAKE) clean
-	find . -name \*.o -o -name \*.oct -o -name Makefile		\
-		-o -name cmake.\* -o -name \*.cmake -o -name \*.log	\
-		| xargs rm -f
-	rm -f CMakeCache.txt install_manifest.txt
+	find . -name \*.cc -o -name \*.o -o -name \*.oct	\
+		-o -name Makefile -o -name \*.dir		\
+		-o -name cmake.\* -o -name \*.cmake		\
+		-o -name \*.log -o -name CMakeTmp		\
+		| grep -v vtkRaiseWindow.cc			\
+		| grep -v vtk_print_ref_table.cc		\
+		| grep -v vtk_get_pointer.cc			\
+		| grep -v vtkInitializeInteractor.cc		\
+		| grep -v octaviz.cc				\
+		| grep -v vtk_init.cc				\
+		| xargs rm -rf
+	rm -rf CMakeFiles CMakeCache.txt install_manifest.txt
 
 binary-install/octaviz::
 	$(MAKE) install DESTDIR=$(debdir)