[starlink-pal] 01/01: Replace all calls of the IAU SOFA library by its truly open source pendand erfa
Ole Streicher
olebole-guest at moszumanska.debian.org
Sat Nov 30 13:26:48 UTC 2013
This is an automated email from the git hooks/post-receive script.
olebole-guest pushed a commit to branch debian
in repository starlink-pal.
commit 0fff7b0e3131276d7e1630c3c27d60ca13c78cec
Author: Ole Streicher <debian at liska.ath.cx>
Date: Sat Nov 30 13:33:12 2013 +0100
Replace all calls of the IAU SOFA library by its truly open source pendand erfa
---
debian/changelog | 6 +++
debian/control | 8 ++--
debian/patches/series | 1 +
debian/patches/use_liberfa.patch | 99 ++++++++++++++++++++++++++++++++++++++++
4 files changed, 110 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ae6afe2..a533126 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+starlink-pal (0.3.0-3) unstable; urgency=low
+
+ * Build with erfa instead of iausofa.
+
+ -- Ole Streicher <debian at liska.ath.cx> Sat, 30 Nov 2013 13:27:20 +0100
+
starlink-pal (0.3.0-2) unstable; urgency=low
* Use pdflatex instead of pslatex. Closes: #713264
diff --git a/debian/control b/debian/control
index 5262410..648cac1 100644
--- a/debian/control
+++ b/debian/control
@@ -8,10 +8,10 @@ Build-Depends: autotools-dev,
dh-autoreconf,
ghostscript,
latex2html,
- libsofa-c-dev,
+ liberfa-dev,
texlive,
texlive-font-utils
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Homepage: http://starlink.jach.hawaii.edu/starlink
Vcs-Git: git://anonscm.debian.org/debian-science/packages/starlink-pal.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/starlink-pal.git
@@ -23,7 +23,7 @@ Depends: libstarlink-pal0 (= ${binary:Version}), ${misc:Depends}
Suggests: libstarlink-pal-doc
Description: Positional Astronomy Library (development files)
This library is a collection of code designed to aid in replacing the SLA
- library with code from NOVAS and IAU SOFA.
+ library with code from NOVAS and ERFA.
.
Where possible the API is similar to the C SLA API except for the use of a
"pal" prefix.
@@ -53,7 +53,7 @@ Depends: ${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
Description: Positional Astronomy Library (documentation)
This library is a collection of code designed to aid in replacing the SLA
- library with code from NOVAS and IAU SOFA.
+ library with code from NOVAS and ERFA.
.
Where possible the API is similar to the C SLA API except for the use of a
"pal" prefix.
diff --git a/debian/patches/series b/debian/patches/series
index da737ee..c8bcfcd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
rename_library
use_std_automake.patch
+use_liberfa.patch
diff --git a/debian/patches/use_liberfa.patch b/debian/patches/use_liberfa.patch
new file mode 100644
index 0000000..88007cc
--- /dev/null
+++ b/debian/patches/use_liberfa.patch
@@ -0,0 +1,99 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Replace all calls of the IAU SOFA library by its truly
+ open source pendand erfa.
+--- /dev/null
++++ b/sofa.h
+@@ -0,0 +1,52 @@
++#include <erfa.h>
++
++#define iauA2af eraA2af
++#define iauA2tf eraA2tf
++#define iauAf2a eraAf2a
++#define iauAnp eraAnp
++#define iauAnpm eraAnpm
++#define iauC2s eraC2s
++#define iauCal2jd eraCal2jd
++#define iauD2tf eraD2tf
++#define iauDat eraDat
++#define iauEe06a eraEe06a
++#define iauEpb eraEpb
++#define iauEpb2jd eraEpb2jd
++#define iauEpj eraEpj
++#define iauEpj2jd eraEpj2jd
++#define iauEpv00 eraEpv00
++#define iauFk5hz eraFk5hz
++#define iauGd2gc eraGd2gc
++#define iauGmst06 eraGmst06
++#define iauHfk5z eraHfk5z
++#define iauIr eraIr
++#define iauJd2cal eraJd2cal
++#define iauNut06a eraNut06a
++#define iauObl06 eraObl06
++#define iauP06e eraP06e
++#define iauPap eraPap
++#define iauPas eraPas
++#define iauPdp eraPdp
++#define iauPlan94 eraPlan94
++#define iauPmat06 eraPmat06
++#define iauPn eraPn
++#define iauPnm06a eraPnm06a
++#define iaupv erapv
++#define iauPxp eraPxp
++#define iauRm2v eraRm2v
++#define iauRv2m eraRv2m
++#define iauRx eraRx
++#define iauRxp eraRxp
++#define iauRxpv eraRxpv
++#define iauRxr eraRxr
++#define iauRy eraRy
++#define iauRz eraRz
++#define iauS2c eraS2c
++#define iauSepp eraSepp
++#define iauSeps eraSeps
++#define iausofa erasofa
++#define iauStarpm eraStarpm
++#define iauTf2a eraTf2a
++#define iauTf2d eraTf2d
++#define iauTr eraTr
++#define iauTrxp eraTrxp
+--- /dev/null
++++ b/sofam.h
+@@ -0,0 +1,10 @@
++#include "sofa.h"
++#include <erfam.h>
++
++#define DD2R ERFA_DD2R
++#define DS2R ERFA_DS2R
++#define DAS2R ERFA_DAS2R
++#define DJY ERFA_DJY
++#define DJ00 ERFA_DJ00
++#define DAU ERFA_DAU
++#define dint(A) ((A)<0.0?ceil(A):floor(A))
+--- a/configure.ac
++++ b/configure.ac
+@@ -64,9 +64,9 @@
+ [AC_SUBST(STARUTIL_LIBADD, "-lstarutil")],
+ [AC_SUBST(STARUTIL_LIBADD, "")])
+
+- AC_CHECK_LIB([sofa_c],[iauCal2jd],
+- [AC_SUBST(SOFA_LIBADD, "-lsofa_c")],
+- [AC_ERROR([Missing SOFA library. Can not continue])])
++ AC_CHECK_LIB([erfa],[eraCal2jd],
++ [AC_SUBST(SOFA_LIBADD, "-lerfa")],
++ [AC_ERROR([Missing ERFA library. Can not continue])])
+ LDFLAGS="$save_LDFLAGS"
+
+ dnl Ensure that we use the $prefix values
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -10,8 +10,8 @@
+ libstarlink_pal_la_CPPFLAGS = $(SOFA_CPPFLAGS)
+ libstarlink_pal_la_LDFLAGS = $(SOFA_LDFLAGS)
+
+-# Force a link against SOFA and, optionally, starutil
+-libstarlink_pal_la_LIBADD = -lsofa_c
++# Force a link against ERFA and, optionally, starutil
++libstarlink_pal_la_LIBADD = -lerfa
+
+ # Misc files
+ dist_pkgdata_DATA = LICENCE README.md
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/starlink-pal.git
More information about the debian-science-commits
mailing list