[SCM] Handle World Coordinate Systems in Astronomy branch, master, updated. 2e71a44be06ebf45aed1fc8279e4de25e0323b9e

Ole Streicher debian at liska.ath.cx
Thu May 10 14:19:46 UTC 2012


The following commit has been merged in the master branch:
commit 2e71a44be06ebf45aed1fc8279e4de25e0323b9e
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu May 10 16:18:40 2012 +0200

    Put the patching of Makefile.am into an ordinary patch

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..339d012
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,2 @@
+The patch patches/rename_library.sh is created with the script
+create_patches_rename_library.sh.
diff --git a/debian/create_patches_rename_library.sh b/debian/create_patches_rename_library.sh
new file mode 100755
index 0000000..19d6e4f
--- /dev/null
+++ b/debian/create_patches_rename_library.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+VENDOR=starlink
+LIBNAME=ast
+
+PATCH_SED_CMD="s/lib${LIBNAME}/lib${VENDOR}_${LIBNAME}/g"
+FILES="Makefile.am ast_link.in ast.news"
+
+cat > debian/patches/rename_library <<EOF
+Author: Ole Streicher <debian at liska.ath.cx>
+Last-Update: $(date +%Y-%m-%d)
+Description: "${LIBNAME}" is a quite short name for a library that is so 
+ specific as this one. Therefore, and for consistency with the "pal" library, 
+ "${LIBNAME}" is prefixed by the vendor name "${VENDOR}".
+ .
+ This patch can be re-created by running 
+  ${0}
+ on the freshly unpacked source tarball.
+$(for f in ${FILES} ; do \
+ sed ${PATCH_SED_CMD} < ${f} | diff -u ${f} - --label a/${f} --label b/${f}; \
+ done )
+EOF
diff --git a/debian/patches/fix_starlink_names.patch b/debian/patches/fix_starlink_names.patch
deleted file mode 100644
index 1b55868..0000000
--- a/debian/patches/fix_starlink_names.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-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'
-+      args='-lstarlink_ast'
- 
- #  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,12 +427,12 @@
- 
- #  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) :;;
- 
diff --git a/debian/patches/rename_library b/debian/patches/rename_library
new file mode 100644
index 0000000..eaa74d7
--- /dev/null
+++ b/debian/patches/rename_library
@@ -0,0 +1,232 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Last-Update: 2012-05-10
+Description: "ast" is a quite short name for a library that is so 
+ specific as this one. Therefore, and for consistency with the "pal" library, 
+ "ast" is prefixed by the vendor name "starlink".
+ .
+ This patch can be re-created by running 
+  debian/create_patches_rename_library.sh
+ on the freshly unpacked source tarball.
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -235,7 +235,7 @@
+ 
+ # The following list should include AST_PAR, but that must not be
+ # distributed, and so it is listed separately in
+-# nodist_libast_la_SOURCES below.
++# nodist_libstarlink_ast_la_SOURCES below.
+ GRP_F_INCLUDE_FILES = \
+     GRF_PAR \
+     AST_ERR
+@@ -543,21 +543,21 @@
+ if EXTERNAL_PAL
+ PAL_LIB =
+ else
+-PAL_LIB = libast_pal.la
++PAL_LIB = libstarlink_ast_pal.la
+ endif
+ 
+ lib_LTLIBRARIES = \
+     $(PAL_LIB) \
+-    libast.la \
+-    libast_err.la \
+-    libast_ems.la \
+-    libast_drama.la \
+-    libast_grf3d.la \
+-    libast_grf_2.0.la \
+-    libast_grf_3.2.la \
+-    libast_grf_5.6.la \
+-    libast_pgplot.la \
+-    libast_pgplot3d.la
++    libstarlink_ast.la \
++    libstarlink_ast_err.la \
++    libstarlink_ast_ems.la \
++    libstarlink_ast_drama.la \
++    libstarlink_ast_grf3d.la \
++    libstarlink_ast_grf_2.0.la \
++    libstarlink_ast_grf_3.2.la \
++    libstarlink_ast_grf_5.6.la \
++    libstarlink_ast_pgplot.la \
++    libstarlink_ast_pgplot3d.la
+ 
+ stardocs_DATA = @STAR_LATEX_DOCUMENTATION@
+ dist_starnews_DATA = ast.news
+@@ -572,31 +572,31 @@
+ if !NOTHREADS
+ 
+ if !NOPIC
+-libast_la_CFLAGS = $(AM_CFLAGS) -prefer-pic -DTHREAD_SAFE
++libstarlink_ast_la_CFLAGS = $(AM_CFLAGS) -prefer-pic -DTHREAD_SAFE
+ else
+-libast_la_CFLAGS = $(AM_CFLAGS) -DTHREAD_SAFE
++libstarlink_ast_la_CFLAGS = $(AM_CFLAGS) -DTHREAD_SAFE
+ endif
+ 
+ else
+-libast_la_CFLAGS = $(AM_CFLAGS) -prefer-pic
++libstarlink_ast_la_CFLAGS = $(AM_CFLAGS) -prefer-pic
+ 
+ endif
+ 
+ if !NOPIC
+-libast_err_la_CFLAGS = $(AM_CFLAGS) -prefer-pic
+-libast_ems_la_CFLAGS = $(AM_CFLAGS) -prefer-pic
+-libast_drama_la_CFLAGS = $(AM_CFLAGS) -prefer-pic
+-libast_grf3d_la_CFLAGS = $(AM_CFLAGS) -prefer-pic
+-libast_grf_2_0_la_CFLAGS = $(AM_CFLAGS) -prefer-pic
+-libast_grf_3_2_la_CFLAGS = $(AM_CFLAGS) -prefer-pic
+-libast_grf_5_6_la_CFLAGS = $(AM_CFLAGS) -prefer-pic
+-libast_pgplot_la_CFLAGS = $(AM_CFLAGS) -prefer-pic
+-libast_pgplot3d_la_CFLAGS = $(AM_CFLAGS) -prefer-pic
+-libast_pal_la_CFLAGS = $(AM_CFLAGS) -prefer-pic
++libstarlink_ast_err_la_CFLAGS = $(AM_CFLAGS) -prefer-pic
++libstarlink_ast_ems_la_CFLAGS = $(AM_CFLAGS) -prefer-pic
++libstarlink_ast_drama_la_CFLAGS = $(AM_CFLAGS) -prefer-pic
++libstarlink_ast_grf3d_la_CFLAGS = $(AM_CFLAGS) -prefer-pic
++libstarlink_ast_grf_2_0_la_CFLAGS = $(AM_CFLAGS) -prefer-pic
++libstarlink_ast_grf_3_2_la_CFLAGS = $(AM_CFLAGS) -prefer-pic
++libstarlink_ast_grf_5_6_la_CFLAGS = $(AM_CFLAGS) -prefer-pic
++libstarlink_ast_pgplot_la_CFLAGS = $(AM_CFLAGS) -prefer-pic
++libstarlink_ast_pgplot3d_la_CFLAGS = $(AM_CFLAGS) -prefer-pic
++libstarlink_ast_pal_la_CFLAGS = $(AM_CFLAGS) -prefer-pic
+ endif
+ 
+ #  The module containing the main AST classes
+-libast_la_SOURCES = \
++libstarlink_ast_la_SOURCES = \
+     $(GRP_C_ROUTINES) \
+     $(GRP_C_INCLUDE_FILES) \
+     $(GRP_F_INCLUDE_FILES) \
+@@ -604,55 +604,55 @@
+     $(WCSLIB_FILES) \
+     ast_err.h
+ 
+-# Ensure libast links against libraries containing functions used within
+-# libast. If AST is configured --with-external-pal, then the internal
+-# libast_pal library will be empty, and we link to an external PAL
++# Ensure libstarlink_ast links against libraries containing functions used within
++# libstarlink_ast. If AST is configured --with-external-pal, then the internal
++# libstarlink_ast_pal library will be empty, and we link to an external PAL
+ # library instead.
+ if EXTERNAL_PAL
+-libast_la_LIBADD =  $(libdir)/libpal.la
++libstarlink_ast_la_LIBADD =  $(libdir)/libpal.la
+ else
+-libast_la_LIBADD = libast_pal.la
++libstarlink_ast_la_LIBADD = libstarlink_ast_pal.la
+ endif
+ 
+ # AST_PAR is really part of GRP_F_INCLUDE_FILES, but it must not be
+ # distributed, so list it separately.
+-nodist_libast_la_SOURCES = \
++nodist_libstarlink_ast_la_SOURCES = \
+     ast.h \
+     AST_PAR
+ 
+ #  The default error reporting module.
+-libast_err_la_SOURCES = err_null.c
++libstarlink_ast_err_la_SOURCES = err_null.c
+ 
+ #  The error reporting module that uses EMS to deliver errors.
+-libast_ems_la_SOURCES = err_ems.c
++libstarlink_ast_ems_la_SOURCES = err_ems.c
+ 
+ #  The error reporting module that uses DRAMA Ers to deliver errors.
+-libast_drama_la_SOURCES = err_drama.c
++libstarlink_ast_drama_la_SOURCES = err_drama.c
+ 
+ #  The module containing null implementations of the 3D graphics routines
+ #  required by AST
+-libast_grf3d_la_SOURCES = grf3d.c
++libstarlink_ast_grf3d_la_SOURCES = grf3d.c
+ 
+ #  The module containing null implementations of the graphics routines
+ #  required by AST V2.0
+-libast_grf_2_0_la_SOURCES = grf_2.0.c
++libstarlink_ast_grf_2_0_la_SOURCES = grf_2.0.c
+ 
+ #  The module containing null implementations of the graphics routines
+ #  added by AST V3.2 and not present in V2.0
+-libast_grf_3_2_la_SOURCES = grf_3.2.c
++libstarlink_ast_grf_3_2_la_SOURCES = grf_3.2.c
+ 
+ #  The module containing null implementations of the graphics routines
+ #  added by AST V5.6 and not present in V3.2
+-libast_grf_5_6_la_SOURCES = grf_5.6.c
++libstarlink_ast_grf_5_6_la_SOURCES = grf_5.6.c
+ 
+ #  The graphics module that uses PGPLOT for 2D graphical output.
+-libast_pgplot_la_SOURCES = grf_pgplot.c
++libstarlink_ast_pgplot_la_SOURCES = grf_pgplot.c
+ 
+ #  The graphics module that uses PGPLOT for 3D graphical output.
+-libast_pgplot3d_la_SOURCES = grf3d_pgplot.c
++libstarlink_ast_pgplot3d_la_SOURCES = grf3d_pgplot.c
+ 
+ #  Positional astronomy libraries.
+-libast_pal_la_SOURCES = $(PAL_FILES)
++libstarlink_ast_pal_la_SOURCES = $(PAL_FILES)
+ 
+ # The following files are built by the targets in this makefile.
+ MAINTAINERCLEANFILES = version.h builddocs addversion \
+@@ -706,24 +706,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
+-#  modules, etc), to functions defined within libast (e.g. memory management
++#  modules, etc), to functions defined within libstarlink_ast (e.g. memory management
+ #  and error reporting functions). Do not forget to change the contents of
+-#  the libast_pass2.la file to refer to libast_pass2.* rather than libast.*.
++#  the libstarlink_ast_pass2.la file to refer to libstarlink_ast_pass2.* rather than libstarlink_ast.*.
+ #  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.
+-install-exec-hook: libast.la
++install-exec-hook: libstarlink_ast.la
+ 	$(mkdir_p) $(DESTDIR)$(libdir)
+ 	cd $(DESTDIR)$(libdir); \
+-	for f in `ls libast.*`; do \
+-	   ff=`echo $$f | sed -e 's/libast/libast_pass2/'`; \
++	for f in `ls libstarlink_ast.*`; do \
++	   ff=`echo $$f | sed -e 's/libstarlink_ast/libstarlink_ast_pass2/'`; \
+ 	   if test -f "$$ff"; then rm "$$ff"; fi; \
+ 	   $(LN_S) $$f $$ff; \
+ 	   $(MANIFEST) && echo "MANIFEST:$(DESTDIR)$(libdir)/$$ff" || :; \
+ 	done; \
+-	if test -f "libast.la"; then \
+-	   if test -f "libast_pass2.la"; then rm "libast_pass2.la"; fi; \
+-	   sed -e 's/libast\./libast_pass2\./g' libast.la > libast_pass2.la; \
++	if test -f "libstarlink_ast.la"; then \
++	   if test -f "libstarlink_ast_pass2.la"; then rm "libstarlink_ast_pass2.la"; fi; \
++	   sed -e 's/libstarlink_ast\./libstarlink_ast_pass2\./g' libstarlink_ast.la > libstarlink_ast_pass2.la; \
+ 	fi
+ 
+ # Make pre-distribution files.  These are files which are required for
+@@ -759,5 +759,5 @@
+ ast_test_SOURCES = ast_test.c
+ 
+ #ast_test_LDADD = `ast_link`
+-# Expand ast_link to avoid libast_pass2, which causes problems for Solaris
+-ast_test_LDADD = @LIBPAL@ libast.la libast_pal.la libast_grf_3.2.la libast_grf_5.6.la libast_grf_2.0.la libast_grf3d.la libast_err.la -lm
++# Expand ast_link to avoid libstarlink_ast_pass2, which causes problems for Solaris
++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
+@@ -37,7 +37,7 @@
+ Main Changes in V7.0.2
+ ----------------------
+ 
+-- The libast_pal library is no longer built if the "--with-external_pal"
++- The libstarlink_ast_pal library is no longer built if the "--with-external_pal"
+ option is used when AST is configured.
+ 
+ 
+@@ -45,7 +45,7 @@
+ ----------------------
+ 
+ - The levmar and wcslib code distributed within AST is now stored in the
+-main AST library (libast.so) rather than in separate libraries.
++main AST library (libstarlink_ast.so) rather than in separate libraries.
+ 
+ 
+ Main Changes in V7.0.0
diff --git a/debian/patches/series b/debian/patches/series
index 544464e..336b916 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+rename_library
 use_std_automake.patch
 use_external_pal.patch
