[Debian-astro-commits] [iraf] 01/01: Move everything to /usr/lib/iraf. Put devel binaries to /usr/bin
Ole Streicher
olebole at moszumanska.debian.org
Mon Dec 4 21:27:57 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 cc9315a1558d473ebd2b8fa5de15d61ecd639754
Author: Ole Streicher <olebole at debian.org>
Date: Mon Dec 4 09:10:38 2017 +0100
Move everything to /usr/lib/iraf. Put devel binaries to /usr/bin
---
debian/README.Debian | 10 +-
debian/TODO | 13 ---
debian/iraf-dev.install | 60 ++++++------
debian/iraf-dev.links | 16 ++--
debian/iraf-noao-dev.install | 5 +-
debian/iraf-noao.install | 3 +-
debian/iraf.dirs | 1 -
debian/iraf.docs | 2 +-
debian/iraf.install | 48 +++++-----
debian/iraf.links | 2 +-
debian/irafcl | 8 +-
debian/patches/Adjust-tests-for-FHS-paths.patch | 106 +++------------------
.../Make-the-installation-FHS-conform.patch | 57 ++++++-----
.../patches/Separate-NOAO-and-dev-packages.patch | 2 +-
debian/rules | 12 +--
15 files changed, 127 insertions(+), 218 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
index bbdb1da..8f541ec 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -8,14 +8,8 @@ Debian specific adoptions made in the Debian package include:
* The directory structur is changed according to the FHS
- /usr/share/iraf/ - IRAF root dir ($iraf)
- /usr/lib/iraf/ - Binaries and libs ($bin, $hbin)
- /etc/iraf/login.cl - Default login script
-
-* Since many IRAF development commands conflict with commands from
- other packages, they are not in /usr/bin/, but in
- /usr/lib/iraf/bin. You may prepend this directory to the PATH
- environment variable if you need to use them directly.
+ /usr/lib/iraf/ - IRAF root dir ($iraf)
+ /etc/iraf/login.cl - Default login script
* The user commands are installed in /usr/bin/, but cl/ecl had to be
renamed to "irafcl". If your source setup.sh as described above, cl
diff --git a/debian/TODO b/debian/TODO
deleted file mode 100644
index c61ef5f..0000000
--- a/debian/TODO
+++ /dev/null
@@ -1,13 +0,0 @@
-* Add aliases "cl", "ecl" to iraf-cl in setup.sh. Fix "iraf" alias to
- work with xterm as well. Default to xterm terminal.
-
-* Run unit tests on build and as CI
-
-* Update manpages. Also keep the manpages for IRAF internal commands
-
-* Strip more unnecessary files (development examples and such) from
- /usr/share/iraf
-
-* Check portability: little endian will probably work.
-
-* Propagate CFLAGS (Hardening)
diff --git a/debian/iraf-dev.install b/debian/iraf-dev.install
index b0a6d57..975b1f9 100644
--- a/debian/iraf-dev.install
+++ b/debian/iraf-dev.install
@@ -1,11 +1,11 @@
-bin/lib*.a usr/lib/iraf
-bin/libmain.o usr/lib/iraf
-include usr/share/iraf
-lib/*.h usr/share/iraf/lib
-lib/*.inc usr/share/iraf/lib
-lib/math usr/share/iraf/lib
-lib/pkg usr/share/iraf/lib
-lib/sysruk.x usr/share/iraf/lib
+bin/lib*.a usr/lib/iraf/bin
+bin/libmain.o usr/lib/iraf/bin
+include usr/lib/iraf
+lib/*.h usr/lib/iraf/lib
+lib/*.inc usr/lib/iraf/lib
+lib/math usr/lib/iraf/lib
+lib/pkg usr/lib/iraf/lib
+lib/sysruk.x usr/lib/iraf/lib
pkg/cl/libpkg.a usr/lib/iraf/pkg/cl
pkg/dataio/libpkg.a usr/lib/iraf/pkg/dataio
pkg/ecl/libpkg.a usr/lib/iraf/pkg/ecl
@@ -20,25 +20,25 @@ 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/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
-unix/hlib/*.sf usr/share/iraf/unix/hlib
-unix/hlib/f77.sh usr/share/iraf/unix/hlib
-unix/hlib/libc/ usr/share/iraf/unix/hlib
-usr/share/iraf/pkg/softools
-usr/share/iraf/unix/boot
-usr/share/iraf/unix/f2c
-usr/share/iraf/unix/os
+unix/bin/f2c.e usr/lib/iraf/unix/bin
+unix/bin/generic.e usr/lib/iraf/unix/bin
+unix/bin/lib*.a usr/lib/iraf/unix/bin
+unix/bin/mkpkg.e usr/lib/iraf/unix/bin
+unix/bin/rmbin.e usr/lib/iraf/unix/bin
+unix/bin/rmfiles.e usr/lib/iraf/unix/bin
+unix/bin/rpp.e usr/lib/iraf/unix/bin
+unix/bin/rtar.e usr/lib/iraf/unix/bin
+unix/bin/wtar.e usr/lib/iraf/unix/bin
+unix/bin/xc.e usr/lib/iraf/unix/bin
+unix/bin/xpp.e usr/lib/iraf/unix/bin
+unix/bin/xyacc.e usr/lib/iraf/unix/bin
+unix/f2c/libf2c/f2c.h usr/lib/iraf/unix/f2c/libf2c
+unix/hlib/*.h usr/lib/iraf/unix/hlib
+unix/hlib/*.inc usr/lib/iraf/unix/hlib
+unix/hlib/*.sf usr/lib/iraf/unix/hlib
+unix/hlib/f77.sh usr/lib/iraf/unix/hlib
+unix/hlib/libc/ usr/lib/iraf/unix/hlib
+usr/lib/iraf/pkg/softools
+usr/lib/iraf/unix/boot
+usr/lib/iraf/unix/f2c
+usr/lib/iraf/unix/os
diff --git a/debian/iraf-dev.links b/debian/iraf-dev.links
index 43a6e9c..fd8818b 100644
--- a/debian/iraf-dev.links
+++ b/debian/iraf-dev.links
@@ -1,8 +1,8 @@
-usr/lib/iraf/unix/generic.e usr/lib/iraf/bin/generic
-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/f77.sh usr/lib/iraf/bin/f77
-usr/share/iraf/unix/hlib/libc/iraf.h /usr/include/iraf.h
+usr/lib/iraf/unix/bin/generic.e usr/bin/generic
+usr/lib/iraf/unix/bin/mkpkg.e usr/bin/mkpkg
+usr/lib/iraf/unix/bin/rpp.e usr/bin/rpp
+usr/lib/iraf/unix/bin/xc.e usr/bin/xc
+usr/lib/iraf/unix/bin/xpp.e usr/bin/xpp
+usr/lib/iraf/unix/bin/xyacc.e usr/bin/xyacc
+usr/lib/iraf/unix/hlib/f77.sh usr/bin/f77-iraf
+usr/lib/iraf/unix/hlib/libc/iraf.h /usr/include/iraf.h
diff --git a/debian/iraf-noao-dev.install b/debian/iraf-noao-dev.install
index c4a3b05..e94f16a 100644
--- a/debian/iraf-noao-dev.install
+++ b/debian/iraf-noao-dev.install
@@ -1,7 +1,7 @@
noao/artdata/libpkg.a usr/lib/iraf/noao/artdata
noao/astcat/src/libpkg.a usr/lib/iraf/noao/astcat
noao/astutil/libpkg.a usr/lib/iraf/noao/astutil
-noao/bin/lib*.a usr/lib/iraf/noao
+noao/bin/lib*.a usr/lib/iraf/noao/bin
noao/digiphot/apphot/libpkg.a usr/lib/iraf/noao/digiphot/apphot
noao/digiphot/daophot/libpkg.a usr/lib/iraf/noao/digiphot/daophot
noao/digiphot/photcal/libpkg.a usr/lib/iraf/noao/digiphot/photcal
@@ -14,7 +14,7 @@ noao/imred/generic/libpkg.a usr/lib/iraf/noao/imred/generic
noao/imred/irred/libpkg.a usr/lib/iraf/noao/imred/irred
noao/imred/quadred/src/ccdproc/libpkg.a usr/lib/iraf/noao/imred/quadred/ccdproc
noao/imred/quadred/src/quad/libpkg.a usr/lib/iraf/noao/imred/quadred/quad
-noao/lib/*.h usr/share/iraf/noao/lib
+noao/lib/*.h usr/lib/iraf/noao/lib
noao/mtlocal/libpkg.a usr/lib/iraf/noao/mtlocal
noao/nproto/libpkg.a usr/lib/iraf/noao/nproto
noao/obsutil/src/libpkg.a usr/lib/iraf/noao/obsutil
@@ -23,4 +23,3 @@ noao/onedspec/scombine/libpkg.a usr/lib/iraf/noao/onedspec/scombine
noao/rv/libpkg.a usr/lib/iraf/noao/rv
noao/twodspec/apextract/libpkg.a usr/lib/iraf/noao/twodspec/apextract
noao/twodspec/longslit/libpkg.a usr/lib/iraf/noao/twodspec/longslit
-usr/share/iraf/noao/
diff --git a/debian/iraf-noao.install b/debian/iraf-noao.install
index 13be512..80f33c0 100644
--- a/debian/iraf-noao.install
+++ b/debian/iraf-noao.install
@@ -1 +1,2 @@
-noao/bin/*.e usr/lib/iraf/noao
+noao/bin/*.e usr/lib/iraf/noao/bin
+usr/lib/iraf/noao/
diff --git a/debian/iraf.dirs b/debian/iraf.dirs
deleted file mode 100644
index 6dae7ba..0000000
--- a/debian/iraf.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/iraf/extern
diff --git a/debian/iraf.docs b/debian/iraf.docs
index 0300682..e14f7ee 100644
--- a/debian/iraf.docs
+++ b/debian/iraf.docs
@@ -1 +1 @@
-debian/tmp/usr/share/iraf/doc
+debian/tmp/usr/lib/iraf/doc
diff --git a/debian/iraf.install b/debian/iraf.install
index 14d3fcb..ec97cf9 100644
--- a/debian/iraf.install
+++ b/debian/iraf.install
@@ -1,26 +1,26 @@
-bin/*.e usr/lib/iraf
+bin/*.e usr/lib/iraf/bin
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
-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/hlib
+unix/bin/alloc.e usr/lib/iraf/unix/bin
+unix/bin/sgi*.e usr/lib/iraf/unix/bin
+usr/lib/iraf/dev
+usr/lib/iraf/extern
+usr/lib/iraf/lib
+usr/lib/iraf/local
+usr/lib/iraf/math
+usr/lib/iraf/pkg/bench
+usr/lib/iraf/pkg/cl
+usr/lib/iraf/pkg/dataio
+usr/lib/iraf/pkg/dbms
+usr/lib/iraf/pkg/ecl
+usr/lib/iraf/pkg/images
+usr/lib/iraf/pkg/language
+usr/lib/iraf/pkg/lists
+usr/lib/iraf/pkg/obsolete
+usr/lib/iraf/pkg/plot
+usr/lib/iraf/pkg/proto
+usr/lib/iraf/pkg/system
+usr/lib/iraf/pkg/utilities
+usr/lib/iraf/pkg/xtools
+usr/lib/iraf/sys
+usr/lib/iraf/unix/hlib
diff --git a/debian/iraf.links b/debian/iraf.links
index ac22c59..703137b 100644
--- a/debian/iraf.links
+++ b/debian/iraf.links
@@ -1 +1 @@
-usr/lib/iraf/unix/sgidispatch.e usr/bin/sgidispatch
+usr/lib/iraf/unix/bin/sgidispatch.e usr/bin/sgidispatch
diff --git a/debian/irafcl b/debian/irafcl
index b1a1f2b..aee6921 100755
--- a/debian/irafcl
+++ b/debian/irafcl
@@ -5,7 +5,7 @@
unset host iraf hbin hlib
unset mach arch IRAFARCH IRAFBIN
-irafbin=/usr/lib/iraf/
+irafbin=/usr/lib/iraf/bin/
if [ -x ${irafbin}vocl.e ] ; then
cl_binary=${irafbin}vocl.e
@@ -15,10 +15,10 @@ else
cl_binary=${irafbin}cl.e
fi
-export iraf="/usr/share/iraf/"
+export iraf="/usr/lib/iraf/"
export host="${iraf}unix/"
-export hlib="${iraf}unix/hlib/"
-export hbin="${irafbin}/unix"
+export hlib="${host}hlib/"
+export hbin="${host}bin"
export F77="$hlib/f77.sh"
export F2C="$hbin/f2c.e"
diff --git a/debian/patches/Adjust-tests-for-FHS-paths.patch b/debian/patches/Adjust-tests-for-FHS-paths.patch
index 238de88..41fe227 100644
--- a/debian/patches/Adjust-tests-for-FHS-paths.patch
+++ b/debian/patches/Adjust-tests-for-FHS-paths.patch
@@ -3,85 +3,10 @@ Date: Thu, 30 Nov 2017 14:43:05 +0100
Subject: Adjust tests for FHS paths
---
- test/files.md | 56 +++++++++++++++++++++++------------------------
- test/numerical-recipes.md | 11 ++++++----
- test/run_tests | 11 ++++++++--
- 3 files changed, 44 insertions(+), 34 deletions(-)
+ test/numerical-recipes.md | 11 +++++++----
+ test/run_tests | 10 ++++------
+ 2 files changed, 11 insertions(+), 10 deletions(-)
-diff --git a/test/files.md b/test/files.md
-index 1684d2e..f703377 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
-@@ -90,10 +90,10 @@ 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
diff --git a/test/numerical-recipes.md b/test/numerical-recipes.md
index 495962a..f2801b8 100644
--- a/test/numerical-recipes.md
@@ -147,25 +72,24 @@ index 495962a..f2801b8 100644
cl> softools
cl> xc -x test_twofft.x numrep.x -lfftpack
diff --git a/test/run_tests b/test/run_tests
-index 72c58cb..fddccce 100755
+index 72c58cb..1731304 100755
--- a/test/run_tests
+++ b/test/run_tests
-@@ -16,9 +16,16 @@ if [ -z "$IRAFARCH" ] ; then
- export IRAFARCH=$(${iraf}unix/hlib/irafarch.sh)
+@@ -12,13 +12,11 @@
+ if [ -z "$iraf" ] ; then
+ export iraf=$(cd $(dirname $0)/..; pwd)/
fi
+-if [ -z "$IRAFARCH" ] ; then
+- export IRAFARCH=$(${iraf}unix/hlib/irafarch.sh)
+-fi
-+export LANG=C
-+export XC_CFLAGS="${CPPFLAGS} ${CFLAGS} -I${iraf}include"
-+export iraf=/usr/share/iraf/
-+export src=$(cd $(dirname $0)/..; pwd)/
-+export host="${iraf}unix/"
-+export hlib="${iraf}unix/hlib/"
- export arch=.${IRAFARCH}
+-export arch=.${IRAFARCH}
-export IRAFBIN=${iraf}bin${arch}/
-export PATH=$HOME/.iraf/bin:${PATH}
-+export IRAFBIN=/usr/lib/iraf/
-+export hbin="${IRAFBIN}unix/"
-+PATH=${IRAFBIN}bin:$PATH
++export LANG=C
++export iraf=/usr/lib/iraf/
++export src=$(cd $(dirname $0)/..; pwd)/
++export IRAFBIN=${iraf}bin/
TEST_FILES=""
IRAF_SHELLS=""
diff --git a/debian/patches/Make-the-installation-FHS-conform.patch b/debian/patches/Make-the-installation-FHS-conform.patch
index 0cb8111..50c842a 100644
--- a/debian/patches/Make-the-installation-FHS-conform.patch
+++ b/debian/patches/Make-the-installation-FHS-conform.patch
@@ -2,18 +2,17 @@ From: Ole Streicher <olebole at debian.org>
Date: Sat, 25 Nov 2017 15:45:49 +0100
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.
+This moves the IRAF installation from /iraf/iraf/ to /usr/lib/iraf/
---
noao/lib/zzsetenv.def | 4 ++--
pkg/cl/exec.c | 2 +-
pkg/ecl/exec.c | 2 +-
unix/hlib/zzsetenv.def | 3 ++-
- unix/os/irafpath.c | 10 ++++++++++
- 5 files changed, 16 insertions(+), 5 deletions(-)
+ unix/os/irafpath.c | 16 ----------------
+ 5 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/noao/lib/zzsetenv.def b/noao/lib/zzsetenv.def
-index c38a4be..d51ff4c 100644
+index c38a4be..f70c92f 100644
--- a/noao/lib/zzsetenv.def
+++ b/noao/lib/zzsetenv.def
@@ -1,7 +1,7 @@
@@ -21,8 +20,8 @@ index c38a4be..d51ff4c 100644
-set pkglibs = "noao$bin(arch)/,noao$lib/"
-set noaobin = "noao$bin(arch)/"
-+set pkglibs = "bin$noao/,noao$lib/"
-+set noaobin = "bin$noao/"
++set pkglibs = "noao$bin/,noao$lib/"
++set noaobin = "noao$bin/"
set noaolib = "noao$lib/"
set ccdtime = "noaolib$ccdtime/"
set onedstds = "noaolib$onedstds/"
@@ -53,7 +52,7 @@ index 322a3ce..4e70bf6 100644
* on certain platforms look for alternate binaries that may
* work. This supports backward compatability with older
diff --git a/unix/hlib/zzsetenv.def b/unix/hlib/zzsetenv.def
-index 6fc73f6..ea622fc 100644
+index 6fc73f6..2ae6d54 100644
--- a/unix/hlib/zzsetenv.def
+++ b/unix/hlib/zzsetenv.def
@@ -44,8 +44,9 @@ set version = "Debian IRAF __VERSION__ __DATE__"
@@ -63,28 +62,34 @@ index 6fc73f6..ea622fc 100644
+set host = "iraf$unix/"
set as = "host$as/"
-set bin = "iraf$bin(arch)/"
-+set bin = "/usr/lib/iraf/"
++set bin = "iraf$bin/"
set boot = "host$boot/"
set dev = "iraf$dev/"
set doc = "iraf$doc/"
diff --git a/unix/os/irafpath.c b/unix/os/irafpath.c
-index 96e147a..5b4e149 100644
+index 96e147a..121c46c 100644
--- a/unix/os/irafpath.c
+++ b/unix/os/irafpath.c
-@@ -94,6 +94,16 @@ char *fname; /* simple filename, no dirs */
- if (access (pathname, 0) == 0)
- return (pathname);
-
-+ /* Try IRAFBIN */
-+ strcpy (pathname, "/usr/lib/iraf/");
-+ strcat (pathname, fname);
-+ if (access (pathname, 0) == 0)
-+ return (pathname);
-+ strcpy (pathname, "/usr/lib/iraf/unix/");
-+ strcat (pathname, fname);
-+ if (access (pathname, 0) == 0)
-+ return (pathname);
-+
- /* Try HLIB */
+@@ -73,22 +73,6 @@ char *fname; /* simple filename, no dirs */
strcpy (pathname, (char *)hostdir);
- strcat (pathname, "hlib/");
+ strcat (pathname, "bin");
+
+-#ifdef __linux__
+-#ifdef __x86_64__
+- strcat (pathname, ".linux64");
+-#endif
+-#ifdef __i386__
+- strcat (pathname, ".linux");
+-#endif
+-#endif
+-#ifdef __APPLE__
+-#ifdef __x86_64__
+- strcat (pathname, ".macintel");
+-#endif
+-#ifdef __i386__
+- strcat (pathname, ".macosx");
+-#endif
+-#endif
+ strcat (pathname, "/");
+ strcat (pathname, fname);
+ if (access (pathname, 0) == 0)
diff --git a/debian/patches/Separate-NOAO-and-dev-packages.patch b/debian/patches/Separate-NOAO-and-dev-packages.patch
index bf1b38c..60cfd60 100644
--- a/debian/patches/Separate-NOAO-and-dev-packages.patch
+++ b/debian/patches/Separate-NOAO-and-dev-packages.patch
@@ -52,7 +52,7 @@ index 4e8b3a6..40b80e7 100644
list = dpkg
while (fscan (list, s1) != EOF) {
diff --git a/unix/hlib/zzsetenv.def b/unix/hlib/zzsetenv.def
-index ea622fc..3d28b4a 100644
+index 2ae6d54..2f36382 100644
--- a/unix/hlib/zzsetenv.def
+++ b/unix/hlib/zzsetenv.def
@@ -94,7 +94,6 @@ set lists = "pkg$lists/"
diff --git a/debian/rules b/debian/rules
index e4f2313..c4c486e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,17 +42,17 @@ override_dh_auto_install:
cut -c3-) \
unix/hlib/motd* \
lib/syserrmsg lib/syshelpdir ; do \
- install -p -D -m 644 $$f debian/tmp/usr/share/iraf/$$f ; \
+ install -p -D -m 644 $$f debian/tmp/usr/lib/iraf/$$f ; \
done
- mkdir -p debian/tmp/usr/share/iraf/extern/
- > debian/tmp/usr/share/iraf/extern/.zzsetenv.def
+ mkdir -p debian/tmp/usr/lib/iraf/extern/
+ > debian/tmp/usr/lib/iraf/extern/.zzsetenv.def
mkdir -p debian/tmp/etc/iraf
- mv debian/tmp/usr/share/iraf/unix/hlib/login.cl debian/tmp/etc/iraf/
- mv debian/tmp/usr/share/iraf/unix/hlib/motd.etc debian/tmp/etc/iraf/motd
+ mv debian/tmp/usr/lib/iraf/unix/hlib/login.cl debian/tmp/etc/iraf/
+ mv debian/tmp/usr/lib/iraf/unix/hlib/motd.etc debian/tmp/etc/iraf/motd
for f in unix/hlib/util.sh \
unix/hlib/mkiraf.sh unix/hlib/mkmlist.sh \
unix/hlib/irafarch.sh ; do \
- install -p -D -m 755 $$f debian/tmp/usr/share/iraf/$$f ; \
+ install -p -D -m 755 $$f debian/tmp/usr/lib/iraf/$$f ; \
done
override_dh_clean:
--
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