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

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 9b0440509b7937b43ca795885619d2d647e36c7f
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Jun 13 10:19:28 2013 +0200

    Append shlash at the end of  if needed and setenv host. This is enough to remove /usr/include/iraf.h

diff --git a/debian/iraf-common.install b/debian/iraf-common.install
index 2f190db..28ebe5a 100644
--- a/debian/iraf-common.install
+++ b/debian/iraf-common.install
@@ -1,4 +1,3 @@
-usr/include/iraf.h
 usr/share/iraf/dev
 usr/share/iraf/lib
 usr/share/iraf/local
diff --git a/debian/patches/fhs.patch b/debian/patches/fhs.patch
index e0f82d1..fcbd8b1 100644
--- a/debian/patches/fhs.patch
+++ b/debian/patches/fhs.patch
@@ -20,24 +20,30 @@ Description: Make the installation FHS conform.
  if ($?iraf) then
      if (! -e $iraf) then
          echo "Warning: iraf=$iraf does not exist (check .cshrc or .login)"
-@@ -47,6 +46,16 @@
+@@ -47,6 +46,22 @@
      setenv iraf "$d_iraf"
  endif
  
 +setenv iraf_b /usr/lib/iraf/
 +
++if (! $?host) then
++    setenv host "${iraf}unix/"
++endif
++
 +# 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/
++if (! $?tmp) then
++    if ($?TMPDIR) then
++        setenv tmp `echo $TMPDIR | sed s-/\$--`/
++    else
++        setenv tmp /tmp/
++    endif
 +endif
 +
  # Check for a version query.
  if ($#argv > 0) then
      if ("$argv[1]" == "-v" || "$argv[1]" == "-version" || \
-@@ -65,10 +74,10 @@
+@@ -65,10 +80,10 @@
  endif
  
  if ($?IRAFARCH) then
@@ -50,7 +56,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 +117,8 @@
+@@ -108,8 +123,8 @@
          setenv IRAFARCH "$MACH"
      endif
  
@@ -61,7 +67,7 @@ Description: Make the installation FHS conform.
  	exit 1
      endif
  endif
-@@ -132,7 +141,7 @@
+@@ -132,7 +147,7 @@
  	setenv arch ".$IRAFARCH"
      endif
  
@@ -70,7 +76,7 @@ Description: Make the installation FHS conform.
      set file = ${IRAFBIN}$cl_binary
      if (-e $file) then
  	exec $file
-@@ -147,7 +156,7 @@
+@@ -147,7 +162,7 @@
  
  
  setenv arch 	.$IRAFARCH

-- 
Image Reduction and Analysis Facility