[SCM] Handle World Coordinate Systems in Astronomy branch, master, updated. 03f261c4feda989b1caa7ae63b7af7fe0530ed01

[Ole Streicher]

The following commit has been merged in the master branch:
commit 49578dbd520d0f93cfee811000b6521e27915c19
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Mar 30 12:26:34 2012 +0200

    Update patches for new version

diff --git a/debian/patches/use_external_pal.patch b/debian/patches/use_external_pal.patch
index 6b819e4..c5ea7ef 100644
--- a/debian/patches/use_external_pal.patch
+++ b/debian/patches/use_external_pal.patch
@@ -24,11 +24,8 @@ Description: The external PAL library in Debian is called "starlink-pal".
        *) args="${args} -last_pal";;
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -541,11 +541,8 @@
- include_MESSAGES = AST_ERR ast_err.h
- 
- lib_LTLIBRARIES = \
--    libast_pal.la \
+@@ -550,8 +550,6 @@
+     $(PAL_LIB) \
      libast.la \
      libast_err.la \
 -    libast_ems.la \
@@ -36,7 +33,7 @@ Description: The external PAL library in Debian is called "starlink-pal".
      libast_grf3d.la \
      libast_grf_2.0.la \
      libast_grf_3.2.la \
-@@ -613,7 +613,7 @@
+@@ -620,7 +618,7 @@
  # libast_pal library will be empty, and we link to an external PAL
  # library instead.
  if EXTERNAL_PAL
@@ -45,7 +42,7 @@ Description: The external PAL library in Debian is called "starlink-pal".
  else
  libast_la_LIBADD = libast_pal.la
  endif
-@@ -764,4 +764,4 @@
+@@ -771,4 +769,4 @@
  
  #ast_test_LDADD = `ast_link`
  # Expand ast_link to avoid libast_pass2, which causes problems for Solaris
diff --git a/debian/patches/use_std_automake.patch b/debian/patches/use_std_automake.patch
index 6e74e48..27db2fd 100644
--- a/debian/patches/use_std_automake.patch
+++ b/debian/patches/use_std_automake.patch
@@ -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
-@@ -553,9 +553,20 @@ lib_LTLIBRARIES = \
+@@ -559,9 +559,20 @@ lib_LTLIBRARIES = \
      libast_pgplot.la \
      libast_pgplot3d.la
  

-- 
Handle World Coordinate Systems in Astronomy