[Pkg-octave-commit] rev 809 - trunk/packages/octave2.1-forge/debian

[Thomas Weber]

Author: thomas-guest
Date: 2006-11-26 22:36:13 +0100 (Sun, 26 Nov 2006)
New Revision: 809

Modified:
   trunk/packages/octave2.1-forge/debian/changelog
   trunk/packages/octave2.1-forge/debian/rules
Log:
Fix / workaround for #400214


Modified: trunk/packages/octave2.1-forge/debian/changelog
===================================================================
--- trunk/packages/octave2.1-forge/debian/changelog	2006-11-22 10:43:22 UTC (rev 808)
+++ trunk/packages/octave2.1-forge/debian/changelog	2006-11-26 21:36:13 UTC (rev 809)
@@ -6,6 +6,9 @@
   * debian/patches/70-leasqr-doc.patch: Improved documentation for leasqr.
     Thanks to Francesco Potortì for the patch, which has also been applied
     upstream.
+  [ Thomas Weber]
+  * Use work-around from Octaviz for the dangling symlink on the autobuilders
+    (Closes: 400214)
 
  --
 

Modified: trunk/packages/octave2.1-forge/debian/rules
===================================================================
--- trunk/packages/octave2.1-forge/debian/rules	2006-11-22 10:43:22 UTC (rev 808)
+++ trunk/packages/octave2.1-forge/debian/rules	2006-11-26 21:36:13 UTC (rev 809)
@@ -34,10 +34,16 @@
 altmdir  := /usr/share/$(altname)
 altoctdir := /usr/lib/$(altname)
 
+
+# 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:]]*)
+
 # Hopefully, we will get a LOCALAPIARCHLIBDIR by upstream; until then, work
 # around it
 # octbin := $(shell octave-config -p LOCALARCHLIBDIR)
-octbin := $(shell octave-config -p LOCALARCHLIBDIR)/$(shell octave-config -p API_VERSION)
+OCTAVE_CONFIG := octave-config-$(OCT_VER)
+octbin := $(shell $(OCTAVE_CONFIG) -p LOCALARCHLIBDIR)/$(shell $(OCTAVE_CONFIG) -p API_VERSION)
 
 
 
@@ -84,3 +90,4 @@
 # show what's not installed
 configure/$(PACKAGE)::
 	find . -name NOINSTALL -print
+	@echo "Using $(OCTAVE_CONFIG) as octave-config"