[SCM] image display tool for astronomy branch, debian, updated. 1cb694789bac41f4b2db145980abc147128edaf5

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 1131e69d0400c5b52ce44cea69f2d46bc482a810
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Jan 11 13:24:03 2012 +0100

    Patch ast/makeh to keep the backslash at the end of _#defines

diff --git a/debian/patches/ast.patch b/debian/patches/ast.patch
index 43b3423..0b60aca 100644
--- a/debian/patches/ast.patch
+++ b/debian/patches/ast.patch
@@ -1,5 +1,15 @@
-diff --git a/ast-5.3-1/Makefile.am b/ast-5.3-1/Makefile.am
-index 21ec2e1..da9e530 100644
+--- a/ast-5.3-1/makeh
++++ b/ast-5.3-1/makeh
+@@ -270,6 +270,9 @@ line: while ( <INCLUDE> ) {
+       s/__LINE__/___LINE__/g;
+       s/__FILE__/___FILE__/g;
+ 
++# protect backslashes at the end of a line
++      s/\\$/\\ \\/;
++
+ #  Write the modified include file.
+       print( TEMP );
+    }
 --- a/ast-5.3-1/Makefile.am
 +++ b/ast-5.3-1/Makefile.am
 @@ -100,6 +100,7 @@ GRP_C_ROUTINES = \
@@ -10,8 +20,6 @@ index 21ec2e1..da9e530 100644
      specfluxframe.c \
      specframe.c \
      specmap.c \
-diff --git a/ast-5.3-1/fitschan.c b/ast-5.3-1/fitschan.c
-index 04b5c15..67eb7e0 100644
 --- a/ast-5.3-1/fitschan.c
 +++ b/ast-5.3-1/fitschan.c
 @@ -1090,6 +1090,7 @@ f     - AST_TESTFITS: Test if a keyword has a defined value in a FitsChan
@@ -22,8 +30,6 @@ index 04b5c15..67eb7e0 100644
  
  /* Type Definitions */
  /* ================ */
-diff --git a/ast-5.3-1/plot.c b/ast-5.3-1/plot.c
-index 999ba9d..3f12a97 100644
 --- a/ast-5.3-1/plot.c
 +++ b/ast-5.3-1/plot.c
 @@ -13667,6 +13667,7 @@ static int GetLabelUnits( AstPlot *this, int axis, int *status ) {
@@ -42,8 +48,6 @@ index 999ba9d..3f12a97 100644
  
  static void GLine( AstPlot *this, int n, const float *x, 
                     const float *y, const char *method, 
-diff --git a/ast-5.3-1/slamap.c b/ast-5.3-1/slamap.c
-index 0090c45..09a0265 100644
 --- a/ast-5.3-1/slamap.c
 +++ b/ast-5.3-1/slamap.c
 @@ -199,6 +199,7 @@ f     - AST_SLAADD: Add a celestial coordinate conversion to an SlaMap
@@ -54,8 +58,6 @@ index 0090c45..09a0265 100644
  
  /* Module Variables. */
  /* ================= */
-diff --git a/ast-5.3-1/sphmap.c b/ast-5.3-1/sphmap.c
-index cc67f46..dbec5a2 100644
 --- a/ast-5.3-1/sphmap.c
 +++ b/ast-5.3-1/sphmap.c
 @@ -114,6 +114,7 @@ f     The SphMap class does not define any new routines beyond those

-- 
image display tool for astronomy