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

[Ole Streicher]

The following commit has been merged in the debian branch:
commit d62aadd72b0fa8edc47db3f2214dc76e4358cbaf
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Jun 4 15:59:48 2013 +0200

    Create imdir and cache dirs according to XDG: http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html

diff --git a/debian/iraf-common.dirs b/debian/iraf-common.dirs
deleted file mode 100644
index 232713d..0000000
--- a/debian/iraf-common.dirs
+++ /dev/null
@@ -1 +0,0 @@
-var/cache/iraf
diff --git a/debian/patches/remove-absolute-path.patch b/debian/patches/remove-absolute-path.patch
index 408aea1..252b2b6 100644
--- a/debian/patches/remove-absolute-path.patch
+++ b/debian/patches/remove-absolute-path.patch
@@ -86,7 +86,7 @@
  #undef import_knames
 --- a/unix/hlib/mkiraf.csh
 +++ b/unix/hlib/mkiraf.csh
-@@ -4,9 +4,9 @@
+@@ -4,9 +4,10 @@
  
  # The following definitions are site dependent. [SITEDEP]
  
@@ -94,22 +94,39 @@
 -set	imdir		= "/iraf/imdirs"
 -set	cachedir	= "/iraf/cache"
 +set	iraf		= "/usr/share/iraf"
++set	iraf		= "/home/oles/Projects/2011/debian/iraf/iraf"
 +set	imdir		= "/var/lib/imdirs"
 +set	cachedir	= "/var/cache/iraf"
  set	ttymsg  =\
  "Terminal types: xgterm,xterm,gterm,vt640,vt100,etc."
  
-@@ -93,8 +93,8 @@
+@@ -93,16 +94,22 @@
  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/
++    if ( ${?XDG_DATA_HOME} == 0 ) then
++	setenv XDG_DATA_HOME ${HOME}/.local/share
++    endif
++    echo  "s+U_IMDIR+${XDG_DATA_HOME}/imdir/+"			>> _sed
++    mkdir -vp ${XDG_DATA_HOME}/imdir/
  else
      whoami	| sed -e "s;.*;s+U_IMDIR+${imdir}/&/+;"		>> _sed
      whoami	| sed -e "s;.*;mkdir $imdir/& 2> /dev/null;" | sh
+ endif
+ 
+ if (! (-e "$cachedir" && -w "$cachedir") ) then
+-    set cachedir = /tmp/
+-    whoami	| sed -e "s;.*;s+U_CACHEDIR+${cachedir}/+;"	>> _sed
++    if ( ${?XDG_CACHE_HOME} == 0 ) then
++	setenv XDG_CACHE_HOME ${HOME}/.cache
++    endif
++    echo  "s+U_CACHEDIR+${XDG_CACHE_HOME}/iraf/+"		>> _sed
++    mkdir -vp ${XDG_CACHE_HOME}/iraf/
+ else
+     whoami	| sed -e "s;.*;s+U_CACHEDIR+${cachedir}/&/+;"	>> _sed
+     whoami	| sed -e "s;.*;mkdir $cachedir/& 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 71f91c4..8fe26e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -84,7 +84,6 @@ 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/
 
 override_dh_auto_clean:
 	rm -rf vo/votools/.old

-- 
Image Reduction and Analysis Facility