[Debian-astro-commits] [iraf] 03/04: Merge -common package into main package
Ole Streicher
olebole at moszumanska.debian.org
Sun Nov 26 13:58:30 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 9e90502b63f57d933c0668137cc59fee13dd0a80
Author: Ole Streicher <olebole at debian.org>
Date: Sat Nov 25 20:44:48 2017 +0100
Merge -common package into main package
---
debian/control | 52 +++++-----------------
debian/iraf-common.install | 21 ---------
debian/iraf-common.lintian-overrides | 3 --
debian/iraf-dev.install | 6 +--
debian/iraf-dev.links | 7 ++-
debian/iraf-noao-common.install | 1 -
debian/iraf-noao-common.lintian-overrides | 3 --
debian/iraf-noao.install | 1 +
debian/{iraf-common.dirs => iraf.dirs} | 0
debian/{iraf-common.docs => iraf.docs} | 0
debian/iraf.install | 22 +++++++++
debian/{iraf-common.manpages => iraf.manpages} | 0
debian/irafcl | 1 +
.../Make-the-installation-FHS-conform.patch | 41 ++++++++++++-----
debian/rules | 13 +++---
15 files changed, 78 insertions(+), 93 deletions(-)
diff --git a/debian/control b/debian/control
index 9a1160d..83ae070 100644
--- a/debian/control
+++ b/debian/control
@@ -18,40 +18,23 @@ Vcs-Git: https://anonscm.debian.org/cgit/debian-astro/packages/iraf.git
Package: iraf
Architecture: any
-Depends: iraf-common, ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: iraf-noao
Suggests: iraf-dev
Multi-Arch: foreign
Description: Image Reduction and Analysis Facility
IRAF is the "Image Reduction and Analysis Facility". The main
IRAF distribution includes a good selection of programs for
- general image processing and graphics, plus a large number of
- programs for the reduction and analysis of optical and IR
- astronomy data. Other external or layered packages are available for
+ general image processing and graphics.
+ .
+ Other external or layered packages are available for
applications such as data acquisition or handling data from other
observatories and wavelength regimes such as the Hubble Space
Telescope (optical), EUVE (extreme ultra-violet), or ROSAT and
AXAF (X-ray). These external packages are distributed separately
from the main IRAF distribution but can be easily installed.
- The IRAF system also includes a complete programming environment
- for scientific applications, which includes a programmable Command
- Language scripting facility, the IMFORT Fortran/C
- programming interface, and the full SPP/VOS programming
- environment in which the portable IRAF system and all
- applications are written.
-
-Package: iraf-common
-Architecture: all
-Depends: ${misc:Depends}
-Recommends: iraf
-Description: Image Reduction and Analysis Facility (common files)
- IRAF is the "Image Reduction and Analysis Facility". The main
- IRAF distribution includes a good selection of programs for
- general image processing and graphics, plus a large number of
- programs for the reduction and analysis of optical and IR
- astronomy data.
- .
- This file contains the common files used on all architectures.
+ The IRAF system also the programmable Command Language scripting
+ facility.
Package: iraf-dev
Architecture: any
@@ -64,11 +47,13 @@ Description: Image Reduction and Analysis Facility (development files)
programs for the reduction and analysis of optical and IR
astronomy data.
.
- This file contains the files required for compilation of new tasks.
+ This package contains the IMFORT Fortran/C programming interface, and
+ the full SPP/VOS programming environment in which the portable IRAF
+ system and all applications are written.
Package: iraf-noao
Architecture: any
-Depends: iraf, iraf-noao-common, ${misc:Depends}, ${shlibs:Depends}
+Depends: iraf, ${misc:Depends}, ${shlibs:Depends}
Multi-Arch: foreign
Description: IRAF NOAO data reduction package
IRAF is the "Image Reduction and Analysis Facility". The main
@@ -77,18 +62,5 @@ Description: IRAF NOAO data reduction package
programs for the reduction and analysis of optical and IR
astronomy data.
.
- This file contains the NOAO data reduction package.
-
-Package: iraf-noao-common
-Architecture: all
-Depends: ${misc:Depends}
-Recommends: iraf-noao
-Description: IRAF NOAO data reduction package (common files)
- IRAF is the "Image Reduction and Analysis Facility". The main
- IRAF distribution includes a good selection of programs for
- general image processing and graphics, plus a large number of
- programs for the reduction and analysis of optical and IR
- astronomy data.
- .
- This file contains the architecture independent files of the
- NOAO data reduction package.
+ This file contains the NOAO packages for the reduction and analysis
+ of Optical Astronomy data.
diff --git a/debian/iraf-common.install b/debian/iraf-common.install
deleted file mode 100644
index 8d69d5d..0000000
--- a/debian/iraf-common.install
+++ /dev/null
@@ -1,21 +0,0 @@
-usr/share/iraf/dev
-usr/share/iraf/extern
-usr/share/iraf/lib
-usr/share/iraf/local
-usr/share/iraf/math
-usr/share/iraf/pkg/bench
-usr/share/iraf/pkg/cl
-usr/share/iraf/pkg/dataio
-usr/share/iraf/pkg/dbms
-usr/share/iraf/pkg/ecl
-usr/share/iraf/pkg/images
-usr/share/iraf/pkg/language
-usr/share/iraf/pkg/lists
-usr/share/iraf/pkg/obsolete
-usr/share/iraf/pkg/plot
-usr/share/iraf/pkg/proto
-usr/share/iraf/pkg/system
-usr/share/iraf/pkg/utilities
-usr/share/iraf/pkg/xtools
-usr/share/iraf/sys
-usr/share/iraf/unix
diff --git a/debian/iraf-common.lintian-overrides b/debian/iraf-common.lintian-overrides
deleted file mode 100644
index 6e68748..0000000
--- a/debian/iraf-common.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# Since the package is really old, we will find some really old
-# files here. This is not a bug.
-package-contains-ancient-file *
diff --git a/debian/iraf-dev.install b/debian/iraf-dev.install
index 8c14462..2de038e 100644
--- a/debian/iraf-dev.install
+++ b/debian/iraf-dev.install
@@ -1,8 +1,8 @@
-usr/share/iraf/pkg/softools
-unix/bin/*.e usr/lib/iraf/unix
-unix/bin/lib*.a usr/lib/iraf/unix
bin/lib*.a usr/lib/iraf
bin/libmain.o usr/lib/iraf
include usr/share/iraf
+unix/bin/*.e usr/lib/iraf/unix
+unix/bin/lib*.a usr/lib/iraf/unix
unix/hlib/*.h usr/share/iraf/unix/hlib
unix/hlib/libc/ usr/share/iraf/unix/hlib
+usr/share/iraf/pkg/softools
diff --git a/debian/iraf-dev.links b/debian/iraf-dev.links
index 7551737..a0aa0b1 100644
--- a/debian/iraf-dev.links
+++ b/debian/iraf-dev.links
@@ -1,8 +1,7 @@
-usr/lib/iraf/unix/mkpkg.e usr/lib/iraf/bin/mkpkg
-usr/lib/iraf/unix/xc.e usr/lib/iraf/bin/xc
usr/lib/iraf/unix/generic.e usr/lib/iraf/bin/generic
-usr/lib/iraf/unix/xyacc.e usr/lib/iraf/bin/xyacc
+usr/lib/iraf/unix/mkpkg.e usr/lib/iraf/bin/mkpkg
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
-
diff --git a/debian/iraf-noao-common.install b/debian/iraf-noao-common.install
deleted file mode 100644
index f8d2f65..0000000
--- a/debian/iraf-noao-common.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/iraf/noao/
diff --git a/debian/iraf-noao-common.lintian-overrides b/debian/iraf-noao-common.lintian-overrides
deleted file mode 100644
index 6e68748..0000000
--- a/debian/iraf-noao-common.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# Since the package is really old, we will find some really old
-# files here. This is not a bug.
-package-contains-ancient-file *
diff --git a/debian/iraf-noao.install b/debian/iraf-noao.install
index 13be512..f31bb60 100644
--- a/debian/iraf-noao.install
+++ b/debian/iraf-noao.install
@@ -1 +1,2 @@
noao/bin/*.e usr/lib/iraf/noao
+usr/share/iraf/noao/
diff --git a/debian/iraf-common.dirs b/debian/iraf.dirs
similarity index 100%
rename from debian/iraf-common.dirs
rename to debian/iraf.dirs
diff --git a/debian/iraf-common.docs b/debian/iraf.docs
similarity index 100%
rename from debian/iraf-common.docs
rename to debian/iraf.docs
diff --git a/debian/iraf.install b/debian/iraf.install
index 4b44389..091d9ce 100644
--- a/debian/iraf.install
+++ b/debian/iraf.install
@@ -1,2 +1,24 @@
bin/*.e usr/lib/iraf
debian/irafcl usr/bin
+etc/iraf/login.cl
+usr/share/iraf/dev
+usr/share/iraf/extern
+usr/share/iraf/lib
+usr/share/iraf/local
+usr/share/iraf/math
+usr/share/iraf/pkg/bench
+usr/share/iraf/pkg/cl
+usr/share/iraf/pkg/dataio
+usr/share/iraf/pkg/dbms
+usr/share/iraf/pkg/ecl
+usr/share/iraf/pkg/images
+usr/share/iraf/pkg/language
+usr/share/iraf/pkg/lists
+usr/share/iraf/pkg/obsolete
+usr/share/iraf/pkg/plot
+usr/share/iraf/pkg/proto
+usr/share/iraf/pkg/system
+usr/share/iraf/pkg/utilities
+usr/share/iraf/pkg/xtools
+usr/share/iraf/sys
+usr/share/iraf/unix
diff --git a/debian/iraf-common.manpages b/debian/iraf.manpages
similarity index 100%
rename from debian/iraf-common.manpages
rename to debian/iraf.manpages
diff --git a/debian/irafcl b/debian/irafcl
index eb596d5..c746fad 100755
--- a/debian/irafcl
+++ b/debian/irafcl
@@ -3,6 +3,7 @@
# Unset variable that are used by IRAF
unset host iraf hbin hlib
+unset mach arch IRAFARCH IRAFBIN
irafbin=/usr/lib/iraf/
diff --git a/debian/patches/Make-the-installation-FHS-conform.patch b/debian/patches/Make-the-installation-FHS-conform.patch
index 98942ec..f62e49d 100644
--- a/debian/patches/Make-the-installation-FHS-conform.patch
+++ b/debian/patches/Make-the-installation-FHS-conform.patch
@@ -8,13 +8,13 @@ the system dependent files (binaries) in /usr/lib/iraf.
noao/lib/zzsetenv.def | 4 ++--
pkg/cl/main.c | 14 +++++++++++++-
pkg/ecl/main.c | 14 +++++++++++++-
- unix/hlib/clpackage.cl | 4 +++-
- unix/hlib/extern.pkg | 29 +++++++++++++++++------------
+ unix/hlib/clpackage.cl | 5 +++--
+ unix/hlib/extern.pkg | 34 ++++++++++++++++++++++------------
unix/hlib/extpkg.cl | 2 +-
unix/hlib/login.cl | 32 ++++++++++++++++++--------------
- unix/hlib/zzsetenv.def | 3 ++-
+ unix/hlib/zzsetenv.def | 4 ++--
unix/os/irafpath.c | 10 ++++++++++
- 9 files changed, 79 insertions(+), 33 deletions(-)
+ 9 files changed, 84 insertions(+), 35 deletions(-)
diff --git a/noao/lib/zzsetenv.def b/noao/lib/zzsetenv.def
index c38a4be..da6916a 100644
@@ -81,10 +81,18 @@ index ee1aeae..1a4b27f 100644
} else {
diff --git a/unix/hlib/clpackage.cl b/unix/hlib/clpackage.cl
-index cb017cd..e0feed6 100644
+index cb017cd..d8121b2 100644
--- a/unix/hlib/clpackage.cl
+++ b/unix/hlib/clpackage.cl
-@@ -46,7 +46,9 @@ if (access ("hlib$extpkg.cl") == yes)
+@@ -24,7 +24,6 @@ task lists.pkg = "lists$lists.cl"
+ task obsolete.pkg = "obsolete$obsolete.cl"
+ task plot.pkg = "plot$plot.cl"
+ task proto.pkg = "proto$proto.cl"
+-task softools.pkg = "softools$softools.cl"
+ 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
@@ -96,10 +104,10 @@ index cb017cd..e0feed6 100644
# 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..d0935c2 100644
+index 5afbabf..f29bbc5 100644
--- a/unix/hlib/extern.pkg
+++ b/unix/hlib/extern.pkg
-@@ -4,12 +4,16 @@
+@@ -4,12 +4,21 @@
reset extern = iraf$extern/
@@ -109,6 +117,11 @@ index 5afbabf..d0935c2 100644
-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
@@ -122,7 +135,7 @@ index 5afbabf..d0935c2 100644
#reset local = iraf$local/
#task local.pkg = local$local.cl
-@@ -29,12 +33,13 @@ task vo.pkg = vo$vo.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.
@@ -216,7 +229,7 @@ index d30a9d2..4f0f4ed 100644
;
diff --git a/unix/hlib/zzsetenv.def b/unix/hlib/zzsetenv.def
-index 6527a32..877fabd 100644
+index 6527a32..34e5954 100644
--- a/unix/hlib/zzsetenv.def
+++ b/unix/hlib/zzsetenv.def
@@ -58,8 +58,9 @@ set version = "Debian IRAF V2.16.1+"
@@ -230,6 +243,14 @@ index 6527a32..877fabd 100644
set boot = "host$boot/"
set dev = "iraf$dev/"
set doc = "iraf$doc/"
+@@ -107,7 +108,6 @@ set lists = "pkg$lists/"
+ set obsolete = "pkg$obsolete/"
+ set plot = "pkg$plot/"
+ set proto = "pkg$proto/"
+-set softools = "pkg$softools/"
+ set system = "pkg$system/"
+ set utilities = "pkg$utilities/"
+ set xtools = "pkg$xtools/"
diff --git a/unix/os/irafpath.c b/unix/os/irafpath.c
index 96e147a..5b4e149 100644
--- a/unix/os/irafpath.c
diff --git a/debian/rules b/debian/rules
index a53fbc4..a0cfb71 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,13 +21,10 @@ override_dh_auto_configure:
--root $(iraf) < /dev/null || true
$(MAKE) $(IRAFARCH)
-override_dh_auto_build-arch:
+override_dh_auto_build:
bin=$(iraf)bin/ noaobin=$(iraf)/noao/bin/ $(MAKE) sysgen
-override_dh_auto_build-indep:
- # Nothing to do
-
-override_dh_auto_install-indep:
+override_dh_auto_install:
for f in $(shell find . -name \*.hlp \
-o -name \*.hd \
-o -name \*.men \
@@ -44,11 +41,11 @@ override_dh_auto_install-indep:
unix/hlib/motd \
lib/syserrmsg lib/syshelpdir ; do \
install -p -D -m 644 $$f debian/tmp/usr/share/iraf/$$f ; \
- touch debian/tmp/usr/share/iraf/$$f ; \
done
mkdir -p debian/tmp/usr/share/iraf/extern/
- touch debian/tmp/usr/share/iraf/extern/.zzsetenv.def
-# The "touch" above is for Ubuntu
+ > debian/tmp/usr/share/iraf/extern/.zzsetenv.def
+ mkdir -p debian/tmp/etc/iraf
+ mv debian/tmp/usr/share/iraf/unix/hlib/login.cl debian/tmp/etc/iraf/
for f in unix/hlib/util.sh \
unix/hlib/mkiraf.sh unix/hlib/mkmlist.sh \
unix/hlib/irafarch.sh ; do \
--
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