...
 
Commits (2)
......@@ -3,9 +3,9 @@ Maintainer: Debian Astro Team <debian-astro-maintainers@lists.alioth.debian.org>
Uploaders: Ole Streicher <olebole@debian.org>
Section: science
Priority: optional
Build-Depends: libcfitsio-dev,
debhelper (>= 11),
iraf-dev
Build-Depends: debhelper (>= 11),
iraf-dev,
libcfitsio-dev
Standards-Version: 4.1.3
Vcs-Browser: https://salsa.debian.org/debian-astro-team/iraf-fitsutil
Vcs-Git: https://salsa.debian.org/debian-astro-team/iraf-fitsutil.git
......@@ -14,6 +14,7 @@ Package: iraf-fitsutil
Architecture: any
Multi-Arch: foreign
Depends: iraf,
libcfitsio-bin,
${misc:Depends},
${shlibs:Depends}
Enhances: iraf
......
From: Ole Streicher <ole@aip.de>
Date: Wed, 28 Feb 2018 13:48:58 +0100
Subject: Adjust executable paths
cfitsion utilities are taken from /usr/bin/, and the fitsutil task is
in fitsutilbin$.
---
fitsutil.cl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/fitsutil.cl b/fitsutil.cl
index cde226e..80442ea 100644
--- a/fitsutil.cl
+++ b/fitsutil.cl
@@ -16,15 +16,15 @@ task fxheader,
fxsplit,
fxconvert,
fxplf,
- fxcopy = "fitsutil$src/x_fitsutil.e"
+ fxcopy = "fitsutilbin$x_fitsutil.e"
task ricepack = "fitsutil$src/ricepack.cl"
task fpack = "fitsutil$src/fpack.cl"
task funpack = "fitsutil$src/funpack.cl"
task sum32 = "fitsutil$src/sum32.cl"
-task $t_fpack = ("$" // osfn("fitsutilbin$") // "fpack")
-task $t_funpack = ("$" // osfn("fitsutilbin$") // "funpack")
+task $t_fpack = ("$/usr/bin/fpack")
+task $t_funpack = ("$/usr/bin/funpack")
task $t_sum32 = ("$" // osfn("fitsutilbin$") // "sum32")
hidetask t_fpack
hidetask t_funpack
......@@ -5,8 +5,7 @@ Subject: Fix compilation
---
src/fgwrite.c | 2 ++
src/kwdb.c | 7 ++++---
src/mkpkg | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/fgwrite.c b/src/fgwrite.c
index 927e910..f06c853 100644
......@@ -44,16 +43,3 @@ index aaeeefa..5952e52 100644
static int hash();
static int addstr();
static int streq();
diff --git a/src/mkpkg b/src/mkpkg
index a2403a6..5d71e6b 100644
--- a/src/mkpkg
+++ b/src/mkpkg
@@ -22,7 +22,7 @@ relink:
!cc -m32 $(HSI_LF) fgread.o kwdb.o checksum.o -o fgread.e
!cc -m32 $(HSI_LF) sum32.o checksum.o -o sum32
$else
- !cc -c $(HSI_CF) fgwrite.c fgread.c sum32.c checksum.c kwdb.c
+ !cc -c fgwrite.c fgread.c sum32.c checksum.c kwdb.c
!cc fgwrite.o kwdb.o -o fgwrite.e
!cc fgread.o kwdb.o checksum.o -o fgread.e
!cc sum32.o checksum.o -o sum32
From: Ole Streicher <olebole@debian.org>
Date: Wed, 28 Feb 2018 14:05:13 +0100
Subject: Propagate CFLAGS etc.
---
src/mkpkg | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/mkpkg b/src/mkpkg
index a2403a6..308266b 100644
--- a/src/mkpkg
+++ b/src/mkpkg
@@ -22,10 +22,10 @@ relink:
!cc -m32 $(HSI_LF) fgread.o kwdb.o checksum.o -o fgread.e
!cc -m32 $(HSI_LF) sum32.o checksum.o -o sum32
$else
- !cc -c $(HSI_CF) fgwrite.c fgread.c sum32.c checksum.c kwdb.c
- !cc fgwrite.o kwdb.o -o fgwrite.e
- !cc fgread.o kwdb.o checksum.o -o fgread.e
- !cc sum32.o checksum.o -o sum32
+ !$(CC) $(CPPFLAGS) $(CFLAGS) -c fgwrite.c fgread.c sum32.c checksum.c kwdb.c
+ !$(CC) $(LDFLAGS) fgwrite.o kwdb.o -o fgwrite.e
+ !$(CC) $(LDFLAGS) fgread.o kwdb.o checksum.o -o fgread.e
+ !$(CC) $(LDFLAGS) sum32.o checksum.o -o sum32
$endif
!rm fgwrite.o fgread.o kwdb.o checksum.o sum32.o
;
Set-bin-directory.patch
Fix-compilation.patch
Adjust-executable-paths.patch
Propagate-CFLAGS-etc.patch