[SCM] Handle World Coordinate Systems in Astronomy branch, master, updated. 481b83f073c59a6ac31cc3e174cdfa5c2319ea01

[Ole Streicher]

The following commit has been merged in the master branch:
commit 481b83f073c59a6ac31cc3e174cdfa5c2319ea01
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Feb 10 15:48:43 2012 +0100

    Patch makefile not to build libast_pal anymore

diff --git a/debian/patches/use_slalib.patch b/debian/patches/use_slalib.patch
index ae5ff9b..a819a8a 100644
--- a/debian/patches/use_slalib.patch
+++ b/debian/patches/use_slalib.patch
@@ -5,9 +5,65 @@ Description: Since the obfuscated "pal.c" library cannot be used here,
  This patch fixes the names as #defines# in the header file.
  One exception are the palSlaDh2e and palSlaDe2h functions which are moved 
  from pal.c to slamap.c.
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -283,12 +283,6 @@ WCSLIB_FILES = \
+     wcsmath.h \
+     wcstrig.h
+ 
+-PAL_FILES = \
+-    COPYING.LIB \
+-    pal.c \
+-    pal.h \
+-    slamac.h
+-
+ LEVMAR_FILES = \
+     levmar.c \
+     levmar.h
+@@ -323,7 +317,6 @@ lib_LTLIBRARIES = \
+     libast_grf_5.6.la \
+     libast_pgplot.la \
+     libast_pgplot3d.la \
+-    libast_pal.la \
+     libast_wcslib.la \
+     libast_levmar.la
+ 
+@@ -351,6 +344,8 @@ libast_la_CFLAGS = $(AM_CFLAGS) -prefer-pic
+ 
+ endif
+ 
++libast_la_LDFLAGS = -lsla -lm
++
+ if !NOPIC
+ libast_err_la_CFLAGS = $(AM_CFLAGS) -prefer-pic
+ libast_ems_la_CFLAGS = $(AM_CFLAGS) -prefer-pic
+@@ -361,7 +356,6 @@ 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
+ libast_wcslib_la_CFLAGS = $(AM_CFLAGS) -prefer-pic
+ libast_levmar_la_CFLAGS = $(AM_CFLAGS) -prefer-pic
+ endif
+@@ -416,9 +410,6 @@ libast_wcslib_la_SOURCES = proj.c wcstrig.c tpn.c
+ #  Modules adapted from the levmar library.
+ libast_levmar_la_SOURCES = levmar.c
+ 
+-#  Modules supplied by tpoint.
+-libast_pal_la_SOURCES = pal.c
+-
+ # The following files are built by the targets in this makefile.
+ MAINTAINERCLEANFILES = version.h builddocs addversion \
+ 	ast.h $(DOCUMENTATION_PRODUCTS)
+@@ -522,4 +513,4 @@ 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 = libast.la libast_pal.la libast_grf_3.2.la libast_grf_5.6.la libast_wcslib.la libast_levmar.la libast_grf_2.0.la libast_grf3d.la libast_err.la -lm
++ast_test_LDADD = libast.la libast_grf_3.2.la libast_grf_5.6.la libast_wcslib.la libast_levmar.la libast_grf_2.0.la libast_grf3d.la libast_err.la -lm
 --- a/pal.h
 +++ b/pal.h
-@@ -1,510 +1,190 @@
+@@ -1,510 +1,189 @@
  #ifndef PALHDEF
  #define PALHDEF
 -/*
@@ -516,9 +572,9 @@ Description: Since the obfuscated "pal.c" library cannot be used here,
 -#ifdef __cplusplus
 -}
 -#endif
-+#include <slalib.h>
++#include <star/slalib.h>
 +
-+#define palSlaAddet slaAdded
++#define palSlaAddet slaAddet
 +#define palSlaAfin  slaAfin
 +#define palSlaAirmas slaAirmas
 +#define palSlaAltaz slaAltaz
@@ -557,7 +613,6 @@ Description: Since the obfuscated "pal.c" library cannot be used here,
 +#define palSlaDcmpf slaDcmpf 
 +#define palSlaDcs2c slaDcs2c 
 +#define palSlaDd2tf slaDd2tf 
-+#define palSlaDe2h slaDe2h 
 +#define palSlaDeuler slaDeuler 
 +#define palSlaDfltin slaDfltin 
 +#define palSlaDimxv slaDimxv 

-- 
Handle World Coordinate Systems in Astronomy