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

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 042cb1a256298b0c08be3e31f4f82b54f97e695e
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sun Jun 2 10:16:27 2013 +0200

    Move removal of absolute paths into a patch

diff --git a/debian/patches/remove-absolute-path.patch b/debian/patches/remove-absolute-path.patch
new file mode 100644
index 0000000..190ba3a
--- /dev/null
+++ b/debian/patches/remove-absolute-path.patch
@@ -0,0 +1,44 @@
+--- a/unix/hlib/cl.csh
++++ b/unix/hlib/cl.csh
+@@ -35,7 +35,7 @@
+ 
+ 
+ # 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)"
+--- a/unix/hlib/libc/iraf.h
++++ b/unix/hlib/libc/iraf.h
+@@ -9,8 +9,8 @@
+ 
+ #ifndef D_iraf
+ /* ### Start of run time definitions */
+-#define	HOST		"/iraf/iraf/unix/"
+-#define	IRAF		"/iraf/iraf/"
++#define	HOST		"/usr/share/iraf/unix/"
++#define	IRAF		"/usr/share/iraf/"
+ #define	TMP		"/tmp/"
+ /* ### End of run time definitions */
+ 
+@@ -107,7 +107,7 @@
+ #ifndef D_knames
+ #include "knames.h"
+ /*
+-#include "/iraf/iraf/unix/hlib/libc/kproto.h"
++#include "/usr/share/iraf/unix/hlib/libc/kproto.h"
+ */
+ #endif
+ #undef import_knames
+--- a/unix/hlib/mkiraf.csh
++++ b/unix/hlib/mkiraf.csh
+@@ -4,7 +4,7 @@
+ 
+ # The following definitions are site dependent. [SITEDEP]
+ 
+-set	iraf		= "/iraf/iraf"
++set	iraf		= "/usr/share/iraf"
+ set	imdir		= "/iraf/imdirs"
+ set	cachedir	= "/iraf/cache"
+ set	ttymsg  =\
diff --git a/debian/patches/series b/debian/patches/series
index f210b1e..6b91997 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ voclient.patch
 vodata.patch
 xc.patch
 shared-xmlrpc.patch
+remove-absolute-path.patch
diff --git a/debian/rules b/debian/rules
index f6236fa..a13a498 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,9 +45,6 @@ override_dh_auto_build: libvo
 	chmod a+x util/mksysvos
 	pkglibs=${iraf}noao/lib/,${iraf}${host}/bin/,${iraf}${host}/hlib/libc/ \
 	  csh -f ${iraf}util/mksysvos
-	sed -i ${hlib}mkiraf.csh -e s!/iraf/iraf!/usr/lib/iraf!g
-	sed -i ${hlib}cl.csh -e s!/iraf/iraf!/usr/lib/iraf!g
-	sed -i ${hlib}libc/iraf.h -e s!/iraf/iraf!/usr/lib/iraf!g
 #	cp -a ${iraf}${host}/bin/*.a ${iraf}lib 
 #	cp -p ${iraf}${host}/bin/*.e ${iraf}bin
 
@@ -80,9 +77,6 @@ override_dh_auto_clean:
 	find vendor/voclient -name "*.o" | xargs rm -f
 	find vendor/voclient/libsamp/libxrpc -name depend.mk | xargs rm -f
 	rm -rf vendor/voclient/include/
-	sed -i ${hlib}mkiraf.csh -e s!/usr/lib/iraf!/iraf/iraf!g
-	sed -i ${hlib}cl.csh -e s!/usr/lib/iraf!/iraf/iraf!g
-	sed -i ${hlib}libc/iraf.h -e s!/usr/lib/iraf!/iraf/iraf!g
 	dh_auto_clean
 
 

-- 
Image Reduction and Analysis Facility