[starlink-ast] 02/02: Adjust patches and symbols file

Tue Oct 21 10:57:27 UTC 2014

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch debian
in repository starlink-ast.

commit 743120d43d6b07d56221e72c54ac03de8d192ea3
Author: Ole Streicher <olebole at debian.org>
Date:   Tue Oct 21 12:56:24 2014 +0200

    Adjust patches and symbols file
---
 debian/changelog                           |  5 +++--
 debian/libstarlink-ast0.symbols            | 17 +++++++++++++++++
 debian/patches/rename_library              | 14 +++++++-------
 debian/patches/use_external_cminpack.patch |  4 ++--
 debian/patches/use_external_pal.patch      |  6 +++---
 debian/patches/use_std_automake.patch      |  6 +++---
 6 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fc471cb..efd3265 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-starlink-ast (8.0.0+dfsg-3) UNRELEASED; urgency=low
+starlink-ast (8.0.2+dfsg-1) unstable; urgency=low
 
+  * New upstream version
   * Update maintainers e-mail address
   * Update standards version to 3.9.6. No changes needed.
 
- -- Ole Streicher <olebole at debian.org>  Thu, 25 Sep 2014 12:21:33 +0200
+ -- Ole Streicher <olebole at debian.org>  Tue, 21 Oct 2014 12:45:28 +0200
 
 starlink-ast (8.0.0+dfsg-2) unstable; urgency=low
 
diff --git a/debian/libstarlink-ast0.symbols b/debian/libstarlink-ast0.symbols
index 314b532..5990914 100644
--- a/debian/libstarlink-ast0.symbols
+++ b/debian/libstarlink-ast0.symbols
@@ -30,6 +30,7 @@ libstarlink_ast.so.0 libstarlink-ast0 #MINVER#
  WCS__SZP at Base 7.0.4
  WCS__TAN at Base 7.0.4
  WCS__TSC at Base 7.0.4
+ WCS__XPH at Base 8.0.1
  WCS__ZEA at Base 7.0.4
  WCS__ZPN at Base 7.0.4
  astACosd at Base 7.0.4
@@ -59,6 +60,7 @@ libstarlink_ast.so.0 libstarlink-ast0 #MINVER#
  astAnnul_ at Base 7.0.4
  astAppendPoints_ at Base 7.0.4
  astAppendString_ at Base 7.0.4
+ astAppendStringf_ at Base 8.0.1
  astAt_ at Base 7.0.4
  astAxAngle_ at Base 7.0.4
  astAxDistance_ at Base 7.0.4
@@ -255,6 +257,7 @@ libstarlink_ast.so.0 libstarlink-ast0 #MINVER#
  astClearEscape_ at Base 7.0.4
  astClearFITSProj_ at Base 7.0.4
  astClearFillFactor_ at Base 7.0.4
+ astClearFitsAxisOrder_ at Base 8.0.1
  astClearFitsDigits_ at Base 7.0.4
  astClearFont_ at Base 7.0.4
  astClearForceExterior_ at Base 7.0.4
@@ -542,6 +545,7 @@ libstarlink_ast.so.0 libstarlink-ast0 #MINVER#
  astGetFITSProj_ at Base 7.0.4
  astGetF_ at Base 7.0.4
  astGetFillFactor_ at Base 7.0.4
+ astGetFitsAxisOrder_ at Base 8.0.1
  astGetFitsCF_ at Base 7.0.4
  astGetFitsCI_ at Base 7.0.4
  astGetFitsCN_ at Base 7.0.4
@@ -1293,14 +1297,18 @@ libstarlink_ast.so.0 libstarlink-ast0 #MINVER#
  astReadString_ at Base 7.0.4
  astRead_ at Base 7.0.4
  astRealloc_ at Base 7.0.4
+ astRebinB_ at Base 8.0.1
  astRebinD_ at Base 7.0.4
  astRebinF_ at Base 7.0.4
  astRebinI_ at Base 7.0.4
  astRebinLD_ at Base 7.0.4
+ astRebinSeqB_ at Base 8.0.1
  astRebinSeqD_ at Base 7.0.4
  astRebinSeqF_ at Base 7.0.4
  astRebinSeqI_ at Base 7.0.4
  astRebinSeqLD_ at Base 7.0.4
+ astRebinSeqUB_ at Base 8.0.1
+ astRebinUB_ at Base 8.0.1
  astRegBaseBox2_ at Base 7.0.4
  astRegBaseBox_ at Base 7.0.4
  astRegBaseGrid_ at Base 7.0.4
@@ -1424,6 +1432,7 @@ libstarlink_ast.so.0 libstarlink-ast0 #MINVER#
  astSetFITSProj_ at Base 7.0.4
  astSetF_ at Base 7.0.4
  astSetFillFactor_ at Base 7.0.4
+ astSetFitsAxisOrder_ at Base 8.0.1
  astSetFitsCF_ at Base 7.0.4
  astSetFitsCI_ at Base 7.0.4
  astSetFitsCM_ at Base 7.0.4