diff --git a/debian/patches/use_external_pal.patch b/debian/patches/use_external_pal.patch
index c5ea7ef..aa88158 100644
--- a/debian/patches/use_external_pal.patch
+++ b/debian/patches/use_external_pal.patch
@@ -26,25 +26,25 @@ Description: The external PAL library in Debian is called "starlink-pal".
 +++ b/Makefile.am
 @@ -550,8 +550,6 @@
      $(PAL_LIB) \
-     libast.la \
-     libast_err.la \
--    libast_ems.la \
--    libast_drama.la \
-     libast_grf3d.la \
-     libast_grf_2.0.la \
-     libast_grf_3.2.la \
+     libstarlink_ast.la \
+     libstarlink_ast_err.la \
+-    libstarlink_ast_ems.la \
+-    libstarlink_ast_drama.la \
+     libstarlink_ast_grf3d.la \
+     libstarlink_ast_grf_2.0.la \
+     libstarlink_ast_grf_3.2.la \
 @@ -620,7 +618,7 @@
- # libast_pal library will be empty, and we link to an external PAL
+ # libstarlink_ast_pal library will be empty, and we link to an external PAL
  # library instead.
  if EXTERNAL_PAL
--libast_la_LIBADD =  $(libdir)/libpal.la
-+libast_la_LIBADD = @LIBPAL@
+-libstarlink_ast_la_LIBADD =  $(libdir)/libpal.la
++libstarlink_ast_la_LIBADD = @LIBPAL@
  else
