[SCM] Image Reduction and Analysis Facility branch, debian, updated. 82ca6dfe70279b87e5ce1a68fadc3407f27744fa

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 82ca6dfe70279b87e5ce1a68fadc3407f27744fa
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Jun 3 23:21:02 2013 +0200

    patch cl.csh and zzsetenv.def for new directory structure

diff --git a/debian/patches/remove-absolute-path.patch b/debian/patches/remove-absolute-path.patch
index 670d876..b44a458 100644
--- a/debian/patches/remove-absolute-path.patch
+++ b/debian/patches/remove-absolute-path.patch
@@ -1,14 +1,67 @@
 --- a/unix/hlib/cl.csh
 +++ b/unix/hlib/cl.csh
-@@ -35,7 +35,7 @@
- 
+@@ -33,9 +33,8 @@
+     endif
+ endif
  
+-
  # Determine IRAF root directory (value set in install script).
 -set d_iraf = "/iraf/iraf/"
 +set d_iraf = "/usr/share/iraf/"
  if ($?iraf) then
      if (! -e $iraf) then
          echo "Warning: iraf=$iraf does not exist (check .cshrc or .login)"
+@@ -47,6 +46,8 @@
+     setenv iraf "$d_iraf"
+ endif
+ 
++setenv iraf_b /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/iraf/
++
+ # Check for a version query.
+ if ($#argv > 0) then
+     if ("$argv[1]" == "-v" || "$argv[1]" == "-version" || \
+@@ -65,10 +66,10 @@
+ endif
+ 
+ if ($?IRAFARCH) then
+-    if (-e $iraf/bin.${IRAFARCH}/${cl_binary}) then
++    if (-e ${iraf_b}bin/${cl_binary}) then
+ 	set MACH = $IRAFARCH
+     else
+-        echo "ERROR:  No $iraf/bin.${IRAFARCH}/${cl_binary} binary found."
++        echo "ERROR:  No ${iraf_b}bin/${cl_binary} binary found."
+ 	if ("$ACTUAL_ARCH" != "$IRAFARCH") then
+             echo "ERROR:  IRAFARCH set to '$IRAFARCH', should be '$ACTUAL_ARCH'"
+ 	endif
+@@ -108,8 +109,8 @@
+         setenv IRAFARCH "$MACH"
+     endif
+ 
+-    if (! (-e $iraf/bin.${MACH}/${cl_binary}) ) then
+-        echo "ERROR:  No $iraf/bin.${IRAFARCH}/${cl_binary} binary found."
++    if (! (-e ${iraf_b}bin/${cl_binary}) ) then
++        echo "ERROR:  No ${iraf_b}bin/${cl_binary} binary found."
+ 	exit 1
+     endif
+ endif
+@@ -132,7 +133,7 @@
+ 	setenv arch ".$IRAFARCH"
+     endif
+ 
+-    setenv IRAFBIN ${iraf}bin$arch/
++    setenv IRAFBIN ${iraf_b}bin/
+     set file = ${IRAFBIN}$cl_binary
+     if (-e $file) then
+ 	exec $file
+@@ -147,7 +148,7 @@
+ 
+ 
+ setenv arch 	.$IRAFARCH
+-setenv IRAFBIN 	${iraf}bin$arch/
++setenv IRAFBIN 	${iraf_b}bin/
+ 
+ # Run the desired CL.
+ exec  ${IRAFBIN}$cl_binary
 --- a/unix/hlib/libc/iraf.h
 +++ b/unix/hlib/libc/iraf.h
 @@ -9,8 +9,8 @@
@@ -46,3 +99,14 @@
  set	ttymsg  =\
  "Terminal types: xgterm,xterm,gterm,vt640,vt100,etc."
  
+--- a/unix/hlib/zzsetenv.def
++++ b/unix/hlib/zzsetenv.def
+@@ -59,7 +59,7 @@
+ # System directories.
+ 
+ set	as		= "host$as/"
+-set	bin		= "iraf$bin(arch)/"
++set	bin		= "iraf_b$bin/"
+ set	boot		= "host$boot/"
+ set	dev		= "iraf$dev/"
+ set	doc		= "iraf$doc/"

-- 
Image Reduction and Analysis Facility