[SCM] Handle World Coordinate Systems in Astronomy branch, debian, updated. f907f42bf635cc7f139df6a20c676aa7478c165e
Ole Streicher
debian at liska.ath.cx
Tue Mar 27 15:18:12 UTC 2012
The following commit has been merged in the debian branch:
commit f907f42bf635cc7f139df6a20c676aa7478c165e
Author: Ole Streicher <debian at liska.ath.cx>
Date: Tue Mar 27 16:21:59 2012 +0200
Use external package "libstarlink-pal" instead of internal PAL library
diff --git a/debian/control b/debian/control
index ea5f117..2a00c16 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: starlink-ast
Priority: extra
Maintainer: Ole Streicher <debian at liska.ath.cx>
Build-Depends: debhelper (>= 8.0.0), autotools-dev, dh-autoreconf,
- libsofa-c-dev, texlive, latex2html, ghostscript
+ libstarlink-pal-dev, texlive, latex2html, ghostscript
Standards-Version: 3.9.3
Section: science
Homepage: http://www.starlink.ac.uk/ast
diff --git a/debian/patches/fix_starlink_names.patch b/debian/patches/fix_starlink_names.patch
new file mode 100644
index 0000000..0b87451
--- /dev/null
+++ b/debian/patches/fix_starlink_names.patch
@@ -0,0 +1,105 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Since the library was renamed, the link script should refer to
+ the changed names as well. The link script is still not included in the
+ distribution; however we patch this already for reference.
+--- a/ast_link.in
++++ b/ast_link.in
+@@ -330,7 +330,7 @@
+ # -------------------------------
+ # Start forming the list of arguments with the main AST library itself, the
+ # "wcslib" module, and the "levmar" module.
+- args='-last -last_wcslib -last_levmar'
++ args='-lstarlink_ast -lstarlink_ast_wcslib -lstarlink_ast_levmar'
+
+ # Generate arguments for linking PAL.
+ # -----------------------------------
+@@ -352,12 +352,12 @@
+
+ # If using Starlink PGPLOT, link with the AST PGPLOT interface and
+ # the Fortran library via the PGP link script (if found).
+- pgp) args="${args} -last_pgplot `\`find pgp_link\``"
++ pgp) args="${args} -lstarlink_ast_pgplot `\`find pgp_link\``"
+ f77='y';;
+
+ # If using native PGPLOT, link with the AST PGPLOT interface and the
+ # Fortran library via the PGPLOT link script (if found).
+- pgplot) args="${args} -last_pgplot `\`find pgplot_link\``"
++ pgplot) args="${args} -lstarlink_ast_pgplot `\`find pgplot_link\``"
+ f77='y';;
+
+ # If using own graphics which conform to the requirements of the current
+@@ -374,17 +374,17 @@
+ # of AST, produce arguments which link in dummy implementations of any
+ # functions which are required by the current version of AST but which were
+ # not required by version 3.2.
+- v3.2) args="${args} -last_grf_5.6";;
++ v3.2) args="${args} -lstarlink_ast_grf_5.6";;
+
+ # If using own graphics which conform to the requirements of version 2.0
+ # of AST, produce arguments which link in dummy implementations of any
+ # functions which are required by the current version of AST but which were
+ # not required by version 2.0.
+- v2.0) args="${args} -last_grf_3.2 -last_grf_5.6";;
++ v2.0) args="${args} -lstarlink_ast_grf_3.2 -lstarlink_ast_grf_5.6";;
+
+ # Default graphics (none) requires linking with all the default (null) AST
+ # "grf" modules.
+- *) args="${args} -last_grf_2.0 -last_grf_3.2 -last_grf_5.6";;
++ *) args="${args} -lstarlink_ast_grf_2.0 -lstarlink_ast_grf_3.2 -lstarlink_ast_grf_5.6";;
+ esac
+
+
+@@ -394,12 +394,12 @@
+
+ # If using Starlink PGPLOT, link with the AST 3D PGPLOT interface and
+ # the Fortran library via the PGP link script (if found).
+- pgp) args="${args} -last_pgplot3d `\`find pgp_link\``"
++ pgp) args="${args} -lstarlink_ast_pgplot3d `\`find pgp_link\``"
+ f77='y';;
+
+ # If using native PGPLOT, link with the AST 3D PGPLOT interface and the
+ # Fortran library via the PGPLOT link script (if found).
+- pgplot) args="${args} -last_pgplot3d `\`find pgplot_link\``"
++ pgplot) args="${args} -lstarlink_ast_pgplot3d `\`find pgplot_link\``"
+ f77='y';;
+
+ # If using own 3D graphics which conform to the requirements of the current
+@@ -408,7 +408,7 @@
+
+ # Default graphics (none) requires linking with all the default (null) AST
+ # "grf3d" modules.
+- *) args="${args} -last_grf3d";;
++ *) args="${args} -lstarlink_ast_grf3d";;
+ esac
+
+
+@@ -419,7 +419,7 @@
+ # pass to resolve any backward references generated by the other modules
+ # used above. A different library name must be used to avoid the two passes
+ # being merged into one (either below, or by other link scripts).
+- args="${args} -last_pass2"
++ args="${args} -lstarlink_ast_pass2"
+
+ # Generate arguments for linking the error reporting system.
+ # ----------------------------------------------------------
+@@ -427,17 +427,17 @@
+
+ # If using EMS, link with the AST EMS interface and the EMS library via the
+ # link script (if found).
+- ems) args="${args} -last_ems `\`find ems_link\``";;
++ ems) args="${args} -lstarlink_ast_ems `\`find ems_link\``";;
+
+ # If using DRAMA, link with the AST DRAMA interface and the DRAMA Ers library
+ # via the link script (if found).
+- drama) args="${args} -last_drama -lers";;
++ drama) args="${args} -lstarlink_ast_drama -lers";;
+
+ # If using own error reporting, do not produce any arguments.
+ my) :;;
+
+ # Default error reporting requires linking with the default AST "err" module.
+- *) args="${args} -last_err";;
++ *) args="${args} -lstarlink_ast_err";;
+ esac
+
+ # Link with the maths library.
diff --git a/debian/patches/series b/debian/patches/series
index a7b7528..31ce793 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
use_std_automake.patch
-use_external_sofa.patch
+use_external_pal.patch
+fix_starlink_names.patch
spellfix.patch
diff --git a/debian/patches/use_external_pal.patch b/debian/patches/use_external_pal.patch
new file mode 100644
index 0000000..0419ee0
--- /dev/null
+++ b/debian/patches/use_external_pal.patch
@@ -0,0 +1,37 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: The external PAL library in Debian is called "starlink-pal" and
+ does not come with a libtool "la" file. So we will link it the conventional
+ way here.
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -618,7 +618,7 @@ libast_la_SOURCES = \
+ # libast_pal library will be empty, and we link to an external PAL
+ # library instead.
+ if EXTERNAL_PAL
+-libast_la_LIBADD = $(libdir)/libpal.la libast_wcslib.la libast_levmar.la
++libast_la_LIBADD = -lstarlink_pal libast_wcslib.la libast_levmar.la
+ else
+ libast_la_LIBADD = libast_pal.la libast_wcslib.la libast_levmar.la
+ endif
+--- a/configure.ac
++++ b/configure.ac
+@@ -57,7 +57,7 @@ AC_ARG_WITH([external_pal],
+ 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]),
+ else
+ AC_SUBST( LIBPAL, "" )
+--- a/ast_link.in
++++ b/ast_link.in
+@@ -339,7 +339,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} -lstarlink_pal";;
+
+ # Otherwise, use the internal PAL & SOFA libraries.
+ *) args="${args} -last_pal";;
diff --git a/debian/patches/use_external_sofa.patch b/debian/patches/use_external_sofa.patch
deleted file mode 100644
index 805757a..0000000
--- a/debian/patches/use_external_sofa.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Use the IAU SOFA library that is packaged in Debian.
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -517,11 +517,7 @@
- sofa/zpv.c \
- sofa/zr.c
-
--PAL_FILES = \
-- pal.c \
-- pal.h \
-- sofa.h \
-- sofam.h
-+PAL_FILES = $(STAR_PAL_FILES)
-
- bin_SCRIPTS = ast_link
- dist_bin_SCRIPTS = ast_link_adam
-@@ -668,6 +664,7 @@
-
- # Positional astronomy libraries.
- libast_pal_la_SOURCES = $(PAL_FILES)
-+libast_pal_la_LIBADD = -lsofa_c
-
- # The following files are built by the targets in this makefile.
- MAINTAINERCLEANFILES = version.h builddocs addversion \
diff --git a/debian/rules b/debian/rules
index 0ceb4bb..53804f0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,9 @@ override_dh_autoreconf:
sed s/libast/libstarlink_ast/g -i Makefile.am
AUTOMAKE="automake --foreign" dh_autoreconf
+override_dh_auto_configure:
+ dh_auto_configure -- --with-external_pal
+
override_dh_clean:
sed s/libstarlink_ast/libast/g -i Makefile.am
dh_clean
--
Handle World Coordinate Systems in Astronomy
More information about the debian-science-commits
mailing list