[Debian-astro-commits] [starlink-ast] 02/04: Adjust patches for new version

Wed Mar 23 14:31:37 UTC 2016

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

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

commit bdf17f490db1be50d6306bb2fecd2e809ed81428
Author: Ole Streicher <ole at aip.de>
Date:   Wed Mar 23 15:15:42 2016 +0100

    Adjust patches for new version
---
 debian/changelog                           |  5 +++--
 debian/patches/rename_library              | 18 +++++++++---------
 debian/patches/use_external_cminpack.patch |  6 +++---
 debian/patches/use_external_pal.patch      |  6 +++---
 debian/patches/use_std_automake.patch      |  6 +++---
 5 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0913156..01b5e31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-starlink-ast (8.0.7+dfsg-2) UNRELEASED; urgency=low
+starlink-ast (8.1.0+dfsg-1) UNRELEASED; urgency=low
 
+  * New upstream version
   * Add upstream/metadata with reference
   * Push standards version to 3.9.7 (no changes)
   * Update VCS fields to use https
 
- -- Ole Streicher <olebole at debian.org>  Tue, 23 Feb 2016 08:51:27 +0100
+ -- Ole Streicher <olebole at debian.org>  Wed, 23 Mar 2016 15:12:45 +0100
 
 starlink-ast (8.0.7+dfsg-1) unstable; urgency=low
 
diff --git a/debian/patches/rename_library b/debian/patches/rename_library
index acc6a18..b79db77 100644
--- a/debian/patches/rename_library
+++ b/debian/patches/rename_library
@@ -9,7 +9,7 @@ Description: "ast" is a quite short name for a library that is so
  on the freshly unpacked source tarball.
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -234,7 +234,7 @@
+@@ -245,7 +245,7 @@
  
  # The following list should include AST_PAR, but that must not be
  # distributed, and so it is listed separately in
@@ -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
-@@ -552,21 +552,21 @@
+@@ -568,21 +568,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
-@@ -581,31 +581,31 @@
+@@ -597,31 +597,31 @@
  if !NOTHREADS
  
  if !NOPIC
@@ -95,9 +95,9 @@ Description: "ast" is a quite short name for a library that is so
 -libast_la_SOURCES = \
 +libstarlink_ast_la_SOURCES = \
      $(GRP_C_ROUTINES) \
+     $(F_C_ROUTINES) \
      $(GRP_C_INCLUDE_FILES) \
-     $(GRP_F_INCLUDE_FILES) \
-@@ -613,55 +613,55 @@
+@@ -631,55 +631,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 \
-@@ -715,24 +715,24 @@
+@@ -733,24 +733,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
-@@ -770,8 +770,8 @@
+@@ -788,8 +788,8 @@
  ast_test_SOURCES = ast_test.c
  
  #ast_test_LDADD = `ast_link`
@@ -215,7 +215,7 @@ Description: "ast" is a quite short name for a library that is so
  #  that the docs can be built from the tex source files. Requires environment
 --- a/ast.news
 +++ b/ast.news
-@@ -304,7 +304,7 @@
+@@ -322,7 +322,7 @@
  Main Changes in V7.0.2
  ----------------------
  
@@ -224,7 +224,7 @@ Description: "ast" is a quite short name for a library that is so
  option is used when AST is configured.
  
  
-@@ -312,7 +312,7 @@
+@@ -330,7 +330,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 e3e1727..a68cb3c 100644
--- a/debian/patches/use_external_cminpack.patch
+++ b/debian/patches/use_external_cminpack.patch
@@ -2,15 +2,15 @@ Author: Ole Streicher <debian at liska.ath.cx>
 Description: Use cminpack provided by Debian
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -611,7 +611,6 @@
-     $(GRP_C_ROUTINES) \
+@@ -629,7 +629,6 @@
      $(GRP_C_INCLUDE_FILES) \
+     $(F_C_INCLUDE_FILES) \
      $(GRP_F_INCLUDE_FILES) \
 -    $(CMINPACK_FILES) \
      $(WCSLIB_FILES) \
      ast_err.h
  
-@@ -620,7 +619,7 @@
+@@ -638,7 +637,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 1721981..b6713dd 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
-@@ -559,8 +559,6 @@
+@@ -575,8 +575,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 \
-@@ -622,7 +620,7 @@
+@@ -640,7 +638,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
-@@ -776,7 +774,7 @@
+@@ -794,7 +792,7 @@
  
  #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 d0418c9..ea422de 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])
-@@ -178,7 +181,7 @@
+@@ -195,7 +198,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
-@@ -568,9 +568,13 @@
+@@ -584,9 +584,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).
-@@ -721,6 +725,7 @@
+@@ -739,6 +743,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

