[Debian-astro-commits] [starlink-ast] 02/04: Rediff patches

[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 b8631d5b6c6f8308ada2d4593eb284daa685055b
Author: Ole Streicher <olebole at debian.org>
Date:   Wed Jan 11 18:03:51 2017 +0100

    Rediff patches
---
 debian/patches/rename_library                     | 6 +++---
 debian/patches/use_external_cminpack.patch        | 4 ++--
 debian/patches/use_external_pal.patch             | 2 +-
 debian/patches/use_std_automake.patch             | 2 +-
 debian/patches/workround_armhf_compiler_bug.patch | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/patches/rename_library b/debian/patches/rename_library
index 4c9e4d9..2a82a6b 100644
--- a/debian/patches/rename_library
+++ b/debian/patches/rename_library
@@ -220,10 +220,10 @@ index 2739ab4..656ab3e 100644
  #  Need to include latex support files in the distribution tar ball so
  #  that the docs can be built from the tex source files. Requires environment
 diff --git a/ast.news b/ast.news
-index bd5dbbc..8b77125 100644
+index 0891b79..db56711 100644
 --- a/ast.news
 +++ b/ast.news
-@@ -357,7 +357,7 @@ astResampleUK that handles 64 bit integer data.
+@@ -396,7 +396,7 @@ astResampleUK that handles 64 bit integer data.
  Main Changes in V7.0.2
  ----------------------
  
@@ -232,7 +232,7 @@ index bd5dbbc..8b77125 100644
  option is used when AST is configured.
  
  
-@@ -365,7 +365,7 @@ Main Changes in V7.0.1
+@@ -404,7 +404,7 @@ Main Changes in V7.0.1
  ----------------------
  
  - 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 cc22b0c..1b0ec25 100644
--- a/debian/patches/use_external_cminpack.patch
+++ b/debian/patches/use_external_cminpack.patch
@@ -29,10 +29,10 @@ index a94752b..276165a 100644
  libstarlink_ast_la_LIBADD = libstarlink_ast_pal.la
  endif
 diff --git a/polymap.c b/polymap.c
-index 5265b95..13f1608 100644
+index 196004b..fda34a9 100644
 --- a/polymap.c
 +++ b/polymap.c
-@@ -112,7 +112,7 @@ f     - AST_POLYTRAN: Fit a PolyMap inverse or forward transformation
+@@ -117,7 +117,7 @@ f     - AST_POLYTRAN: Fit a PolyMap inverse or forward transformation
  #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 77a6fc9..1b2d91e 100644
--- a/debian/patches/use_external_pal.patch
+++ b/debian/patches/use_external_pal.patch
@@ -53,7 +53,7 @@ index c5759e2..3c5b2e1 100644
  #  Otherwise, use the internal PAL & ERFA libraries.
        *) args="${args} -last_pal";;
 diff --git a/configure.ac b/configure.ac
-index b1e5b81..ed7878a 100644
+index 9b5bcb5..6cc68c1 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -55,7 +55,7 @@ AC_ARG_WITH([external_pal],
diff --git a/debian/patches/use_std_automake.patch b/debian/patches/use_std_automake.patch
index 136898e..c1ceaef 100644
--- a/debian/patches/use_std_automake.patch
+++ b/debian/patches/use_std_automake.patch
@@ -101,7 +101,7 @@ index 96fb878..661c2ea 100644
 +
 +
 diff --git a/configure.ac b/configure.ac
-index 3ccc4cd..b1e5b81 100644
+index 2170fd7..9b5bcb5 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -13,7 +13,10 @@ AC_CONFIG_AUX_DIR([build-aux])
diff --git a/debian/patches/workround_armhf_compiler_bug.patch b/debian/patches/workround_armhf_compiler_bug.patch
index 6fa404f..bd3c0c3 100644
--- a/debian/patches/workround_armhf_compiler_bug.patch
+++ b/debian/patches/workround_armhf_compiler_bug.patch
@@ -17,10 +17,10 @@ Subject: Work around a weird optimization bug in armhf Without this patch,
  1 file changed, 1 insertion(+)
 
 diff --git a/region.c b/region.c
-index 3554296..330b3e0 100644
+index 675a1ad..38cefc8 100644
 --- a/region.c
 +++ b/region.c
-@@ -234,6 +234,7 @@ f     - AST_SHOWMESH: Display a mesh of points on the surface of a Region
+@@ -241,6 +241,7 @@ f     - AST_SHOWMESH: Display a mesh of points on the surface of a Region
  *     usually extend astSimplify.
  
  */

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