- libast_la_LIBADD = libast_pal.la
+ libstarlink_ast_la_LIBADD = libstarlink_ast_pal.la
  endif
 @@ -771,4 +769,4 @@
  
  #ast_test_LDADD = `ast_link`
- # Expand ast_link to avoid libast_pass2, which causes problems for Solaris
--ast_test_LDADD = @LIBPAL@ libast.la libast_pal.la libast_grf_3.2.la libast_grf_5.6.la libast_grf_2.0.la libast_grf3d.la libast_err.la -lm
-+ast_test_LDADD = @LIBPAL@ libast.la libast_grf_3.2.la libast_grf_5.6.la libast_grf_2.0.la libast_grf3d.la libast_err.la -lm
+ # Expand ast_link to avoid libstarlink_ast_pass2, which causes problems for Solaris
+-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
++ast_test_LDADD = @LIBPAL@ libstarlink_ast.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
diff --git a/debian/patches/use_std_automake.patch b/debian/patches/use_std_automake.patch
index 27db2fd..82cf54b 100644
--- a/debian/patches/use_std_automake.patch
+++ b/debian/patches/use_std_automake.patch
@@ -3,12 +3,12 @@ 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
-@@ -12,7 +12,11 @@ AC_INIT(ast, 7.0.0, ussc at star.rl.ac.uk)
+@@ -12,7 +12,11 @@ AC_INIT(ast, 7.0.3, ussc at star.rl.ac.uk)
  dnl   Require autoconf-2.50 at least
  AC_PREREQ(2.50)
  dnl   Require Starlink automake
 -AM_INIT_AUTOMAKE(1.8.2-starlink)
