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

Mon Jun 3 14:33:12 UTC 2013

The following commit has been merged in the debian branch:
commit 893f73ba30bfbfda510d953806c6a14bd4cfc128
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Jun 3 16:30:37 2013 +0200

    Install binaries into /usr/bin; rename binaries that may cause conflicts

diff --git a/debian/iraf-common.install b/debian/iraf-common.install
index 28ebe5a..2f190db 100644
--- a/debian/iraf-common.install
+++ b/debian/iraf-common.install
@@ -1,3 +1,4 @@
+usr/include/iraf.h
 usr/share/iraf/dev
 usr/share/iraf/lib
 usr/share/iraf/local
diff --git a/debian/iraf-common.links b/debian/iraf-common.links
new file mode 100644
index 0000000..b9d480b
--- /dev/null
+++ b/debian/iraf-common.links
@@ -0,0 +1,4 @@
+usr/share/iraf/unix/hlib/cl.csh usr/bin/iraf-cl
+usr/share/iraf/unix/hlib/ecl.csh usr/bin/iraf-ecl
+usr/share/iraf/unix/hlib/mkiraf.csh usr/bin/mkiraf
+usr/share/iraf/unix/hlib/mkmlist.csh usr/bin/mkmlist
diff --git a/debian/iraf-common.manpages b/debian/iraf-common.manpages
new file mode 100644
index 0000000..7eb7e6d
--- /dev/null
+++ b/debian/iraf-common.manpages
@@ -0,0 +1,3 @@
+debian/manpages/iraf-cl.1
+debian/manpages/mkiraf.1
+debian/manpages/mkmlist.1
diff --git a/debian/iraf-vo.links b/debian/iraf-vo.links
index 78f6568..5ebb1e8 100755
--- a/debian/iraf-vo.links
+++ b/debian/iraf-vo.links
@@ -1,11 +1,2 @@
 #! /usr/bin/dh-exec
-usr/share/iraf/vo/doc usr/lib/${DEB_HOST_MULTIARCH}/iraf/vo/doc		
-usr/share/iraf/vo/handlers usr/lib/${DEB_HOST_MULTIARCH}/iraf/vo/handlers	
-usr/share/iraf/vo/lib usr/lib/${DEB_HOST_MULTIARCH}/iraf/vo/lib		
-usr/share/iraf/vo/src usr/lib/${DEB_HOST_MULTIARCH}/iraf/vo/src		
-usr/share/iraf/vo/vo.cl usr/lib/${DEB_HOST_MULTIARCH}/iraf/vo/vo.cl		
-usr/share/iraf/vo/vo.hd usr/lib/${DEB_HOST_MULTIARCH}/iraf/vo/vo.hd		
-usr/share/iraf/vo/vo.men usr/lib/${DEB_HOST_MULTIARCH}/iraf/vo/vo.men	
-usr/share/iraf/vo/vo.par usr/lib/${DEB_HOST_MULTIARCH}/iraf/vo/vo.par	
-usr/share/iraf/vo/votest usr/lib/${DEB_HOST_MULTIARCH}/iraf/vo/votest	
-usr/share/iraf/vo/votools usr/lib/${DEB_HOST_MULTIARCH}/iraf/vo/votools
+usr/lib/${DEB_HOST_MULTIARCH}/iraf/vo/java/voclientd /usr/bin/voclientd
diff --git a/debian/iraf.links b/debian/iraf.links
index f50a03d..74c6de9 100755
--- a/debian/iraf.links
+++ b/debian/iraf.links
@@ -1,8 +1,12 @@
 #! /usr/bin/dh-exec
