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

[Ole Streicher]

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

olebole-guest pushed a commit to branch debian
in repository starlink-ast.

commit 26f156fd6b6ed19396642bd4403a44fda9f70f94
Merge: 19f70f3 18c8f3d
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Mar 10 10:31:36 2014 +0100

    Merge branch 'upstream' into debian
    
    Conflicts:
    	ast.news
    	configure
    	configure.ac
    	memory.c
    	object.c
    	polygon.c
    	region.c
    	skyframe.c
    	sun210.tex
    	sun211.tex
    	version.h

 Makefile.in                            |  2581 ++-
 aclocal.m4                             | 14163 +++++++-----
 ast.news                               |    13 +-
 ast_par.source                         |    11 +
 build-aux/compile                      |   347 +
 config.guess => build-aux/config.guess |   667 +-
 config.sub => build-aux/config.sub     |   447 +-
 build-aux/depcomp                      |   791 +
 build-aux/install-sh                   |   527 +
 build-aux/ltmain.sh                    |  9655 ++++++++
 build-aux/missing                      |   215 +
 build-aux/test-driver                  |   139 +
 compile                                |   142 -
 config.h.in                            |    13 +-
 configure                              | 36846 +++++++++++++------------------
 configure.ac                           |    14 +-
 depcomp                                |   530 -
 fitschan.c                             |     2 +-
 fpolygon.c                             |    43 +
 install-sh                             |   323 -
 ltmain.sh                              |  6500 ------
 memory.c                               |    34 +-
 missing                                |   381 -
 object.c                               |     2 +
 polygon.c                              |  1657 +-
 polygon.h                              |    60 +
 region.c                               |    17 +-
 skyframe.c                             |    33 +-
 sphmap.c                               |     5 +-
 stcschan.c                             |    74 +-
 sun210.tex                             |   280 +-
 sun211.tex                             |   284 +-
 version.h                              |     6 +-
 wcsmap.c                               |    11 +-
 34 files changed, 39694 insertions(+), 37119 deletions(-)

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