[Debian-astro-commits] [iraf] 01/01: Add XGTerm startup and desktop icon

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch master
in repository iraf.

commit c170e5f68a2a606aa33036ac2ddde3eecf766b9d
Author: Ole Streicher <olebole at debian.org>
Date:   Fri Dec 8 08:41:20 2017 +0100

    Add XGTerm startup and desktop icon
---
 debian/control      |   2 +-
 debian/iraf.desktop |  12 ++++++++++++
 debian/iraf.install |   2 ++
 debian/iraf.jpg     | Bin 0 -> 2778 bytes
 debian/irafcl       |  18 +++++++++++++++---
 5 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 409f7cb..ea051d7 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Vcs-Git: https://anonscm.debian.org/cgit/debian-astro/packages/iraf.git
 Package: iraf
 Architecture: any-amd64 any-i386
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: iraf-noao, reportbug
+Recommends: iraf-noao, xgterm | x11iraf | xterm
 Suggests: iraf-dev
 Multi-Arch: foreign
 Description: Image Reduction and Analysis Facility
diff --git a/debian/iraf.desktop b/debian/iraf.desktop
new file mode 100644
index 0000000..37acae0
--- /dev/null
+++ b/debian/iraf.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=IRAF
+GenericName=Astronomy Framework
+Keywords=Astronomy;
+Comment=Image Reduction and Analysis Facility
+Exec=/usr/bin/irafcl -x
+Icon=iraf.jpg
+Terminal=false
+StartupWMClass=XGterm
+Categories=Science;Astronomy;Application;
diff --git a/debian/iraf.install b/debian/iraf.install
index 69bfb2a..848ac85 100644
--- a/debian/iraf.install
+++ b/debian/iraf.install
@@ -1,4 +1,6 @@
 bin/*.e usr/lib/iraf/bin
+debian/iraf.desktop usr/share/applications
+debian/iraf.jpg usr/share/pixmaps/aladin.jpg
 debian/irafcl usr/bin
 etc/iraf/
 unix/bin/alloc.e usr/lib/iraf/unix/bin
diff --git a/debian/iraf.jpg b/debian/iraf.jpg
new file mode 100644
index 0000000..d280841
Binary files /dev/null and b/debian/iraf.jpg differ
diff --git a/debian/irafcl b/debian/irafcl
index aee6921..baf655a 100755
--- a/debian/irafcl
+++ b/debian/irafcl
@@ -22,7 +22,7 @@ export hbin="${host}bin"
 export F77="$hlib/f77.sh"
 export F2C="$hbin/f2c.e"
 
-while getopts "h?vcef:" opt; do
+while getopts "h?vcexf:" opt; do
     case "$opt" in
     h|\?)
 	echo 'IRAF Command Language Interpreter'
@@ -34,6 +34,7 @@ while getopts "h?vcef:" opt; do
 	echo '    -v        print version and exit'
 	echo '    -e        force ecl'
 	echo '    -c        force classic cl'
+	echo '    -x        start in new xgterm (xterm if xgterm is not installed)'
 	echo '    -f file   start with file'
 	echo ''
         ;;
@@ -47,6 +48,9 @@ while getopts "h?vcef:" opt; do
     c)
 	cl_binary=${irafbin}cl.e
 	;;
+    x)
+	start_x="yes"
+	;;
     f)
 	script=$OPTARG
 	;;
@@ -74,8 +78,16 @@ fi
 # Prepend IRAF bin dir to PATH to allow the use of devel commands
 PATH=${irafbin}bin:${PATH}
 
+if [ "${start_x}" = "yes" ] ; then
+    if which xgterm > /dev/null ; then
+        cl_binary="xgterm -e ${cl_binary}"
+    elif which xgterm > /dev/null ; then
+        cl_binary="xterm -e ${cl_binary}"
+    fi
+fi
+
 if [ -z "${script}" ] ; then
-    exec "${cl_binary}"
+    exec ${cl_binary}
 else
-    exec "${cl_binary}" -f "${script}"
+    exec ${cl_binary} -f "${script}"
 fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/iraf.git