[SCM] Position Astronomy Library branch, debian, updated. a3c4e68f00540cf96c001b67be5208f9a8914990

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 666a05acf344b36054be4a9bfc4a1ee83027b1cc
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Apr 23 15:54:33 2013 +0200

    Changes for 0.3.0

diff --git a/debian/changelog b/debian/changelog
index 76f2c95..b075215 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+starlink-pal (0.3.0-1) UNRELEASED; urgency=low
+
+  * New upstream version
+
+ -- Ole Streicher <debian at liska.ath.cx>  Tue, 23 Apr 2013 15:44:48 +0200
+
 starlink-pal (0.1.5-1) unstable; urgency=low
 
   * Move to unstable
diff --git a/debian/patches/rename_library b/debian/patches/rename_library
index 7d2ae5d..9346fb9 100644
--- a/debian/patches/rename_library
+++ b/debian/patches/rename_library
@@ -1,5 +1,5 @@
 Author: Ole Streicher <debian at liska.ath.cx>
-Last-Update: 2012-05-16
+Last-Update: 2013-04-23
 Description: "pal" is a quite short name for a library that is so 
  specific as this one. Therefore, "pal" is prefixed by the 
  vendor name "starlink".
@@ -9,7 +9,7 @@ Description: "pal" is a quite short name for a library that is so
  on the freshly unpacked source tarball.
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -1,13 +1,13 @@
+@@ -1,17 +1,17 @@
  ## Process this file with automake to produce Makefile.in
  
 -lib_LTLIBRARIES = libpal.la
@@ -17,16 +17,22 @@ Description: "pal" is a quite short name for a library that is so
  
  
  # Include palOne2One.c separately since it is a combo file
--libpal_la_SOURCES = $(PUBLIC_C_FILES) palOne2One.c
-+libstarlink_pal_la_SOURCES = $(PUBLIC_C_FILES) palOne2One.c
+-libpal_la_SOURCES = $(PUBLIC_C_FILES) palOne2One.c $(PRIVATE_C_FILES)
++libstarlink_pal_la_SOURCES = $(PUBLIC_C_FILES) palOne2One.c $(PRIVATE_C_FILES)
  
- # Force a link against SOFA
--libpal_la_LIBADD = $(libdir)/libsofa_c.la $(libdir)/libstarutil.la
-+libstarlink_pal_la_LIBADD = $(libdir)/libsofa_c.la $(libdir)/libstarutil.la
+ # If we are using a non-standard location
+-libpal_la_CPPFLAGS = $(SOFA_CPPFLAGS)
+-libpal_la_LDFLAGS = $(SOFA_LDFLAGS)
++libstarlink_pal_la_CPPFLAGS = $(SOFA_CPPFLAGS)
++libstarlink_pal_la_LDFLAGS = $(SOFA_LDFLAGS)
+ 
+ # Force a link against SOFA and, optionally, starutil
+-libpal_la_LIBADD = $(SOFA_LIBADD) $(STARUTIL_LIBADD)
++libstarlink_pal_la_LIBADD = $(SOFA_LIBADD) $(STARUTIL_LIBADD)
  
  # Misc files
  dist_starnews_DATA = pal.news
-@@ -16,7 +16,7 @@
+@@ -20,7 +20,7 @@
  # Make all library code position independent. This is handy for creating
  # shareable libraries from the static ones (Java JNI libraries).
  if !NOPIC
@@ -35,7 +41,7 @@ Description: "pal" is a quite short name for a library that is so
  endif
  
  # install pal as "star/pal.h"
-@@ -99,7 +99,7 @@
+@@ -120,7 +120,7 @@
  
  check_PROGRAMS = palTest
  palTest_SOURCES = palTest.c
diff --git a/debian/patches/use_std_automake.patch b/debian/patches/use_std_automake.patch
index 21f3f90..4533a12 100644
--- a/debian/patches/use_std_automake.patch
+++ b/debian/patches/use_std_automake.patch
@@ -14,22 +14,21 @@ Description: Do not depend on the starlink's automake, but use their macro
  dnl    isn't found then configure will complain
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -7,10 +7,10 @@
- libstarlink_pal_la_SOURCES = $(PUBLIC_C_FILES) palOne2One.c
+@@ -11,10 +11,9 @@
+ libstarlink_pal_la_LDFLAGS = $(SOFA_LDFLAGS)
  
- # Force a link against SOFA
--libstarlink_pal_la_LIBADD = $(libdir)/libsofa_c.la $(libdir)/libstarutil.la
+ # Force a link against SOFA and, optionally, starutil
+-libstarlink_pal_la_LIBADD = $(SOFA_LIBADD) $(STARUTIL_LIBADD)
 +libstarlink_pal_la_LIBADD = -lsofa_c
  
  # Misc files
 -dist_starnews_DATA = pal.news
-+#dist_starnews_DATA = pal.news
- dist_pkgdata_DATA = LICENCE
+ dist_pkgdata_DATA = LICENCE README.md
  
  # Make all library code position independent. This is handy for creating
-@@ -93,7 +93,19 @@
- palUe2el.c \
- palUe2pv.c
+@@ -114,7 +113,19 @@
+ pal1Atms.c \
+ pal1Atmt.c
  
 -stardocs_DATA = @STAR_LATEX_DOCUMENTATION@
 +dist_pkgdata_DATA =  @STARDOCS at .pdf @STARDOCS@/index.html
@@ -118,14 +117,3 @@ Description: Do not depend on the starlink's automake, but use their macro
  
  #if HAVE_COPYSIGN
  # define SCAN_FOR_MINUS 0
---- a/palObs.c
-+++ b/palObs.c
-@@ -123,7 +123,7 @@
- */
- 
- #include <string.h>
--
-+#include "config.h"
- /* We prefer to use the starutil package. This compiler option is for
-    standalone builds where starutil may not be available. This would
-    require additions to the configure script to set automatically.

-- 
Position Astronomy Library