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

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 4bee712f284ec0f615c1678a3971b48d797cc225
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sat Jun 1 17:55:47 2013 +0200

    Populate iraf-noao package. iraf-vo still empty (?)

diff --git a/debian/clean b/debian/clean
index 02a6380..933084a 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,3 +1,10 @@
+bin
+lib/libmain.o
+noao/bin
+unix/as
+unix/bin
+unix/hlib/iraf.h
+unix/hlib/mach.h
 pkg/vocl/readline/config.log
 pkg/vocl/readline/config.status
 pkg/vocl/readline/support/config.guess
@@ -19,7 +26,12 @@ vendor/voclient/voclient/config/config.sub
 vendor/voclient/libsamp/cfitsio/config.status
 vendor/voclient/libsamp/libxrpc/xmlrpc-c-1.16.29/config.guess
 vendor/voclient/libsamp/libxrpc/xmlrpc-c-1.16.29/config.sub
+vendor/voclient/libsamp/libxrpc/xmlrpc-c-1.16.29/config.log
 vendor/voclient/libsamp/libxrpc/curl-7.20.1/config.guess
 vendor/voclient/libsamp/libxrpc/curl-7.20.1/config.sub
+vendor/voclient/libsamp/.BASE
+vendor/voclient/libsamp/libxrpc/xmlrpc-c-1.16.29/_spool
+vendor/voclient/libvotable/.BASE
+vo/bin
 vo/java/.DS_Store
 vo/.DS_Store
diff --git a/debian/iraf-noao.install b/debian/iraf-noao.install
index a7a494c..f8f4605 100755
--- a/debian/iraf-noao.install
+++ b/debian/iraf-noao.install
@@ -1,2 +1,2 @@
 #! /usr/bin/dh-exec
-noao/bin.linux/* usr/lib/${DEB_HOST_MULTIARCH}/iraf/noao/bin
+noao/bin/* usr/lib/${DEB_HOST_MULTIARCH}/iraf/noao/bin
diff --git a/debian/iraf-vo.install b/debian/iraf-vo.install
index 234d2be..998f523 100755
--- a/debian/iraf-vo.install
+++ b/debian/iraf-vo.install
@@ -1,2 +1,2 @@
 #! /usr/bin/dh-exec
-vo/bin.linux/* usr/lib/${DEB_HOST_MULTIARCH}/iraf/vo/bin
+vo/bin/* usr/lib/${DEB_HOST_MULTIARCH}/iraf/vo/bin
diff --git a/debian/iraf.install b/debian/iraf.install
index 64cb926..22054e7 100755
--- a/debian/iraf.install
+++ b/debian/iraf.install
@@ -1,4 +1,3 @@
 #! /usr/bin/dh-exec
-unix/as/* usr/lib/${DEB_HOST_MULTIARCH}/iraf/unix/as
 unix/bin/* usr/lib/${DEB_HOST_MULTIARCH}/iraf/unix/bin
 bin/* usr/lib/${DEB_HOST_MULTIARCH}/iraf/bin/
diff --git a/debian/rules b/debian/rules
index d4d8fc3..f6236fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,8 @@ export IRAFARCH=$(shell ${hlib}irafarch.csh)
 
 tmp_links:
 	ln -sf bin.${IRAFARCH} bin
+	ln -sf bin.${IRAFARCH} noao/bin
+	ln -sf bin.${IRAFARCH} vo/bin
 	ln -sf mach`getconf LONG_BIT`.h ${host}/hlib/mach.h
 	ln -sf iraf`getconf LONG_BIT`.h ${host}/hlib/iraf.h
 
@@ -72,10 +74,15 @@ override_dh_auto_clean:
 	rm -rf vo/votools/.url*
 	rm -f  ${host}/bin/*
 	rm -rf ${host}/bin.*/*
-	rm -f  ${host}/bin
 	find . -name "*.a" | xargs rm -f
+	rm -f sys/vops/ak/*.x
 	find pkg -name "*.e"  | xargs rm -f
+	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