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

[Ole Streicher]

The following commit has been merged in the debian branch:
commit eb60ab81d89ce2b1f4c361a978fb19a03bc65fee
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Jun 4 14:37:44 2013 +0200

    Put image dir into user's home directory

diff --git a/debian/iraf-common.dirs b/debian/iraf-common.dirs
index 17b234b..232713d 100644
--- a/debian/iraf-common.dirs
+++ b/debian/iraf-common.dirs
@@ -1,3 +1 @@
 var/cache/iraf
-var/lib/imdirs
-usr/share/iraf/extern
diff --git a/debian/patches/remove-absolute-path.patch b/debian/patches/remove-absolute-path.patch
index 926a566..408aea1 100644
--- a/debian/patches/remove-absolute-path.patch
+++ b/debian/patches/remove-absolute-path.patch
@@ -99,6 +99,17 @@
  set	ttymsg  =\
  "Terminal types: xgterm,xterm,gterm,vt640,vt100,etc."
  
+@@ -93,8 +93,8 @@
+ pwd	| sed -e "s;.*;s+U_UPARM+&/uparm/+;"			>> _sed
+ 
+ if (! (-e "$imdir" && -w "$imdir") ) then
+-    set imdir = HDR$
+-    whoami	| sed -e "s;.*;s+U_IMDIR+${imdir}/+;"		>> _sed
++    whoami	| sed -e "s;.*;s+U_IMDIR+${HOME}/imdir/+;"	>> _sed
++    mkdir -p ${HOME}/imdir/
+ else
+     whoami	| sed -e "s;.*;s+U_IMDIR+${imdir}/&/+;"		>> _sed
+     whoami	| sed -e "s;.*;mkdir $imdir/& 2> /dev/null;" | sh
 --- a/unix/hlib/zzsetenv.def
 +++ b/unix/hlib/zzsetenv.def
 @@ -59,7 +59,7 @@
diff --git a/debian/rules b/debian/rules
index e2b2f3e..71f91c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -84,7 +84,7 @@ override_dh_auto_install-indep:
 	  install -p -D -m 755 $$f debian/tmp/usr/share/iraf/$$f ; \
 	done
 	install -p -D -m644 unix/hlib/libc/iraf.h debian/tmp/usr/include/iraf.h
-	mkdir -p -m 1755 debian/tmp/var/cache/iraf/ debian/tmp/var/lib/imdirs/
+	mkdir -p -m 1755 debian/tmp/var/cache/iraf/
 
 override_dh_auto_clean:
 	rm -rf vo/votools/.old

-- 
Image Reduction and Analysis Facility