[starlink-ast] 02/02: Adjust patches for new version

[Ole Streicher]

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

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

commit 5ebffb0b1cad77654a4c62d09b2437db12ad15f9
Author: Ole Streicher <olebole at debian.org>
Date:   Fri Apr 17 17:12:47 2015 +0200

    Adjust patches for new version
---
 debian/changelog                                  | 6 ++++++
 debian/patches/rename_library                     | 6 +++---
 debian/patches/use_external_pal.patch             | 2 +-
 debian/patches/workround_armhf_compiler_bug.patch | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4ffcfac..23b2cad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+starlink-ast (8.0.4+dfsg-1) UNRELEASED; urgency=low
+
+  * New upstream version
+
+ -- Ole Streicher <olebole at debian.org>  Fri, 17 Apr 2015 17:11:53 +0200
+
 starlink-ast (8.0.2+dfsg-2) unstable; urgency=low
 
   * Workaround for armhf FTBS due to a compiler bug.
diff --git a/debian/patches/rename_library b/debian/patches/rename_library
index 50b65ee..6855f43 100644
--- a/debian/patches/rename_library
+++ b/debian/patches/rename_library
@@ -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
-@@ -768,5 +768,5 @@
+@@ -770,5 +770,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
-@@ -208,7 +208,7 @@
+@@ -242,7 +242,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.
  
  
-@@ -216,7 +216,7 @@
+@@ -250,7 +250,7 @@
  ----------------------
  
  - The levmar and wcslib code distributed within AST is now stored in the
diff --git a/debian/patches/use_external_pal.patch b/debian/patches/use_external_pal.patch
index 4eec28a..afa6f1e 100644
--- a/debian/patches/use_external_pal.patch
+++ b/debian/patches/use_external_pal.patch
@@ -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
-@@ -774,4 +772,4 @@
+@@ -776,4 +774,4 @@
  
  #ast_test_LDADD = `ast_link`
  # Expand ast_link to avoid libstarlink_ast_pass2, which causes problems for Solaris
diff --git a/debian/patches/workround_armhf_compiler_bug.patch b/debian/patches/workround_armhf_compiler_bug.patch
index 2d81c16..70ade94 100644
--- a/debian/patches/workround_armhf_compiler_bug.patch
+++ b/debian/patches/workround_armhf_compiler_bug.patch
@@ -15,7 +15,7 @@ Description: Work around a weird optimization bug in armhf
  MAKE_MASK(D, double) and MAKE_MASK(LD, long double).
 --- a/region.c
 +++ b/region.c
-@@ -228,6 +228,7 @@
+@@ -230,6 +230,7 @@
  *     usually extend astSimplify.
  
  */

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