[Debian-astro-commits] [iraf] 01/01: Put sgi*.e files into main package

[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 1de687566546fb4de9f42924cc35c6b7a21a0553
Author: Ole Streicher <olebole at debian.org>
Date:   Wed Nov 29 16:39:24 2017 +0100

    Put sgi*.e files into main package
---
 debian/control           |  8 ++++----
 debian/iraf-dev.install  | 12 +++++++++++-
 debian/iraf-dev.links    |  2 +-
 debian/iraf-dev.manpages |  4 ++--
 debian/iraf.install      |  2 ++
 debian/iraf.links        |  2 +-
 6 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/debian/control b/debian/control
index 3caf28e..1f3843b 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/debian-astro/packages/iraf.git
 Vcs-Git: https://anonscm.debian.org/cgit/debian-astro/packages/iraf.git
 
 Package: iraf
-Architecture: any-i386 any-amd64
+Architecture: any-amd64 any-i386
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: iraf-noao, reportbug
 Suggests: iraf-dev
@@ -37,7 +37,7 @@ Description: Image Reduction and Analysis Facility
  facility.
 
 Package: iraf-dev
-Architecture: any-i386 any-amd64
+Architecture: any-amd64 any-i386
 Multi-Arch: no
 Depends: iraf, ${misc:Depends}, ${shlibs:Depends}
 Recommends: iraf-noao-dev
@@ -53,7 +53,7 @@ Description: Image Reduction and Analysis Facility (development files)
  system and all applications are written.
 
 Package: iraf-noao
-Architecture: any-i386 any-amd64
+Architecture: any-amd64 any-i386
 Depends: iraf, ${misc:Depends}, ${shlibs:Depends}
 Multi-Arch: foreign
 Description: IRAF NOAO data reduction package
@@ -67,7 +67,7 @@ Description: IRAF NOAO data reduction package
  of Optical Astronomy data.
 
 Package: iraf-noao-dev
-Architecture: any-i386 any-amd64
+Architecture: any-amd64 any-i386
 Multi-Arch: no
 Depends: iraf-dev, iraf-noao, ${misc:Depends}
 Description: IRAF NOAO data reduction package (development files)
diff --git a/debian/iraf-dev.install b/debian/iraf-dev.install
index b1a8587..b0a6d57 100644
--- a/debian/iraf-dev.install
+++ b/debian/iraf-dev.install
@@ -20,8 +20,18 @@ pkg/softools/libpkg.a usr/lib/iraf/pkg/softools
 pkg/system/libpkg.a usr/lib/iraf/pkg/system
 pkg/utilities/libpkg.a usr/lib/iraf/pkg/utilities
 pkg/utilities/nttools/libpkg.a usr/lib/iraf/pkg/utilities/nttools
-unix/bin/*.e usr/lib/iraf/unix
+unix/bin/f2c.e usr/lib/iraf/unix
+unix/bin/generic.e usr/lib/iraf/unix
 unix/bin/lib*.a usr/lib/iraf/unix
+unix/bin/mkpkg.e usr/lib/iraf/unix
+unix/bin/rmbin.e usr/lib/iraf/unix
+unix/bin/rmfiles.e usr/lib/iraf/unix
+unix/bin/rpp.e usr/lib/iraf/unix
+unix/bin/rtar.e usr/lib/iraf/unix
+unix/bin/wtar.e usr/lib/iraf/unix
+unix/bin/xc.e usr/lib/iraf/unix
+unix/bin/xpp.e usr/lib/iraf/unix
+unix/bin/xyacc.e usr/lib/iraf/unix
 unix/f2c/libf2c/f2c.h usr/share/iraf/unix/f2c/libf2c
 unix/hlib/*.h usr/share/iraf/unix/hlib
 unix/hlib/*.inc usr/share/iraf/unix/hlib
diff --git a/debian/iraf-dev.links b/debian/iraf-dev.links
index 4f75143..43a6e9c 100644
--- a/debian/iraf-dev.links
+++ b/debian/iraf-dev.links
@@ -4,5 +4,5 @@ usr/lib/iraf/unix/rpp.e usr/lib/iraf/bin/rpp
 usr/lib/iraf/unix/xc.e usr/lib/iraf/bin/xc
 usr/lib/iraf/unix/xpp.e usr/lib/iraf/bin/xpp
 usr/lib/iraf/unix/xyacc.e usr/lib/iraf/bin/xyacc
-usr/share/iraf/unix/hlib/libc/iraf.h /usr/include/iraf.h
 usr/share/iraf/unix/hlib/f77.sh usr/lib/iraf/bin/f77
+usr/share/iraf/unix/hlib/libc/iraf.h /usr/include/iraf.h
diff --git a/debian/iraf-dev.manpages b/debian/iraf-dev.manpages
index ace5046..e54b036 100644
--- a/debian/iraf-dev.manpages
+++ b/debian/iraf-dev.manpages
@@ -1,6 +1,6 @@
 debian/manpages/generic.1iraf
+debian/manpages/mkpkg.1iraf
 debian/manpages/rpp.1iraf
+debian/manpages/xc.1iraf
 debian/manpages/xpp.1iraf
 debian/manpages/xyacc.1iraf
-debian/manpages/mkpkg.1iraf
-debian/manpages/xc.1iraf
diff --git a/debian/iraf.install b/debian/iraf.install
index 120f4f6..14d3fcb 100644
--- a/debian/iraf.install
+++ b/debian/iraf.install
@@ -1,6 +1,8 @@
 bin/*.e usr/lib/iraf
 debian/irafcl usr/bin
 etc/iraf/login.cl
+unix/bin/alloc.e usr/lib/iraf/unix
+unix/bin/sgi*.e usr/lib/iraf/unix
 usr/share/iraf/dev
 usr/share/iraf/extern
 usr/share/iraf/lib
diff --git a/debian/iraf.links b/debian/iraf.links
index 6be0e6e..ac22c59 100644
--- a/debian/iraf.links
+++ b/debian/iraf.links
@@ -1 +1 @@
-usr/lib/iraf/sgidispatch.e usr/bin/sgidispatch
+usr/lib/iraf/unix/sgidispatch.e usr/bin/sgidispatch

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