@@ -1693,6 +1702,7 @@ libstarlink_ast.so.0 libstarlink-ast0 #MINVER#
  astTestEscape_ at Base 7.0.4
  astTestFITSProj_ at Base 7.0.4
  astTestFillFactor_ at Base 7.0.4
+ astTestFitsAxisOrder_ at Base 8.0.1
  astTestFitsDigits_ at Base 7.0.4
  astTestFits_ at Base 7.0.4
  astTestFont_ at Base 7.0.4
@@ -1871,6 +1881,9 @@ libstarlink_ast.so.0 libstarlink-ast0 #MINVER#
  astWriteObject_ at Base 7.0.4
  astWriteString_ at Base 7.0.4
  astWrite_ at Base 7.0.4
+ astXPHfwd at Base 8.0.1
+ astXPHrev at Base 8.0.1
+ astXPHset at Base 8.0.1
  astXmlAddAttr_ at Base 7.0.4
  astXmlAddCDataSection_ at Base 7.0.4
  astXmlAddCharData_ at Base 7.0.4
@@ -2224,12 +2237,16 @@ libstarlink_ast.so.0 libstarlink-ast0 #MINVER#
  ast_ratemap_ at Base 7.0.4
  ast_read_ at Base 7.0.4
  ast_readfits_ at Base 7.0.4
+ ast_rebinb_ at Base 8.0.1
  ast_rebind_ at Base 7.0.4
  ast_rebini_ at Base 7.0.4
  ast_rebinr_ at Base 7.0.4
+ ast_rebinseqb_ at Base 8.0.1
  ast_rebinseqd_ at Base 7.0.4
  ast_rebinseqi_ at Base 7.0.4
  ast_rebinseqr_ at Base 7.0.4
+ ast_rebinsequb_ at Base 8.0.1
+ ast_rebinub_ at Base 8.0.1
  ast_remapframe_ at Base 7.0.4
  ast_removecolumn_ at Base 7.0.4
  ast_removeframe_ at Base 7.0.4
diff --git a/debian/patches/rename_library b/debian/patches/rename_library
index 6d63fbd..50b65ee 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
-@@ -550,21 +550,21 @@
+@@ -552,21 +552,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
-@@ -579,31 +579,31 @@
+@@ -581,31 +581,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) \
-@@ -611,55 +611,55 @@
+@@ -613,55 +613,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 \
-@@ -713,24 +713,24 @@
+@@ -715,24 +715,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
-@@ -766,5 +766,5 @@
+@@ -768,5 +768,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
-@@ -187,7 +187,7 @@
+@@ -208,7 +208,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.
  
  
-@@ -195,7 +195,7 @@
+@@ -216,7 +216,7 @@
  ----------------------
  
  - The levmar and wcslib code distributed within AST is now stored in the
diff --git a/debian/patches/use_external_cminpack.patch b/debian/patches/use_external_cminpack.patch
index 18cf8a1..08a943b 100644
--- a/debian/patches/use_external_cminpack.patch
+++ b/debian/patches/use_external_cminpack.patch
@@ -2,7 +2,7 @@ Author: Ole Streicher <debian at liska.ath.cx>
 Description: Use cminpack provided by Debian
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -609,7 +609,6 @@
+@@ -611,7 +611,6 @@
      $(GRP_C_ROUTINES) \
      $(GRP_C_INCLUDE_FILES) \
      $(GRP_F_INCLUDE_FILES) \
@@ -10,7 +10,7 @@ Description: Use cminpack provided by Debian
      $(WCSLIB_FILES) \
      ast_err.h
  
-@@ -618,7 +617,7 @@
+@@ -620,7 +619,7 @@
  # libstarlink_ast_pal library will be empty, and we link to an external PAL
  # library instead.
  if EXTERNAL_PAL
diff --git a/debian/patches/use_external_pal.patch b/debian/patches/use_external_pal.patch
index fc8339b..4eec28a 100644
--- a/debian/patches/use_external_pal.patch
+++ b/debian/patches/use_external_pal.patch
@@ -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
-@@ -557,8 +557,6 @@
+@@ -559,8 +559,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 @@
+@@ -622,7 +620,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
-@@ -772,4 +770,4 @@
+@@ -774,4 +772,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 cfa8659..d0418c9 100644
--- a/debian/patches/use_std_automake.patch
+++ b/debian/patches/use_std_automake.patch
@@ -15,7 +15,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])
-@@ -175,7 +178,7 @@
+@@ -178,7 +181,7 @@
  #   satisfy these targets, so give a non-null value
  #   for the second argument, to suppress automatic generation of
  #   rules.
@@ -26,7 +26,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
-@@ -566,9 +566,13 @@
+@@ -568,9 +568,13 @@
      libstarlink_ast_pgplot.la \
      libstarlink_ast_pgplot3d.la
  
@@ -43,7 +43,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).
-@@ -719,6 +723,7 @@
+@@ -721,6 +725,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.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/starlink-ast.git

