[Debian-astro-commits] [iraf] 01/03: Fix files test and location printout of global login.cl
Ole Streicher
olebole at moszumanska.debian.org
Mon Nov 27 21:58:39 UTC 2017
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch master
in repository iraf.
commit 3547093489de3bfebd7522a3a6fb7e353fcb0bd3
Author: Ole Streicher <olebole at debian.org>
Date: Sun Nov 26 21:19:26 2017 +0100
Fix files test and location printout of global login.cl
---
.../Make-the-installation-FHS-conform.patch | 159 +++++++++++++++++++--
.../patches/Separate-NOAO-and-dev-packages.patch | 2 +-
.../Use-system-libraries-when-possible.patch | 28 +++-
3 files changed, 176 insertions(+), 13 deletions(-)
diff --git a/debian/patches/Make-the-installation-FHS-conform.patch b/debian/patches/Make-the-installation-FHS-conform.patch
index 0da4ccb..4f89b03 100644
--- a/debian/patches/Make-the-installation-FHS-conform.patch
+++ b/debian/patches/Make-the-installation-FHS-conform.patch
@@ -5,15 +5,16 @@ Subject: Make the installation FHS conform
This moves the IRAF installation from /iraf/iraf/ to /usr/share/iraf/, with
the system dependent files (binaries) in /usr/lib/iraf.
---
- noao/lib/zzsetenv.def | 4 ++--
- pkg/cl/exec.c | 2 +-
- pkg/cl/main.c | 12 +++++++++++-
- pkg/ecl/exec.c | 2 +-
- pkg/ecl/main.c | 12 +++++++++++-
- unix/hlib/login.cl | 23 ++++++++++++-----------
- unix/hlib/zzsetenv.def | 3 ++-
- unix/os/irafpath.c | 10 ++++++++++
- 8 files changed, 50 insertions(+), 18 deletions(-)
+ noao/lib/zzsetenv.def | 4 +-
+ pkg/cl/exec.c | 2 +-
+ pkg/cl/main.c | 12 +++++-
+ pkg/ecl/exec.c | 2 +-
+ pkg/ecl/main.c | 12 +++++-
+ test/files.md | 112 ++++++++++++++++++++++++-------------------------
+ unix/hlib/login.cl | 23 +++++-----
+ unix/hlib/zzsetenv.def | 3 +-
+ unix/os/irafpath.c | 10 +++++
+ 9 files changed, 106 insertions(+), 74 deletions(-)
diff --git a/noao/lib/zzsetenv.def b/noao/lib/zzsetenv.def
index c38a4be..d51ff4c 100644
@@ -101,8 +102,144 @@ index ee1aeae..7e927c9 100644
}
} else {
+diff --git a/test/files.md b/test/files.md
+index 17293ef..240b97b 100644
+--- a/test/files.md
++++ b/test/files.md
+@@ -28,30 +28,30 @@ bin$x_vol.e
+ ```
+
+ ```
+-cl> dir host$bin/*.e ncol=1
+-host$bin/alloc.e
+-host$bin/f2c.e
+-host$bin/generic.e
+-host$bin/mkpkg.e
+-host$bin/rmbin.e
+-host$bin/rmfiles.e
+-host$bin/rpp.e
+-host$bin/rtar.e
+-host$bin/sgi2gif.e
+-host$bin/sgi2svg.e
+-host$bin/sgi2uapl.e
+-host$bin/sgi2ueps.e
+-host$bin/sgi2uhpgl.e
+-host$bin/sgi2uhplj.e
+-host$bin/sgi2uimp.e
+-host$bin/sgi2uptx.e
+-host$bin/sgi2uqms.e
+-host$bin/sgi2xbm.e
+-host$bin/sgidispatch.e
+-host$bin/wtar.e
+-host$bin/xc.e
+-host$bin/xpp.e
+-host$bin/xyacc.e
++cl> dir hbin$*.e ncol=1
++hbin$alloc.e
++hbin$f2c.e
++hbin$generic.e
++hbin$mkpkg.e
++hbin$rmbin.e
++hbin$rmfiles.e
++hbin$rpp.e
++hbin$rtar.e
++hbin$sgi2gif.e
++hbin$sgi2svg.e
++hbin$sgi2uapl.e
++hbin$sgi2ueps.e
++hbin$sgi2uhpgl.e
++hbin$sgi2uhplj.e
++hbin$sgi2uimp.e
++hbin$sgi2uptx.e
++hbin$sgi2uqms.e
++hbin$sgi2xbm.e
++hbin$sgidispatch.e
++hbin$wtar.e
++hbin$xc.e
++hbin$xpp.e
++hbin$xyacc.e
+ ```
+
+ # Libraries
+@@ -89,44 +89,44 @@ bin$libxtools.a
+ ```
+
+ ```
+-cl> dir host$bin/*.a ncol=1
+-host$bin/libboot.a
+-host$bin/libf2c.a
+-host$bin/libos.a
++cl> dir hbin$*.a ncol=1
++hbin$libboot.a
++hbin$libf2c.a
++hbin$libos.a
+ ```
+
+ ## NOAO packages
+
+ ```
+-cl> dir noao$bin/*.e ncol=1
+-noao$bin/x_apextract.e
+-noao$bin/x_apphot.e
+-noao$bin/x_artdata.e
+-noao$bin/x_astcat.e
+-noao$bin/x_astutil.e
+-noao$bin/x_bias.e
+-noao$bin/x_ccdred.e
+-noao$bin/x_crutil.e
+-noao$bin/x_daophot.e
+-noao$bin/x_dtoi.e
+-noao$bin/x_generic.e
+-noao$bin/x_irred.e
+-noao$bin/x_longslit.e
+-noao$bin/x_mtlocal.e
+-noao$bin/x_nobsolete.e
+-noao$bin/x_nproto.e
+-noao$bin/x_obsutil.e
+-noao$bin/x_onedspec.e
+-noao$bin/x_photcal.e
+-noao$bin/x_ptools.e
+-noao$bin/x_quad.e
+-noao$bin/x_quadred.e
+-noao$bin/x_rv.e
+-noao$bin/x_scombine.e
++cl> dir noaobin$*.e ncol=1
++noaobin$x_apextract.e
++noaobin$x_apphot.e
++noaobin$x_artdata.e
++noaobin$x_astcat.e
++noaobin$x_astutil.e
++noaobin$x_bias.e
++noaobin$x_ccdred.e
++noaobin$x_crutil.e
++noaobin$x_daophot.e
++noaobin$x_dtoi.e
++noaobin$x_generic.e
++noaobin$x_irred.e
++noaobin$x_longslit.e
++noaobin$x_mtlocal.e
++noaobin$x_nobsolete.e
++noaobin$x_nproto.e
++noaobin$x_obsutil.e
++noaobin$x_onedspec.e
++noaobin$x_photcal.e
++noaobin$x_ptools.e
++noaobin$x_quad.e
++noaobin$x_quadred.e
++noaobin$x_rv.e
++noaobin$x_scombine.e
+ ```
+
+ ```
+-cl> dir noao$bin/*.a ncol=1
+-noao$bin/libasttools.a
+-noao$bin/libsmw.a
++cl> dir noaobin$*.a ncol=1
++noaobin$libasttools.a
++noaobin$libsmw.a
+ ```
diff --git a/unix/hlib/login.cl b/unix/hlib/login.cl
-index d30a9d2..fb38e08 100644
+index d30a9d2..cc3198d 100644
--- a/unix/hlib/login.cl
+++ b/unix/hlib/login.cl
@@ -4,19 +4,20 @@
@@ -141,7 +278,7 @@ index d30a9d2..fb38e08 100644
path (".") | scan (s1)
if ( osfn("home$") != substr (s1, strldx("!",s1)+1, strlen(s1)) ) {
- printf (" *** Using global login file: %slogin.cl\n", osfn("home$"))
-+ printf (" *** Using global login file: /etc/login.cl\n")
++ printf (" *** Using global login file: /etc/iraf/login.cl\n")
}
;
diff --git a/debian/patches/Separate-NOAO-and-dev-packages.patch b/debian/patches/Separate-NOAO-and-dev-packages.patch
index e656c2b..cdc3975 100644
--- a/debian/patches/Separate-NOAO-and-dev-packages.patch
+++ b/debian/patches/Separate-NOAO-and-dev-packages.patch
@@ -100,7 +100,7 @@ index 4e8b3a6..40b80e7 100644
list = dpkg
while (fscan (list, s1) != EOF) {
diff --git a/unix/hlib/login.cl b/unix/hlib/login.cl
-index fb38e08..b0ad230 100644
+index cc3198d..17df370 100644
--- a/unix/hlib/login.cl
+++ b/unix/hlib/login.cl
@@ -124,9 +124,12 @@ if (deftask ("proto"))
diff --git a/debian/patches/Use-system-libraries-when-possible.patch b/debian/patches/Use-system-libraries-when-possible.patch
index c1a7522..3be9bad 100644
--- a/debian/patches/Use-system-libraries-when-possible.patch
+++ b/debian/patches/Use-system-libraries-when-possible.patch
@@ -6,9 +6,10 @@ This includes lapack, cfitsio, readline.
curl and expat are already handled upstream.
---
math/mkpkg | 1 -
+ test/files.md | 3 ---
unix/boot/spp/xc.c | 4 ++--
vendor/mklibs | 4 ++--
- 3 files changed, 4 insertions(+), 5 deletions(-)
+ 4 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/math/mkpkg b/math/mkpkg
index 403aa1f..69c7716 100644
@@ -22,6 +23,31 @@ index 403aa1f..69c7716 100644
$call fftpack
$purge lib$
;
+diff --git a/test/files.md b/test/files.md
+index ad01607..17293ef 100644
+--- a/test/files.md
++++ b/test/files.md
+@@ -61,7 +61,6 @@ cl> dir bin$*.a ncol=1
+ bin$libVOTable.a
+ bin$libbev.a
+ bin$libc.a
+-bin$libcfitsio.a
+ bin$libcur.a
+ bin$libcurfit.a
+ bin$libdeboor.a
+@@ -75,12 +74,10 @@ bin$libimd.a
+ bin$libimfort.a
+ bin$libiminterp.a
+ bin$libinterp.a
+-bin$liblapack.a
+ bin$libllsq.a
+ bin$libmemdbg.a
+ bin$libncar.a
+ bin$libnlfit.a
+-bin$libreadline.a
+ bin$libsgi.a
+ bin$libslalib.a
+ bin$libstg.a
diff --git a/unix/boot/spp/xc.c b/unix/boot/spp/xc.c
index 61a3145..09b075f 100644
--- a/unix/boot/spp/xc.c
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/iraf.git
More information about the Debian-astro-commits
mailing list