-usr/share/iraf/pkg usr/lib/${DEB_HOST_MULTIARCH}/iraf/pkg
-usr/share/iraf/dev usr/lib/${DEB_HOST_MULTIARCH}/iraf/dev
-usr/share/iraf/lib usr/lib/${DEB_HOST_MULTIARCH}/iraf/lib
-usr/share/iraf/unix/boot usr/lib/${DEB_HOST_MULTIARCH}/iraf/unix/boot
-usr/share/iraf/unix/f2c usr/lib/${DEB_HOST_MULTIARCH}/iraf/unix/f2c
-usr/share/iraf/unix/hlib usr/lib/${DEB_HOST_MULTIARCH}/iraf/unix/hlib
-usr/share/iraf/unix/os usr/lib/${DEB_HOST_MULTIARCH}/iraf/unix/os
+usr/lib/${DEB_HOST_MULTIARCH}/iraf/unix/bin.linux64/generic.e /usr/bin/iraf-generic
+usr/lib/${DEB_HOST_MULTIARCH}/iraf/unix/bin.linux64/rmbin.e /usr/bin/rmbin
+usr/lib/${DEB_HOST_MULTIARCH}/iraf/unix/bin.linux64/mkpkg.e /usr/bin/mkpkg
+usr/lib/${DEB_HOST_MULTIARCH}/iraf/unix/bin.linux64/rmfiles.e /usr/bin/rmfiles
+usr/lib/${DEB_HOST_MULTIARCH}/iraf/unix/bin.linux64/rtar.e /usr/bin/rtar
+usr/lib/${DEB_HOST_MULTIARCH}/iraf/unix/bin.linux64/wtar.e /usr/bin/wtar
+usr/lib/${DEB_HOST_MULTIARCH}/iraf/unix/bin.linux64/sgidispatch.e /usr/bin/sgidispatch
+usr/lib/${DEB_HOST_MULTIARCH}/iraf/unix/bin.linux64/rpp.e /usr/bin/iraf-rpp
+usr/lib/${DEB_HOST_MULTIARCH}/iraf/unix/bin.linux64/xyacc.e /usr/bin/iraf-xyacc
+usr/lib/${DEB_HOST_MULTIARCH}/iraf/unix/bin.linux64/xpp.e /usr/bin/iraf-xpp
+usr/lib/${DEB_HOST_MULTIARCH}/iraf/unix/bin.linux64/xc.e /usr/bin/xc
diff --git a/debian/iraf.manpages b/debian/iraf.manpages
new file mode 100644
index 0000000..85c0915
--- /dev/null
+++ b/debian/iraf.manpages
@@ -0,0 +1,11 @@
+debian/manpages/iraf-generic.1
+debian/manpages/mkpkg.1
+debian/manpages/rmbin.1
+debian/manpages/rmfiles.1
+debian/manpages/iraf-rpp.1
+debian/manpages/rtar.1
+debian/manpages/sgidispatch.1
+debian/manpages/wtar.1
+debian/manpages/xc.1
+debian/manpages/iraf-xpp.1
+debian/manpages/iraf-xyacc.1
diff --git a/debian/manpages/cl.1 b/debian/manpages/iraf-cl.1
similarity index 100%
rename from debian/manpages/cl.1
rename to debian/manpages/iraf-cl.1
diff --git a/debian/manpages/generic.1 b/debian/manpages/iraf-generic.1
similarity index 100%
rename from debian/manpages/generic.1
rename to debian/manpages/iraf-generic.1
diff --git a/debian/manpages/rpp.1 b/debian/manpages/iraf-rpp.1
similarity index 100%
rename from debian/manpages/rpp.1
rename to debian/manpages/iraf-rpp.1
diff --git a/debian/manpages/xpp.1 b/debian/manpages/iraf-xpp.1
similarity index 100%
rename from debian/manpages/xpp.1
rename to debian/manpages/iraf-xpp.1
diff --git a/debian/manpages/xyacc.1 b/debian/manpages/iraf-xyacc.1
similarity index 100%
rename from debian/manpages/xyacc.1
rename to debian/manpages/iraf-xyacc.1
diff --git a/debian/manpages/manpage.1.ex b/debian/manpages/manpage.1.ex
deleted file mode 100644
index 3059ffd..0000000
--- a/debian/manpages/manpage.1.ex
+++ /dev/null
@@ -1,60 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH IRAF SECTION "January 30, 2000"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-iraf \- program to do something
-.SH SYNOPSIS
-.B iraf
-.RI [ options ] " files" ...
-.br
-.B bar
-.RI [ options ] " files" ...
-.SH DESCRIPTION
-This manual page documents briefly the
-.B iraf
-and
-.B bar
-commands.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-Instead, it has documentation in the GNU Info format; see below.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBiraf\fP is a program that...
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-For a complete description, see the Info files.
-.TP
-.B \-h, \-\-help
-Show summary of options.
-.TP
-.B \-v, \-\-version
-Show version of program.
-.SH SEE ALSO
-.BR bar (1),
-.BR baz (1).
-.br
-The programs are documented fully by
-.IR "The Rise and Fall of a Fooish Bar" ,
-available via the Info system.
-.SH AUTHOR
-This manual page was written by Zed Pobre <zed at debian.org>,
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/rules b/debian/rules
index 4414934..a252b90 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,7 +70,13 @@ override_dh_auto_install-indep:
 	  install -p -D -m 644 $$f debian/tmp/usr/share/iraf/$$f ; \
 	  touch debian/tmp/usr/share/iraf/$$f ; \
 	done
-# The "touch" is for Ubuntu  
+# The "touch" above is for Ubuntu
+	for f in unix/hlib/cl.csh unix/hlib/ecl.csh \
+	         unix/hlib/mkiraf.csh unix/hlib/mkmlist.csh \
+	         unix/hlib/irafarch.csh ; do \
+	  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
 
 override_dh_auto_clean:
 	rm -rf vo/votools/.old

-- 
Image Reduction and Analysis Facility

