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

[Rafael Laboissiere]

Author: rafael
Date: 2006-01-19 14:15:41 +0000 (Thu, 19 Jan 2006)
New Revision: 444

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

Modified: trunk/packages/octaviz/debian/changelog
===================================================================
--- trunk/packages/octaviz/debian/changelog	2006-01-19 10:55:04 UTC (rev 443)
+++ trunk/packages/octaviz/debian/changelog	2006-01-19 14:15:41 UTC (rev 444)
@@ -1,3 +1,13 @@
+octaviz (0.4.0-17) unstable; urgency=low
+
+  * debian/patches/55-octave-config-path.patch: Radical measure to get the
+    autobuilders working: removed completely the check for octave-config
+    using FIND_PROGRAM
+  * debian/rules: Dropped ls commands used for debugging the
+    autobuilders
+
+ -- Rafael Laboissiere <rafael at debian.org>  Thu, 19 Jan 2006 08:36:54 +0100
+
 octaviz (0.4.0-16) unstable; urgency=low
 
    +++ Changes by Rafael Laboissiere

Modified: trunk/packages/octaviz/debian/patches/55-octave-config-path.patch
===================================================================
--- trunk/packages/octaviz/debian/patches/55-octave-config-path.patch	2006-01-19 10:55:04 UTC (rev 443)
+++ trunk/packages/octaviz/debian/patches/55-octave-config-path.patch	2006-01-19 14:15:41 UTC (rev 444)
@@ -1,17 +1,22 @@
 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 @@
+--- octaviz-0.4.0/CMakeLists.txt	2006-01-19 08:41:23.335696792 +0100
++++ octaviz-0.4.0.new/CMakeLists.txt	2006-01-19 08:42:55.786642112 +0100
+@@ -28,11 +28,13 @@
  	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.")
+-		 MESSAGE(FATAL_ERROR "Octave is required.  Please install Octave and rerun cmake.")
 -	ENDIF(NOT OCTAVE_CONFIG)
-+	ENDIF(OCTAVE_CONFIG MATCHES -NOTFOUND$)
- 	
+-	
++#	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(OCTAVE_CONFIG /usr/bin/octave-config)
++		
  	# 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-19 10:55:04 UTC (rev 443)
+++ trunk/packages/octaviz/debian/rules	2006-01-19 14:15:41 UTC (rev 444)
@@ -32,8 +32,6 @@
 cmake: cmake-stamp
 cmake-stamp:
 	dh_testdir
-	ls -l /usr/bin/oct*
-	ls -l /etc/alternatives/oct*
 	cmake -DCMAKE_SKIP_RPATH:BOOL=YES .
 	touch cmake-stamp