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

[Ole Streicher]

The following commit has been merged in the debian branch:
commit e40fe1ab2bfb8892540819e9d843699518663cbc
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Jun 12 15:17:30 2013 +0200

    Set $tmp according to FHS and The Open Group Base Specifications

diff --git a/debian/patches/fhs.patch b/debian/patches/fhs.patch
index d90cbfa..e0f82d1 100644
--- a/debian/patches/fhs.patch
+++ b/debian/patches/fhs.patch
@@ -9,25 +9,35 @@ Description: Make the installation FHS conform.
  to their home directories.
 --- 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 +47,8 @@
+@@ -47,6 +46,16 @@
      setenv iraf "$d_iraf"
  endif
  
 +setenv iraf_b /usr/lib/iraf/
 +
++# Determine the temporary dir, using standard variable from The Open Group
++# Base Specifications. Default to FHS.
++if ($?TMPDIR) then
++    setenv tmp $TMPDIR
++else
++    setenv tmp /tmp/
++endif
++
  # Check for a version query.
  if ($#argv > 0) then
      if ("$argv[1]" == "-v" || "$argv[1]" == "-version" || \
-@@ -65,10 +67,10 @@
+@@ -65,10 +74,10 @@
  endif
  
  if ($?IRAFARCH) then
@@ -40,7 +50,7 @@ Description: Make the installation FHS conform.
  	if ("$ACTUAL_ARCH" != "$IRAFARCH") then
              echo "ERROR:  IRAFARCH set to '$IRAFARCH', should be '$ACTUAL_ARCH'"
  	endif
-@@ -108,8 +110,8 @@
+@@ -108,8 +117,8 @@
          setenv IRAFARCH "$MACH"
      endif
  
@@ -51,7 +61,7 @@ Description: Make the installation FHS conform.
  	exit 1
      endif
  endif
-@@ -132,7 +134,7 @@
+@@ -132,7 +141,7 @@
  	setenv arch ".$IRAFARCH"
      endif
  
@@ -60,7 +70,7 @@ Description: Make the installation FHS conform.
      set file = ${IRAFBIN}$cl_binary
      if (-e $file) then
  	exec $file
-@@ -147,7 +149,7 @@
+@@ -147,7 +156,7 @@
  
  
  setenv arch 	.$IRAFARCH

-- 
Image Reduction and Analysis Facility