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

Tue Jul 5 13:41:10 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 b2fed983808c979eba9d2b83917c432b51ffa026
Author: Ole Streicher <olebole at debian.org>
Date:   Tue Jul 5 14:47:32 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index fbd8661..cb99bd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-starlink-ast (8.1.0+dfsg-2) UNRELEASED; urgency=low
+starlink-ast (8.2.0+dfsg-1) UNRELEASED; urgency=low
 
   * debian/upstream/metadata Update updatream git repository location
+  * New upstream version
 
- -- Ole Streicher <olebole at debian.org>  Wed, 27 Apr 2016 20:43:05 +0200
+ -- Ole Streicher <olebole at debian.org>  Tue, 05 Jul 2016 14:46:42 +0200
 
 starlink-ast (8.1.0+dfsg-1) unstable; urgency=low
 
diff --git a/debian/patches/rename_library b/debian/patches/rename_library
index b79db77..ebf7bfe 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
-@@ -245,7 +245,7 @@
+@@ -248,7 +248,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
-@@ -568,21 +568,21 @@
+@@ -571,21 +571,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
-@@ -597,31 +597,31 @@
+@@ -600,31 +600,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) \
      $(F_C_ROUTINES) \
      $(GRP_C_INCLUDE_FILES) \
-@@ -631,55 +631,55 @@
+@@ -634,55 +634,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 \
-@@ -733,24 +733,24 @@
+@@ -736,24 +736,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
-@@ -788,8 +788,8 @@
+@@ -791,8 +791,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
-@@ -322,7 +322,7 @@
+@@ -343,7 +343,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.
  
  
-@@ -330,7 +330,7 @@
+@@ -351,7 +351,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 a68cb3c..4700d71 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
-@@ -629,7 +629,6 @@
+@@ -632,7 +632,6 @@
      $(GRP_C_INCLUDE_FILES) \
      $(F_C_INCLUDE_FILES) \
      $(GRP_F_INCLUDE_FILES) \
@@ -10,7 +10,7 @@ Description: Use cminpack provided by Debian
      $(WCSLIB_FILES) \
      ast_err.h
  
-@@ -638,7 +637,7 @@
+@@ -641,7 +640,7 @@
  # libstarlink_ast_pal library will be empty, and we link to an external PAL
  # library instead.
  if EXTERNAL_PAL
@@ -21,7 +21,7 @@ Description: Use cminpack provided by Debian
  endif
 --- a/polymap.c
 +++ b/polymap.c
-@@ -116,7 +116,7 @@
+@@ -112,7 +112,7 @@
  #include "cmpmap.h"              /* Compound mappings */
  #include "polymap.h"             /* Interface definition for this class */
  #include "unitmap.h"             /* Unit mappings */
diff --git a/debian/patches/use_external_pal.patch b/debian/patches/use_external_pal.patch
index b6713dd..0e54a28 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
-@@ -575,8 +575,6 @@
+@@ -578,8 +578,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 \
-@@ -640,7 +638,7 @@
+@@ -643,7 +641,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
-@@ -794,7 +792,7 @@
+@@ -797,7 +795,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 ea422de..c5921c7 100644
--- a/debian/patches/use_std_automake.patch
+++ b/debian/patches/use_std_automake.patch
@@ -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
-@@ -584,9 +584,13 @@
+@@ -587,9 +587,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).
-@@ -739,6 +743,7 @@
+@@ -742,6 +746,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

