[Debian-astro-commits] [iraf] 03/06: Rediff patches
Ole Streicher
olebole at moszumanska.debian.org
Thu Nov 30 14:09:19 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 63d6b1788279cbf3ece721c9579842eae190720c
Author: Ole Streicher <olebole at debian.org>
Date: Thu Nov 30 13:13:49 2017 +0100
Rediff patches
---
.../patches/Adjust-version-number-and-motd.patch | 8 +-
debian/patches/Don-t-call-back-home-on-start.patch | 4 +-
.../Make-the-installation-FHS-conform.patch | 94 ++++------------------
.../patches/Separate-NOAO-and-dev-packages.patch | 94 +++-------------------
.../Use-system-libraries-when-possible.patch | 2 +-
5 files changed, 36 insertions(+), 166 deletions(-)
diff --git a/debian/patches/Adjust-version-number-and-motd.patch b/debian/patches/Adjust-version-number-and-motd.patch
index 4490316..ee76d2a 100644
--- a/debian/patches/Adjust-version-number-and-motd.patch
+++ b/debian/patches/Adjust-version-number-and-motd.patch
@@ -12,7 +12,7 @@ Subject: Adjust version number and motd
create mode 100644 unix/hlib/motd.etc
diff --git a/unix/hlib/login.cl b/unix/hlib/login.cl
-index bd10cd2..804ead4 100644
+index 5a4d375..5ce0670 100644
--- a/unix/hlib/login.cl
+++ b/unix/hlib/login.cl
@@ -2,7 +2,7 @@
@@ -24,7 +24,7 @@ index bd10cd2..804ead4 100644
set home = "U_HOME"
set imdir = "U_IMDIR"
-@@ -133,7 +133,10 @@ cache directory page type help
+@@ -136,7 +136,10 @@ cache directory page type help
if (access (".hushiraf"))
menus = no
else {
@@ -82,10 +82,10 @@ index 0000000..1156c0c
+ Visit http://iraf.net if you have questions. Report bugs to Debian
+ with the "reportbug" command.
diff --git a/unix/hlib/zzsetenv.def b/unix/hlib/zzsetenv.def
-index 881d9c7..f0fb384 100644
+index ee0cbcd..6fc73f6 100644
--- a/unix/hlib/zzsetenv.def
+++ b/unix/hlib/zzsetenv.def
-@@ -54,7 +54,7 @@ set terminal = xgterm
+@@ -40,7 +40,7 @@ set terminal = xgterm
set ttybaud = 9600
set ttyncols = 80
set ttynlines = 40
diff --git a/debian/patches/Don-t-call-back-home-on-start.patch b/debian/patches/Don-t-call-back-home-on-start.patch
index a06589d..0508253 100644
--- a/debian/patches/Don-t-call-back-home-on-start.patch
+++ b/debian/patches/Don-t-call-back-home-on-start.patch
@@ -7,10 +7,10 @@ Subject: Don't call back home on start
1 file changed, 2 deletions(-)
diff --git a/unix/hlib/login.cl b/unix/hlib/login.cl
-index 804ead4..3cb7d72 100644
+index 5ce0670..6d8c4c5 100644
--- a/unix/hlib/login.cl
+++ b/unix/hlib/login.cl
-@@ -141,8 +141,6 @@ else {
+@@ -144,8 +144,6 @@ else {
#============================================================================
diff --git a/debian/patches/Make-the-installation-FHS-conform.patch b/debian/patches/Make-the-installation-FHS-conform.patch
index 9d5a938..28f4bdb 100644
--- a/debian/patches/Make-the-installation-FHS-conform.patch
+++ b/debian/patches/Make-the-installation-FHS-conform.patch
@@ -5,16 +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 +++++-
- test/files.md | 112 ++++++++++++++++++++++++-------------------------
- unix/hlib/login.cl | 30 +++++++------
- unix/hlib/zzsetenv.def | 3 +-
- unix/os/irafpath.c | 10 +++++
- 9 files changed, 111 insertions(+), 76 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 | 56 +++++++++++++++++++++++++-------------------------
+ unix/hlib/login.cl | 30 +++++++++++++++------------
+ unix/hlib/zzsetenv.def | 3 ++-
+ unix/os/irafpath.c | 10 +++++++++
+ 9 files changed, 83 insertions(+), 48 deletions(-)
diff --git a/noao/lib/zzsetenv.def b/noao/lib/zzsetenv.def
index c38a4be..d51ff4c 100644
@@ -103,7 +103,7 @@ index ee1aeae..7e927c9 100644
} else {
diff --git a/test/files.md b/test/files.md
-index 755104c..f703377 100644
+index 1684d2e..f703377 100644
--- a/test/files.md
+++ b/test/files.md
@@ -28,30 +28,30 @@ bin$x_vol.e
@@ -161,7 +161,7 @@ index 755104c..f703377 100644
```
# Libraries
-@@ -90,44 +90,44 @@ bin$libxtools.a
+@@ -90,10 +90,10 @@ bin$libxtools.a
```
```
@@ -176,70 +176,8 @@ index 755104c..f703377 100644
```
## 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 3cb7d72..65076c0 100644
+index 6d8c4c5..e91682a 100644
--- a/unix/hlib/login.cl
+++ b/unix/hlib/login.cl
@@ -4,19 +4,23 @@
@@ -278,7 +216,7 @@ index 3cb7d72..65076c0 100644
#============================================================================
# Uncomment and edit to change the defaults.
-@@ -145,7 +149,7 @@ else {
+@@ -148,7 +152,7 @@ else {
# Notify the user if we're using the global login.
path (".") | scan (s1)
if ( osfn("home$") != substr (s1, strldx("!",s1)+1, strlen(s1)) ) {
@@ -288,10 +226,10 @@ index 3cb7d72..65076c0 100644
;
diff --git a/unix/hlib/zzsetenv.def b/unix/hlib/zzsetenv.def
-index f0fb384..55f41d1 100644
+index 6fc73f6..ea622fc 100644
--- a/unix/hlib/zzsetenv.def
+++ b/unix/hlib/zzsetenv.def
-@@ -58,8 +58,9 @@ set version = "Debian IRAF __VERSION__ __DATE__"
+@@ -44,8 +44,9 @@ set version = "Debian IRAF __VERSION__ __DATE__"
# System directories.
diff --git a/debian/patches/Separate-NOAO-and-dev-packages.patch b/debian/patches/Separate-NOAO-and-dev-packages.patch
index 59de878..bf1b38c 100644
--- a/debian/patches/Separate-NOAO-and-dev-packages.patch
+++ b/debian/patches/Separate-NOAO-and-dev-packages.patch
@@ -4,15 +4,14 @@ Subject: Separate NOAO and development (softools) packages
This allows to install a "core" IRAF without NOAO and development tools.
---
- unix/hlib/clpackage.cl | 5 +++--
- unix/hlib/extern.pkg | 34 ++++++++++++++++++++++------------
- unix/hlib/extpkg.cl | 2 +-
- unix/hlib/login.cl | 9 ++++++---
- unix/hlib/zzsetenv.def | 1 -
- 5 files changed, 32 insertions(+), 19 deletions(-)
+ unix/hlib/clpackage.cl | 1 -
+ unix/hlib/extern.pkg | 5 +++++
+ unix/hlib/extpkg.cl | 2 +-
+ unix/hlib/zzsetenv.def | 1 -
+ 4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/unix/hlib/clpackage.cl b/unix/hlib/clpackage.cl
-index cb017cd..d8121b2 100644
+index e0feed6..d8121b2 100644
--- a/unix/hlib/clpackage.cl
+++ b/unix/hlib/clpackage.cl
@@ -24,7 +24,6 @@ task lists.pkg = "lists$lists.cl"
@@ -23,69 +22,22 @@ index cb017cd..d8121b2 100644
task system.pkg = "system$system.cl"
task utilities.pkg = "utilities$utilities.cl"
-@@ -46,7 +45,9 @@ if (access ("hlib$extpkg.cl") == yes)
- images
- proto
- utilities
--noao
-+if (deftask ("noao"))
-+ noao
-+;
-
- # Load the SYSTEM package. Avoid printing menu, but do not change the
- # default value of the menus switch.
diff --git a/unix/hlib/extern.pkg b/unix/hlib/extern.pkg
-index 5afbabf..f29bbc5 100644
+index d0935c2..f29bbc5 100644
--- a/unix/hlib/extern.pkg
+++ b/unix/hlib/extern.pkg
-@@ -4,12 +4,21 @@
+@@ -4,6 +4,11 @@
reset extern = iraf$extern/
--reset noao = iraf$noao/
--task noao.pkg = noao$noao.cl
--
--reset vo = iraf$vo/
--task vo.pkg = vo$vo.cl
--
+if (access ("pkg$softools/softools.cl") == yes) {
+ reset softools = pkg$softools/
+ task softools.pkg = softools$softools.cl
+}
+;
-+if (access ("iraf$noao/noao.cl") == yes) {
-+ reset noao = iraf$noao/
-+ task noao.pkg = noao$noao.cl
-+}
-+;
-+if (access ("iraf$vo/vo.cl") == yes) {
-+ reset vo = iraf$vo/
-+ task vo.pkg = vo$vo.cl
-+}
-+;
- #reset local = iraf$local/
- #task local.pkg = local$local.cl
-
-@@ -29,12 +38,13 @@ task vo.pkg = vo$vo.cl
-
- # Initialize the helpdb string. We'll add to this when dyanamically
- # loading packages when the next load the CLPACKAGE.
--reset helpdb = "lib$helpdb.mip\
-- ,noao$lib/helpdb.mip\
-- ,vo$lib/helpdb.mip\
--# ,example$lib/helpdb.mip\
-- "
--
-+reset helpdb = "lib$helpdb.mip"
-+if (access("noao$lib/helpdb.mip") == yes)
-+ reset helpdb = (envget("helpdb") // ",noao$lib/helpdb.mip")
-+;
-+if (access("vo$lib/helpdb.mip") == yes)
-+ reset helpdb = (envget("helpdb") // ",vo$lib/helpdb.mip")
-+;
-
- # Do not modify below this line!
- clpackage
+ if (access ("iraf$noao/noao.cl") == yes) {
+ reset noao = iraf$noao/
+ task noao.pkg = noao$noao.cl
diff --git a/unix/hlib/extpkg.cl b/unix/hlib/extpkg.cl
index 4e8b3a6..40b80e7 100644
--- a/unix/hlib/extpkg.cl
@@ -99,31 +51,11 @@ index 4e8b3a6..40b80e7 100644
list = dpkg
while (fscan (list, s1) != EOF) {
-diff --git a/unix/hlib/login.cl b/unix/hlib/login.cl
-index 65076c0..e91682a 100644
---- a/unix/hlib/login.cl
-+++ b/unix/hlib/login.cl
-@@ -127,9 +127,12 @@ if (deftask ("proto"))
-
- tv # image display
- utilities # miscellaneous utilities
--noao # optical astronomy packages
--vo # Virtual Observatory tools
--
-+if (deftask ("noao"))
-+ noao # optical astronomy packages
-+;
-+if (deftask ("vo"))
-+ vo # Virtual Observatory tools
-+;
- prcache directory
- cache directory page type help
-
diff --git a/unix/hlib/zzsetenv.def b/unix/hlib/zzsetenv.def
-index 55f41d1..e478418 100644
+index ea622fc..3d28b4a 100644
--- a/unix/hlib/zzsetenv.def
+++ b/unix/hlib/zzsetenv.def
-@@ -108,7 +108,6 @@ set lists = "pkg$lists/"
+@@ -94,7 +94,6 @@ set lists = "pkg$lists/"
set obsolete = "pkg$obsolete/"
set plot = "pkg$plot/"
set proto = "pkg$proto/"
diff --git a/debian/patches/Use-system-libraries-when-possible.patch b/debian/patches/Use-system-libraries-when-possible.patch
index 0091fbc..651a54d 100644
--- a/debian/patches/Use-system-libraries-when-possible.patch
+++ b/debian/patches/Use-system-libraries-when-possible.patch
@@ -14,7 +14,7 @@ integers are 8 byte long) that is not used by lapack.
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/test/files.md b/test/files.md
-index ad01607..755104c 100644
+index cd5bb0c..1684d2e 100644
--- a/test/files.md
+++ b/test/files.md
@@ -61,7 +61,6 @@ cl> dir bin$*.a ncol=1
--
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