[starlink-ast] 02/02: Adjust patches for new version
Ole Streicher
olebole-guest at moszumanska.debian.org
Tue May 13 12:45:43 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-ast.
commit b735c8599616984671dfdd200222859c69970363
Author: Ole Streicher <debian at liska.ath.cx>
Date: Tue May 13 14:23:48 2014 +0200
Adjust patches for new version
---
debian/changelog | 7 +++++
debian/control | 1 +
debian/patches/rename_library | 16 ++++++------
debian/patches/series | 2 +-
debian/patches/use_external_cminpack.patch | 32 +++++++++++++++++++++++
debian/patches/use_external_pal.patch | 16 ++++++------
debian/patches/use_liberfa.patch | 41 ------------------------------
debian/patches/use_std_automake.patch | 16 +++++-------
debian/repack-dfsg.sh | 1 +
9 files changed, 65 insertions(+), 67 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5b63692..5317c31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+starlink-ast (8.0.0+dfsg-1) unstable; urgency=low
+
+ * New upstream version.
+ * Depend on cminpack.
+
+ -- Ole Streicher <debian at liska.ath.cx> Tue, 13 May 2014 13:32:50 +0200
+
starlink-ast (7.3.4+dfsg-1) unstable; urgency=low
* New upstream version
diff --git a/debian/control b/debian/control
index 7e1338e..529beaa 100644
--- a/debian/control
+++ b/debian/control
@@ -3,6 +3,7 @@ Priority: optional
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Ole Streicher <debian at liska.ath.cx>
Build-Depends: autotools-dev,
+ libcminpack-dev,
debhelper (>= 9),
dh-autoreconf,
liberfa-dev,
diff --git a/debian/patches/rename_library b/debian/patches/rename_library
index e42c95b..6d63fbd 100644
--- a/debian/patches/rename_library
+++ b/debian/patches/rename_library
@@ -9,7 +9,7 @@ Description: "ast" is a quite short name for a library that is so
on the freshly unpacked source tarball.
--- a/Makefile.am
+++ b/Makefile.am
-@@ -235,7 +235,7 @@
+@@ -234,7 +234,7 @@
# The following list should include AST_PAR, but that must not be
# distributed, and so it is listed separately in
@@ -18,7 +18,7 @@ Description: "ast" is a quite short name for a library that is so
GRP_F_INCLUDE_FILES = \
GRF_PAR \
AST_ERR
-@@ -544,21 +544,21 @@
+@@ -550,21 +550,21 @@
if EXTERNAL_PAL
PAL_LIB =
else
@@ -51,7 +51,7 @@ Description: "ast" is a quite short name for a library that is so
stardocs_DATA = @STAR_LATEX_DOCUMENTATION@
dist_starnews_DATA = ast.news
-@@ -573,31 +573,31 @@
+@@ -579,31 +579,31 @@
if !NOTHREADS
if !NOPIC
@@ -97,7 +97,7 @@ Description: "ast" is a quite short name for a library that is so
$(GRP_C_ROUTINES) \
$(GRP_C_INCLUDE_FILES) \
$(GRP_F_INCLUDE_FILES) \
-@@ -605,55 +605,55 @@
+@@ -611,55 +611,55 @@
$(WCSLIB_FILES) \
ast_err.h
@@ -169,7 +169,7 @@ Description: "ast" is a quite short name for a library that is so
# The following files are built by the targets in this makefile.
MAINTAINERCLEANFILES = version.h builddocs addversion \
-@@ -707,24 +707,24 @@
+@@ -713,24 +713,24 @@
# Form a second link to the main object library (static and shared). This
# is used when a second pass through the library is needed during linking
# to resolve references made within other AST libraries (e.g. the grf
@@ -202,7 +202,7 @@ Description: "ast" is a quite short name for a library that is so
fi
# Make pre-distribution files. These are files which are required for
-@@ -760,5 +760,5 @@
+@@ -766,5 +766,5 @@
ast_test_SOURCES = ast_test.c
#ast_test_LDADD = `ast_link`
@@ -212,7 +212,7 @@ Description: "ast" is a quite short name for a library that is so
+ast_test_LDADD = @LIBPAL@ libstarlink_ast.la libstarlink_ast_pal.la libstarlink_ast_grf_3.2.la libstarlink_ast_grf_5.6.la libstarlink_ast_grf_2.0.la libstarlink_ast_grf3d.la libstarlink_ast_err.la -lm
--- a/ast.news
+++ b/ast.news
-@@ -174,7 +174,7 @@
+@@ -187,7 +187,7 @@
Main Changes in V7.0.2
----------------------
@@ -221,7 +221,7 @@ Description: "ast" is a quite short name for a library that is so
option is used when AST is configured.
-@@ -182,7 +182,7 @@
+@@ -195,7 +195,7 @@
----------------------
- The levmar and wcslib code distributed within AST is now stored in the
diff --git a/debian/patches/series b/debian/patches/series
index b314010..f360d2a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
rename_library
use_std_automake.patch
use_external_pal.patch
-use_liberfa.patch
+use_external_cminpack.patch
diff --git a/debian/patches/use_external_cminpack.patch b/debian/patches/use_external_cminpack.patch
new file mode 100644
index 0000000..18cf8a1
--- /dev/null
+++ b/debian/patches/use_external_cminpack.patch
@@ -0,0 +1,32 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Use cminpack provided by Debian
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -609,7 +609,6 @@
+ $(GRP_C_ROUTINES) \
+ $(GRP_C_INCLUDE_FILES) \
+ $(GRP_F_INCLUDE_FILES) \
+- $(CMINPACK_FILES) \
+ $(WCSLIB_FILES) \
+ ast_err.h
+
+@@ -618,7 +617,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@ -lerfa -lm
++libstarlink_ast_la_LIBADD = @LIBPAL@ -lerfa -lcminpack -lm
+ else
+ libstarlink_ast_la_LIBADD = libstarlink_ast_pal.la
+ endif
+--- a/polymap.c
++++ b/polymap.c
+@@ -121,7 +121,7 @@
+ #include "cmpmap.h" /* Compound mappings */
+ #include "polymap.h" /* Interface definition for this class */
+ #include "unitmap.h" /* Unit mappings */
+-#include "cminpack/cminpack.h" /* Levenberg - Marquardt minimization */
++#include <cminpack-1/cminpack.h> /* Levenberg - Marquardt minimization */
+ #include "pal.h" /* SLALIB function definitions */
+
+ /* Error code definitions. */
diff --git a/debian/patches/use_external_pal.patch b/debian/patches/use_external_pal.patch
index 65075a6..fc8339b 100644
--- a/debian/patches/use_external_pal.patch
+++ b/debian/patches/use_external_pal.patch
@@ -2,29 +2,29 @@ Author: Ole Streicher <debian at liska.ath.cx>
Description: The external PAL library in Debian is called "starlink-pal".
--- a/configure.ac
+++ b/configure.ac
-@@ -56,7 +56,7 @@
+@@ -55,7 +55,7 @@
external_pal="0")
AC_SUBST( EXTERNAL_PAL, $external_pal )
if test "$external_pal" = "1"; then
- AC_SUBST( LIBPAL, "-lpal" )
+ AC_SUBST( LIBPAL, "-lstarlink_pal" )
- AC_DEFINE([EXTERNAL_PAL],[1],[use external PAL and SOFA libraries]),
+ AC_DEFINE([EXTERNAL_PAL],[1],[use external PAL and ERFA libraries]),
else
AC_SUBST( LIBPAL, "" )
--- a/ast_link.in
+++ b/ast_link.in
-@@ -338,7 +338,7 @@
+@@ -337,7 +337,7 @@
# If we configured --with-external_pal include a link option to pick up
# an external PAL library.
- 1) args="${args} -lpal";;
+ 1) args="${args} @LIBPAL@";;
- # Otherwise, use the internal PAL & SOFA libraries.
+ # Otherwise, use the internal PAL & ERFA libraries.
*) args="${args} -last_pal";;
--- a/Makefile.am
+++ b/Makefile.am
-@@ -551,8 +551,6 @@
+@@ -557,8 +557,6 @@
$(PAL_LIB) \
libstarlink_ast.la \
libstarlink_ast_err.la \
@@ -33,16 +33,16 @@ Description: The external PAL library in Debian is called "starlink-pal".
libstarlink_ast_grf3d.la \
libstarlink_ast_grf_2.0.la \
libstarlink_ast_grf_3.2.la \
-@@ -615,7 +613,7 @@
+@@ -620,7 +618,7 @@
# libstarlink_ast_pal library will be empty, and we link to an external PAL
# library instead.
if EXTERNAL_PAL
-libstarlink_ast_la_LIBADD = $(libdir)/libpal.la
-+libstarlink_ast_la_LIBADD = @LIBPAL@ -lm
++libstarlink_ast_la_LIBADD = @LIBPAL@ -lerfa -lm
else
libstarlink_ast_la_LIBADD = libstarlink_ast_pal.la
endif
-@@ -767,4 +765,4 @@
+@@ -772,4 +770,4 @@
#ast_test_LDADD = `ast_link`
# Expand ast_link to avoid libstarlink_ast_pass2, which causes problems for Solaris
diff --git a/debian/patches/use_liberfa.patch b/debian/patches/use_liberfa.patch
deleted file mode 100644
index 8e0b379..0000000
--- a/debian/patches/use_liberfa.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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
-@@ -1292,7 +1292,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 */
diff --git a/debian/patches/use_std_automake.patch b/debian/patches/use_std_automake.patch
index 6d3883f..cfa8659 100644
--- a/debian/patches/use_std_automake.patch
+++ b/debian/patches/use_std_automake.patch
@@ -3,20 +3,19 @@ Description: Do not depend on the starlink's automake, but use their macro
file together with the standard automake
--- a/configure.ac
+++ b/configure.ac
-@@ -13,7 +13,11 @@
+@@ -13,7 +13,10 @@
dnl Require autoconf-2.50 at least
AC_PREREQ([2.69])
dnl Require Starlink automake
--AM_INIT_AUTOMAKE(1.8.2-starlink)
-+AM_INIT_AUTOMAKE([foreign])
-+
+-AM_INIT_AUTOMAKE([1.8.2-starlink subdir-objects])
++AM_INIT_AUTOMAKE([foreign subdir-objects])
+# Comment out predistribution sources in Makefile.am
+PREDIST='#' # safe default
+AC_SUBST(PREDIST)
dnl Sanity-check: name a file in the source directory
AC_CONFIG_SRCDIR([ast_link.in])
-@@ -175,7 +179,7 @@
+@@ -175,7 +178,7 @@
# satisfy these targets, so give a non-null value
# for the second argument, to suppress automatic generation of
# rules.
@@ -27,13 +26,13 @@ Description: Do not depend on the starlink's automake, but use their macro
STAR_CHECK_PROGS(prolat, sst) # prolat is part of SST
--- a/Makefile.am
+++ b/Makefile.am
-@@ -560,9 +560,14 @@
+@@ -566,9 +566,13 @@
libstarlink_ast_pgplot.la \
libstarlink_ast_pgplot3d.la
-stardocs_DATA = @STAR_LATEX_DOCUMENTATION@
-dist_starnews_DATA = ast.news
--dist_pkgdata_DATA = LICENCE
+-dist_pkgdata_DATA = COPYING COPYING.LESSER COPYING.LIB
+doc: @STARDOCS at .pdf @STARDOCS@/index.html
+.tex.pdf:
+ pdflatex $^ && pdflatex $^
@@ -41,11 +40,10 @@ Description: Do not depend on the starlink's automake, but use their macro
+ at STARDOCS@/index.html: @STARDOCS at .tex
+ latex2html -noaddress $^
+ rm -f @STARDOCS@/@STARDOCS at .html @STARDOCS@/WARNINGS
-+
# Make all library code position independent by default. This is handy for
# creating shareable libraries from the static ones (Java JNI libraries).
-@@ -713,6 +718,7 @@
+@@ -719,6 +723,7 @@
# Use target install-exec-hook rather than install-exec-local so that the
# soft links and files are created *after* the main library has been
# installed.
diff --git a/debian/repack-dfsg.sh b/debian/repack-dfsg.sh
index 66f697c..bf444a3 100755
--- a/debian/repack-dfsg.sh
+++ b/debian/repack-dfsg.sh
@@ -14,6 +14,7 @@ tar xf $orig_tar -C $TMPDIR
srcdir=$TMPDIR/*
echo $srcdir
rm -rf $srcdir/sofa* $srcdir/pal* $srcdir/Ers.h \
+ $srcdir/erfa* $srcdir/cminpack* \
$srcdir/sun???.htx_tar $srcdir/sun???.ps $srcdir/sun???.pdf
dfsg_tar=$tardir/starlink-ast_$ver+dfsg.orig.tar.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/starlink-ast.git
More information about the debian-science-commits
mailing list