[starlink-ast] 02/02: Build with erfa instead of iausofa

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole-guest pushed a commit to branch debian
in repository starlink-ast.

commit 997fc1bf8e6058b84685e0b3767c80b31479d195
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Dec 2 07:09:53 2013 +0100

    Build with erfa instead of iausofa
---
 debian/changelog                 |  1 +
 debian/control                   |  2 +-
 debian/patches/series            |  1 +
 debian/patches/use_liberfa.patch | 41 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d82b827..ad5bc7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ starlink-ast (7.3.2+dfsg-1) unstable; urgency=low
 
   * New upstream version
   * Disable html generation due to some bug in latex2html
+  * Build with erfa instead of iausofa
 
  -- Ole Streicher <debian at liska.ath.cx>  Wed, 25 Sep 2013 14:22:59 +0200
 
diff --git a/debian/control b/debian/control
index fa55058..b195333 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: autotools-dev,
                dh-autoreconf,
                ghostscript,
                latex2html,
-               libsofa-c-dev,
+               liberfa-dev,
                libstarlink-pal-dev,
                texlive,
 	       texlive-font-utils
diff --git a/debian/patches/series b/debian/patches/series
index be74705..fc28709 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 rename_library
 use_std_automake.patch
 use_external_pal.patch
+use_liberfa.patch
 dont_build_html.patch
diff --git a/debian/patches/use_liberfa.patch b/debian/patches/use_liberfa.patch
new file mode 100644
index 0000000..e172265
--- /dev/null
+++ b/debian/patches/use_liberfa.patch
@@ -0,0 +1,41 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Replace calls of the IAU SOFA library by its truly open source
+ pendand erfa.
+--- a/fitschan.c
++++ b/fitschan.c
+@@ -1264,7 +1264,10 @@
+ #include "timeframe.h"
+ #include "keymap.h"
+ #include "pal.h"
+-#include "sofa.h"
++#include "erfa.h"
++#define iauGd2gc eraGd2gc
++#define iauGd2gd eraGd2gd
++#define iauGc2gd eraGc2gd
+ #include "slamap.h"
+ #include "specframe.h"
+ #include "dsbspecframe.h"
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -613,7 +613,7 @@
+ # libstarlink_ast_pal library will be empty, and we link to an external PAL
+ # library instead.
+ if EXTERNAL_PAL
+-libstarlink_ast_la_LIBADD = @LIBPAL@ -lm
++libstarlink_ast_la_LIBADD = @LIBPAL@ -lerfa -lm
+ else
+ libstarlink_ast_la_LIBADD = libstarlink_ast_pal.la
+ endif
+--- a/xmlchan.c
++++ b/xmlchan.c
+@@ -222,7 +222,9 @@
+ #include "object.h"              /* Base Object class */
+ #include "wcsmap.h"              /* Angular conversion constants */
+ #include "xml.h"                 /* AST XML facilities */
+-#include "sofa.h"                /* IAU SOFA functions */
++#include "erfa.h"
++#define iauGd2gd eraGd2gd
++#define iauGc2gd eraGc2gd
+ #include "stcresourceprofile.h"  /* IVOA StcResourceProfile class */
+ #include "stcsearchlocation.h"   /* IVOA SearchLocation class */
+ #include "stccatalogentrylocation.h"/* IVOA CatalogEntryLocation class */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/starlink-ast.git