[SCM] Handle World Coordinate Systems in Astronomy branch, debian, updated. ffb0f995c6162765940872245cf6c18291f7439f

Thu Jun 7 13:34:40 UTC 2012

The following commit has been merged in the debian branch:
commit ffb0f995c6162765940872245cf6c18291f7439f
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Jun 7 15:34:22 2012 +0200

    Update patches for new version

diff --git a/debian/patches/install_grf3d_h.patch b/debian/patches/install_grf3d_h.patch
deleted file mode 100644
index 35675ee..0000000
--- a/debian/patches/install_grf3d_h.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Some programs (like saods9) implement grf3d functions and
- therefore need the corresponding header.
-Forwarded: yes
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -535,7 +535,7 @@
- 
- # Headers required by library users.  Both of the following lines
- # indicate headers which are installed.
--include_HEADERS = GRF_PAR grf.h
-+include_HEADERS = GRF_PAR grf.h grf3d.h
- # Following are generated, so should not be distributed.
- nodist_include_HEADERS = ast.h AST_PAR
- include_MESSAGES = AST_ERR ast_err.h
diff --git a/debian/patches/rename_library b/debian/patches/rename_library
index eaa74d7..ee77620 100644
--- a/debian/patches/rename_library
+++ b/debian/patches/rename_library
@@ -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
-@@ -543,21 +543,21 @@
+@@ -544,21 +544,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
-@@ -572,31 +572,31 @@
+@@ -573,31 +573,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) \
-@@ -604,55 +604,55 @@
+@@ -605,55 +605,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 \
-@@ -706,24 +706,24 @@
+@@ -707,24 +707,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
-@@ -759,5 +759,5 @@
+@@ -760,5 +760,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
-@@ -37,7 +37,7 @@
+@@ -44,7 +44,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.
  
  
-@@ -45,7 +45,7 @@
+@@ -52,7 +52,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 34eb24f..336b916 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 rename_library
 use_std_automake.patch
 use_external_pal.patch
-install_grf3d_h.patch
diff --git a/debian/patches/use_external_pal.patch b/debian/patches/use_external_pal.patch
index aa88158..711a95c 100644
--- a/debian/patches/use_external_pal.patch
+++ b/debian/patches/use_external_pal.patch
@@ -2,7 +2,7 @@ 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
-@@ -57,7 +57,7 @@ AC_ARG_WITH([external_pal],
+@@ -57,7 +57,7 @@
          external_pal="0")
  AC_SUBST( EXTERNAL_PAL, $external_pal )
  if test "$external_pal" = "1"; then
@@ -24,7 +24,7 @@ Description: The external PAL library in Debian is called "starlink-pal".
        *) args="${args} -last_pal";;
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -550,8 +550,6 @@
+@@ -551,8 +551,6 @@
      $(PAL_LIB) \
      libstarlink_ast.la \
      libstarlink_ast_err.la \
@@ -33,7 +33,7 @@ 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 \
-@@ -620,7 +618,7 @@
+@@ -621,7 +619,7 @@
  # libstarlink_ast_pal library will be empty, and we link to an external PAL
  # library instead.
  if EXTERNAL_PAL
@@ -42,7 +42,7 @@ Description: The external PAL library in Debian is called "starlink-pal".
  else
  libstarlink_ast_la_LIBADD = libstarlink_ast_pal.la
  endif
-@@ -771,4 +769,4 @@
+@@ -773,4 +771,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_std_automake.patch b/debian/patches/use_std_automake.patch
index 82cf54b..f82bad6 100644
--- a/debian/patches/use_std_automake.patch
+++ b/debian/patches/use_std_automake.patch
@@ -3,7 +3,7 @@ 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.3, ussc at star.rl.ac.uk)
+@@ -12,7 +12,11 @@
  dnl   Require autoconf-2.50 at least
  AC_PREREQ(2.50)
  dnl   Require Starlink automake
@@ -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])
-@@ -107,6 +111,7 @@ AC_CHECK_SIZEOF(long long)
+@@ -107,6 +111,7 @@
  
  #   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
-@@ -172,7 +177,7 @@ int main() {
+@@ -172,7 +177,7 @@
  #   satisfy these targets, so give a non-null value
  #   for the second argument, to suppress automatic generation of
  #   rules.
@@ -35,7 +35,7 @@ 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
-@@ -559,9 +559,20 @@ lib_LTLIBRARIES = \
+@@ -560,9 +560,20 @@
      libstarlink_ast_pgplot.la \
      libstarlink_ast_pgplot3d.la
  
@@ -59,7 +59,7 @@ 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 @@
+@@ -713,6 +724,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.

-- 
Handle World Coordinate Systems in Astronomy

