[starlink-ast] 01/02: Merge branch 'upstream' into debian

[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 627f6532c7b6037b14c5bc6ea5bd79d25a46ef0c
Merge: 5368795 552effe
Author: Ole Streicher <olebole at debian.org>
Date:   Fri Apr 17 17:11:40 2015 +0200

    Merge branch 'upstream' into debian

 AST_ERR                        |    8 +
 Makefile.am                    |    6 +-
 Makefile.in                    |   20 +-
 ast.news                       |   36 +-
 ast_err.h                      |    6 +
 axis.c                         |   74 +-
 axis.h                         |   12 +-
 circle.c                       |    2 +-
 cmpframe.c                     |  156 +-
 configure                      |   20 +-
 configure.ac                   |    2 +-
 ellipse.c                      |   10 +-
 fac_1521_err                   |    2 +
 fbox.c                         |    7 +-
 fchannel.c                     |    7 +-
 fcircle.c                      |    7 +-
 fcmpframe.c                    |    7 +-
 fcmpmap.c                      |    7 +-
 fcmpregion.c                   |    7 +-
 fdsbspecframe.c                |    7 +-
 fellipse.c                     |    7 +-
 ffitschan.c                    |    7 +-
 ffitstable.c                   |    7 +-
 ffluxframe.c                   |    7 +-
 fframe.c                       |   10 +-
 fframeset.c                    |    7 +-
 fgrismmap.c                    |    7 +-
 finterval.c                    |    7 +-
 fintramap.c                    |    7 +-
 fitschan.c                     |   38 +-
 fkeymap.c                      |    7 +-
 flutmap.c                      |    7 +-
 fmathmap.c                     |    7 +-
 fmatrixmap.c                   |    7 +-
 fnormmap.c                     |    7 +-
 fnullregion.c                  |    7 +-
 fobject.c                      |   12 +-
 fpcdmap.c                      |    7 +-
 fpermmap.c                     |    7 +-
 fplot.c                        |   20 +-
 fplot3d.c                      |    7 +-
 fpointlist.c                   |    7 +-
 fpolygon.c                     |    7 +-
 fpolymap.c                     |    7 +-
 fprism.c                       |    7 +-
 frame.c                        |   94 +-
 frame.h                        |   12 +-
 frameset.c                     |   78 +
 fratemap.c                     |    7 +-
 fselectormap.c                 |    7 +-
 fshiftmap.c                    |    7 +-
 fskyframe.c                    |    7 +-
 fslamap.c                      |    7 +-
 fspecfluxframe.c               |    7 +-
 fspecframe.c                   |    7 +-
 fspecmap.c                     |    7 +-
 fsphmap.c                      |    7 +-
 fstccatalogentrylocation.c     |    7 +-
 fstcobsdatalocation.c          |    7 +-
 fstcresourceprofile.c          |    7 +-
 fstcschan.c                    |    7 +-
 fstcsearchlocation.c           |    7 +-
 fswitchmap.c                   |    7 +-
 ftable.c                       |    7 +-
 ftimeframe.c                   |    7 +-
 ftimemap.c                     |    7 +-
 ftranmap.c                     |    7 +-
 funitmap.c                     |    7 +-
 fwcsmap.c                      |    7 +-
 fwinmap.c                      |    7 +-
 fxmlchan.c                     |    7 +-
 fzoommap.c                     |    7 +-
 interval.c                     |    8 +-
 mapping.c                      |  123 +-
 memory.c                       |   32 +
 memory.h                       |    6 +
 nullregion.c                   |    2 +-
 object.c                       |   64 +-
 plot.c                         |  372 ++-
 plot.h                         |    9 +-
 polygon.c                      |   45 +-
 region.c                       |   84 +-
 stcschan.c                     |   78 +-
 sun210.tex                     | 5894 +++++++++++++++++-----------------------
 sun210_figures/fronta.pdf      |  Bin 22646 -> 22394 bytes
 sun210_figures/frontb.pdf      |  Bin 66281 -> 57273 bytes
 sun210_figures/frontc.pdf      |  Bin 43197 -> 57629 bytes
 sun210_figures/gridplot_bw.pdf |  Bin 50506 -> 20421 bytes
 sun211.tex                     | 4782 ++++++++++++--------------------
 sun211_figures/fronta.pdf      |  Bin 22646 -> 22394 bytes
 sun211_figures/frontb.pdf      |  Bin 66281 -> 57273 bytes
 sun211_figures/frontc.pdf      |  Bin 43197 -> 57629 bytes
 sun211_figures/gridplot_bw.pdf |  Bin 50506 -> 20421 bytes
 timeframe.c                    |  261 +-
 timemap.c                      |    8 +-
 version.h                      |    6 +-
 96 files changed, 5925 insertions(+), 6831 deletions(-)

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