[Debian-astro-commits] [saods9] 02/02: Adjust d/changelog and patches

[Ole Streicher]

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

olebole pushed a commit to branch debian
in repository saods9.

commit 0a7f600dd189a2898931145a95071a83eeba65d0
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Nov 18 10:35:44 2015 +0100

    Adjust d/changelog and patches
---
 debian/changelog                                  |  6 ++++++
 debian/patches/saotk_avoid_compile_warnings.patch | 16 ++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 203b560..1d1eff8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+saods9 (7.4~b9+repack-1) unstable; urgency=low
+
+  * New upstream beta version
+
+ -- Ole Streicher <olebole at debian.org>  Wed, 18 Nov 2015 10:34:39 +0100
+
 saods9 (7.4~b8+repack-1) unstable; urgency=low
 
   * New upstream beta version
diff --git a/debian/patches/saotk_avoid_compile_warnings.patch b/debian/patches/saotk_avoid_compile_warnings.patch
index 7c6e5a5..b7eba9c 100644
--- a/debian/patches/saotk_avoid_compile_warnings.patch
+++ b/debian/patches/saotk_avoid_compile_warnings.patch
@@ -38,7 +38,7 @@ Description: Avoid compile time warnings in the saotk subsystem
    astGrid2dPtr = this;
 --- a/tksao1.0/frame/fitsimage.C
 +++ b/tksao1.0/frame/fitsimage.C
-@@ -1158,7 +1158,7 @@
+@@ -1184,7 +1184,7 @@
  	      if (ast[0] && ast[ii]) {
  		AstFrameSet* dep = (AstFrameSet*)astCopy(ast[ii]);
  		astInvert(ast[0]);
@@ -47,7 +47,7 @@ Description: Avoid compile time warnings in the saotk subsystem
  		astSetI(dep,"current",4);
  		astAnnul(ast[0]);
  		ast[0] = dep;
-@@ -2953,24 +2953,24 @@
+@@ -2963,24 +2963,24 @@
    if (ii>=0 && ast && ast[ii]) {
      if (astIsASkyFrame(astGetFrame(ast[ii], AST__CURRENT))) {
        setAstSkyFrame(ast[ii],sky);
@@ -81,7 +81,7 @@ Description: Avoid compile time warnings in the saotk subsystem
  	return out;
        }
      }
-@@ -3205,7 +3205,7 @@
+@@ -3219,7 +3219,7 @@
  
    ostringstream str;
    str << "Format(" << id << ")=" << format << ends;
@@ -90,7 +90,7 @@ Description: Avoid compile time warnings in the saotk subsystem
  }
  
  void FitsImage::setAstSkyFrame(AstFrameSet* aa, Coord::SkyFrame sky)
-@@ -3276,7 +3276,7 @@
+@@ -3290,7 +3290,7 @@
    astClearStatus;
  
    // new fitschan
@@ -99,7 +99,7 @@ Description: Avoid compile time warnings in the saotk subsystem
    if (!astOK || chan == AST__NULL)
      return NULL;
  
-@@ -3338,7 +3338,7 @@
+@@ -3352,7 +3352,7 @@
    astClearStatus;
  
    // new fitschan
@@ -193,7 +193,7 @@ Description: Avoid compile time warnings in the saotk subsystem
  }
 --- a/tksao1.0/frame/grid3d.C
 +++ b/tksao1.0/frame/grid3d.C
-@@ -119,16 +119,16 @@
+@@ -121,16 +121,16 @@
        astSetI(wcs, "Base", idata);
  
        // Create two 1D Frames and a 1D Mapping describing the third axis
@@ -214,7 +214,7 @@ Description: Avoid compile time warnings in the saotk subsystem
  
        // Use astGetFrame and astGetMapping to get the base and current
        // Frames from the 2D FrameSet, and the base->current Mapping.
-@@ -137,14 +137,14 @@
+@@ -139,14 +139,14 @@
        AstMapping* wcsmap = (AstMapping*)astGetMapping(wcs,AST__BASE,AST__CURRENT);
        // Combine the 2D and 1D base Frames into a 3D CmpFrame
        // Likewise, combine the 2D and 1D current Frames into a 3D CmpFrame
@@ -233,7 +233,7 @@ Description: Avoid compile time warnings in the saotk subsystem
        astAddFrame(frameSet, AST__CURRENT, cmpwcsmap, cmpwcscurr);
      }
    }
-@@ -187,26 +187,26 @@
+@@ -189,26 +189,26 @@
    double ss[] = {mx.matrix(0,0),mx.matrix(1,0),
  		 mx.matrix(0,1),mx.matrix(1,1)};
    AstMatrixMap* mm;

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