-+AM_INIT_AUTOMAKE
++AM_INIT_AUTOMAKE([foreign])
 +
 +# Comment out predistribution sources in Makefile.am
 +PREDIST='#'  # safe default
@@ -16,7 +16,7 @@ Description: Do not depend on the starlink's automake, but use their macro
  
  dnl   Sanity-check: name a file in the source directory
  AC_CONFIG_SRCDIR([ast_link.in])
-@@ -100,6 +104,7 @@ AC_CHECK_TYPES([long double])
+@@ -107,6 +111,7 @@ AC_CHECK_SIZEOF(long long)
  
  #   ast_link needs to be able to link against the Fortran runtime if
  #   necessary
@@ -24,7 +24,7 @@ Description: Do not depend on the starlink's automake, but use their macro
  AC_FC_LIBRARY_LDFLAGS
  
  #   Find an absolute path to the Perl binary, augmenting the path with the
-@@ -165,7 +170,7 @@ int main() {
+@@ -172,7 +177,7 @@ int main() {
  #   satisfy these targets, so give a non-null value
  #   for the second argument, to suppress automatic generation of
  #   rules.
@@ -36,8 +36,8 @@ Description: Do not depend on the starlink's automake, but use their macro
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -559,9 +559,20 @@ lib_LTLIBRARIES = \
-     libast_pgplot.la \
-     libast_pgplot3d.la
+     libstarlink_ast_pgplot.la \
+     libstarlink_ast_pgplot3d.la
  
 -stardocs_DATA = @STAR_LATEX_DOCUMENTATION@
 -dist_starnews_DATA = ast.news
@@ -59,6 +59,14 @@ Description: Do not depend on the starlink's automake, but use their macro
  
  # Make all library code position independent by default. This is handy for
  # creating shareable libraries from the static ones (Java JNI libraries).
+@@ -712,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.
++MANIFEST=/bin/true
+ install-exec-hook: libstarlink_ast.la
+ 	$(mkdir_p) $(DESTDIR)$(libdir)
+ 	cd $(DESTDIR)$(libdir); \
 --- a/acinclude.m4
 +++ b/acinclude.m4
 @@ -1 +1,56 @@
diff --git a/debian/rules b/debian/rules
index 54390a0..5509644 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,12 +12,8 @@ export MANIFEST=/bin/true
 
 override_dh_autoreconf:
 	cp ast.news NEWS
-	sed s/libast/libstarlink_ast/g -i Makefile.am
-	AUTOMAKE="automake --foreign" dh_autoreconf
+	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