[Debian-astro-commits] [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 a80b0d2c4771dbc6c94ad9d1ded0e0b2b26d0161
Merge: fa905a5 33a4ddc
Author: Ole Streicher <olebole at debian.org>
Date:   Wed Aug 12 14:10:09 2015 +0200

    Merge branch 'upstream' into debian

 Makefile.am    |   9 +
 Makefile.in    |  42 +++--
 ast.news       |  46 +++++-
 axis.c         | 113 ++++++++++++-
 axis.h         |  10 +-
 cmpmap.c       |  41 ++++-
 configure      |  20 +--
 configure.ac   |   2 +-
 fitschan.c     | 229 +++++++++++++++++++-------
 frame.c        |  87 ++++++++--
 frame.h        |   6 +
 frameset.c     |  25 ++-
 lutmap.c       | 106 +++++++++++-
 lutmap.h       |  23 ++-
 mapping.c      |  16 +-
 mapping.h      |   8 +-
 matrixmap.c    |  78 ++++-----
 pcdmap.c       |  85 +++++-----
 plot.c         |  11 +-
 skyaxis.c      |  95 ++++++++++-
 skyframe.c     | 249 +++++++++++++++++++++++++++-
 skyframe.h     |  19 ++-
 slamap.c       |  50 +++++-
 slamap.h       |   7 +-
 sst.sty        | 234 ++++++++++++++++++++++++++
 starabbrev.sty | 284 ++++++++++++++++++++++++++++++++
 starlink.cls   | 510 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 starstyle.sty  | 162 ++++++++++++++++++
 sun210.tex     | 237 +++++++++++++++++++++++++--
 sun211.tex     | 237 +++++++++++++++++++++++++--
 timeframe.c    | 303 +++++++++++++++++++++++++++++++++-
 timemap.c      |  10 +-
 version.h      |   6 +-
 winmap.c       | 116 ++++++-------
 34 files changed, 3139 insertions(+), 337 deletions(-)

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