[Debian-astro-commits] [cpl-plugin-sinfo] 02/03: Merge branch 'upstream' into debian

[Ole Streicher]

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

olebole pushed a commit to tag debian/2.6.8+dfsg-1
in repository cpl-plugin-sinfo.

commit 4f35db9c071b9ef31a4937044e0fc4ddc46365c9
Merge: 1e1125b e6ab0c9
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Sep 23 11:21:03 2015 +0200

    Merge branch 'upstream' into debian

 ChangeLog                             |   4 +
 calib/gasgano/config/SINFO.prefs      |   2 +-
 configure                             |  20 +-
 configure.ac                          |   2 +-
 irplib/irplib_utils.c                 |   1 +
 recipes/sinfo_utl_cube_combine.c      |  12 +
 reflex/sinfo.xml.in                   | 524 ++++++++++++++++++++++++++++------
 sinfoni/sinfo_absolute.c              |  21 +-
 sinfoni/sinfo_absolute.h              |   4 +-
 sinfoni/sinfo_baryvel.c               |   3 -
 sinfoni/sinfo_baryvel.h               |  24 +-
 sinfoni/sinfo_boltzmann.c             |  14 +-
 sinfoni/sinfo_coltilt.c               |   5 +-
 sinfoni/sinfo_cube_construct.c        |  10 +
 sinfoni/sinfo_dfs.c                   | 238 ++-------------
 sinfoni/sinfo_distortion.c            |   2 +
 sinfoni/sinfo_dump.c                  | 242 ++++++++--------
 sinfoni/sinfo_dump.h                  |  41 +--
 sinfoni/sinfo_fft_base.c              |   2 +
 sinfoni/sinfo_fit.c                   |   3 +
 sinfoni/sinfo_focus.c                 |   1 +
 sinfoni/sinfo_function_1d.c           |  13 +
 sinfoni/sinfo_functions.h             |  14 +-
 sinfoni/sinfo_globals.c               |   4 +
 sinfoni/sinfo_new_cubes_coadd.c       |   6 +-
 sinfoni/sinfo_new_objnod.c            |   5 +-
 sinfoni/sinfo_utilities_scired.c      | 410 ++++++++++----------------
 sinfoni/sinfo_utilities_scired.h      |  17 +-
 sinfoni/sinfo_utl_cube_combine.c      |  15 +-
 sinfoni/tests/Makefile.am             |  13 +-
 sinfoni/tests/Makefile.in             |  75 ++++-
 sinfoni/tests/sinfo_absolute_test.c   | 398 ++++++++++++++++++++++++++
 sinfoni/tests/sinfo_baryvel_test.c    | 124 ++++++++
 sinfoni/tests/sinfo_boltzmann_test.c  | 296 +++++++++++++++++++
 sinfoni/tests/sinfo_cube_coadd_test.c | 293 +++++++++----------
 35 files changed, 1906 insertions(+), 952 deletions(-)

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