[starlink-pal] 02/06: Adjust patches for new version
Ole Streicher
olebole-guest at moszumanska.debian.org
Wed Jul 30 09:09:31 UTC 2014
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 7cb9f221bb8987042c3e4203a1d0e66f052823b1
Author: Ole Streicher <debian at liska.ath.cx>
Date: Wed Jul 30 10:27:16 2014 +0200
Adjust patches for new version
---
debian/changelog | 6 +++
debian/patches/rename_library | 16 +++---
debian/patches/series | 1 -
debian/patches/use_liberfa.patch | 99 -----------------------------------
debian/patches/use_std_automake.patch | 20 +++----
5 files changed, 24 insertions(+), 118 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a533126..50b50e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+starlink-pal (0.5.0-1) unstable; urgency=low
+
+ * New upstream version (builds with erfa).
+
+ -- Ole Streicher <debian at liska.ath.cx> Wed, 30 Jul 2014 10:25:46 +0200
+
starlink-pal (0.3.0-3) unstable; urgency=low
* Build with erfa instead of iausofa.
diff --git a/debian/patches/rename_library b/debian/patches/rename_library
index 9346fb9..b591979 100644
--- a/debian/patches/rename_library
+++ b/debian/patches/rename_library
@@ -21,14 +21,14 @@ Description: "pal" is a quite short name for a library that is so
+libstarlink_pal_la_SOURCES = $(PUBLIC_C_FILES) palOne2One.c $(PRIVATE_C_FILES)
# If we are using a non-standard location
--libpal_la_CPPFLAGS = $(SOFA_CPPFLAGS)
--libpal_la_LDFLAGS = $(SOFA_LDFLAGS)
-+libstarlink_pal_la_CPPFLAGS = $(SOFA_CPPFLAGS)
-+libstarlink_pal_la_LDFLAGS = $(SOFA_LDFLAGS)
+-libpal_la_CPPFLAGS = $(ERFA_CPPFLAGS)
+-libpal_la_LDFLAGS = $(ERFA_LDFLAGS)
++libstarlink_pal_la_CPPFLAGS = $(ERFA_CPPFLAGS)
++libstarlink_pal_la_LDFLAGS = $(ERFA_LDFLAGS)
- # Force a link against SOFA and, optionally, starutil
--libpal_la_LIBADD = $(SOFA_LIBADD) $(STARUTIL_LIBADD)
-+libstarlink_pal_la_LIBADD = $(SOFA_LIBADD) $(STARUTIL_LIBADD)
+ # Force a link against ERFA and, optionally, starutil
+-libpal_la_LIBADD = $(ERFA_LIBADD) $(STARUTIL_LIBADD)
++libstarlink_pal_la_LIBADD = $(ERFA_LIBADD) $(STARUTIL_LIBADD)
# Misc files
dist_starnews_DATA = pal.news
@@ -41,7 +41,7 @@ Description: "pal" is a quite short name for a library that is so
endif
# install pal as "star/pal.h"
-@@ -120,7 +120,7 @@
+@@ -122,7 +122,7 @@
check_PROGRAMS = palTest
palTest_SOURCES = palTest.c
diff --git a/debian/patches/series b/debian/patches/series
index c8bcfcd..da737ee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
rename_library
use_std_automake.patch
-use_liberfa.patch
diff --git a/debian/patches/use_liberfa.patch b/debian/patches/use_liberfa.patch
deleted file mode 100644
index 88007cc..0000000
--- a/debian/patches/use_liberfa.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-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
diff --git a/debian/patches/use_std_automake.patch b/debian/patches/use_std_automake.patch
index d000fb8..5896353 100644
--- a/debian/patches/use_std_automake.patch
+++ b/debian/patches/use_std_automake.patch
@@ -5,7 +5,7 @@ Description: Do not depend on the starlink's automake, but use their macro
+++ b/configure.ac
@@ -7,7 +7,7 @@
dnl Require autoconf-2.50 at least
- AC_PREREQ(2.50)
+ AC_PREREQ([2.69])
dnl Require Starlink automake
-AM_INIT_AUTOMAKE(1.8.2-starlink)
+AM_INIT_AUTOMAKE([foreign])
@@ -15,18 +15,18 @@ Description: Do not depend on the starlink's automake, but use their macro
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,10 +11,9 @@
- libstarlink_pal_la_LDFLAGS = $(SOFA_LDFLAGS)
+ libstarlink_pal_la_LDFLAGS = $(ERFA_LDFLAGS)
- # Force a link against SOFA and, optionally, starutil
--libstarlink_pal_la_LIBADD = $(SOFA_LIBADD) $(STARUTIL_LIBADD)
-+libstarlink_pal_la_LIBADD = -lsofa_c
+ # Force a link against ERFA and, optionally, starutil
+-libstarlink_pal_la_LIBADD = $(ERFA_LIBADD) $(STARUTIL_LIBADD)
++libstarlink_pal_la_LIBADD = -lerfa
# Misc files
-dist_starnews_DATA = pal.news
- dist_pkgdata_DATA = LICENCE README.md
+ dist_pkgdata_DATA = COPYING COPYING.LESSER README.md
# Make all library code position independent. This is handy for creating
-@@ -114,7 +113,13 @@
+@@ -116,7 +115,13 @@
pal1Atms.c \
pal1Atmt.c
@@ -81,7 +81,7 @@ Description: Do not depend on the starlink's automake, but use their macro
+# Declare the message file.
+AC_DEFUN([STAR_MESSGEN], [])
+
-+# Declare the documentation.
++# Declare the documentation.
+# For Debian, this must be explicitely set in the patched Makefile.am
+# since we don't use Starlink's automake here.
+AC_DEFUN([STAR_LATEX_DOCUMENTATION], [
@@ -97,13 +97,13 @@ Description: Do not depend on the starlink's automake, but use their macro
+done
+])
+
-+# We ignor]e any starlinks programs here since we don' install the whole
++# We ignor]e any starlinks programs here since we don' install the whole
+# Starlink bootstrap chain.
+AC_DEFUN([STAR_CHECK_PROGS], [])
+
--- a/palDfltin.c
+++ b/palDfltin.c
-@@ -124,6 +124,7 @@
+@@ -126,6 +126,7 @@
#include <ctype.h>
#include "pal.h"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/starlink-pal.git
More information about the debian-science-commits
mailing list