[Debian-astro-commits] [cpl-plugin-sinfo] 01/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 branch debian
in repository cpl-plugin-sinfo.

commit 62858c2cfc3de6f498b5861dc075dc80b509b226
Merge: ebc076e cd74f76
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Nov 4 14:24:02 2015 +0100

    Merge branch 'upstream' into debian

 ChangeLog                                        |    3 +
 calib/gasgano/config/SINFO.prefs                 |    2 +-
 configure                                        |   20 +-
 configure.ac                                     |    2 +-
 recipes/sinfo_utl_cube_create.c                  |    8 +-
 sinfoni/Makefile.am                              |    1 +
 sinfoni/Makefile.in                              |    1 +
 sinfoni/sinfo_absolute.c                         | 2010 ++-----------------
 sinfoni/sinfo_absolute.h                         |   45 +-
 sinfoni/sinfo_boltzmann.c                        |  550 +-----
 sinfoni/{sinfo_absolute.h => sinfo_boltzmann.h}  |   76 +-
 sinfoni/sinfo_coltilt.c                          |  978 +---------
 sinfoni/sinfo_coltilt.h                          |  103 +-
 sinfoni/sinfo_cube_construct.c                   | 2272 ++++------------------
 sinfoni/sinfo_cube_construct.h                   |  178 --
 sinfoni/sinfo_distortion.c                       |  321 ---
 sinfoni/sinfo_distortion.h                       |   20 +-
 sinfoni/sinfo_dump.c                             |  300 ---
 sinfoni/sinfo_fft_base.c                         |   43 -
 sinfoni/sinfo_fft_base.h                         |    1 -
 sinfoni/sinfo_fit.c                              |  311 ---
 sinfoni/sinfo_fit.h                              |   13 -
 sinfoni/sinfo_focus.c                            |   50 -
 sinfoni/sinfo_focus.h                            |    9 -
 sinfoni/sinfo_function_1d.c                      |  489 -----
 sinfoni/sinfo_function_1d.h                      |  180 --
 sinfoni/sinfo_globals.c                          |   77 -
 sinfoni/sinfo_globals.h                          |   14 +-
 sinfoni/sinfo_image_ops.c                        |   22 +-
 sinfoni/sinfo_matrix.c                           |   28 -
 sinfoni/sinfo_matrix.h                           |   18 -
 sinfoni/sinfo_median.c                           |   42 -
 sinfoni/sinfo_median.h                           |   16 -
 sinfoni/sinfo_new_bezier.c                       |  297 ---
 sinfoni/sinfo_new_bezier.h                       |   18 -
 sinfoni/sinfo_new_cube_ops.c                     |    8 +-
 sinfoni/sinfo_new_find_distortions.c             |    3 +-
 sinfoni/sinfo_new_resampling.c                   |   37 -
 sinfoni/sinfo_new_resampling.h                   |   19 -
 sinfoni/sinfo_new_slit_pos.c                     |    1 +
 sinfoni/sinfo_new_stdstar.c                      |    2 +-
 sinfoni/sinfo_new_wave_cal_slit2.c               |    1 +
 sinfoni/sinfo_pfits.c                            |  210 --
 sinfoni/sinfo_pfits.h                            |   15 +-
 sinfoni/sinfo_poly2d.c                           |    2 +
 sinfoni/sinfo_pro_save.c                         |  327 +---
 sinfoni/sinfo_pro_save.h                         |  150 +-
 sinfoni/sinfo_rec_utils.c                        |  331 ----
 sinfoni/sinfo_rec_utils.h                        |    6 -
 sinfoni/sinfo_recipes.c                          |  172 +-
 sinfoni/sinfo_recipes.h                          |   38 -
 sinfoni/sinfo_skycor.c                           |    6 +
 sinfoni/sinfo_spectrum_ops.c                     |    9 +
 sinfoni/sinfo_star_index.c                       |    6 +-
 sinfoni/sinfo_star_index.h                       |    1 -
 sinfoni/sinfo_svd.c                              |    7 -
 sinfoni/sinfo_svd.h                              |    1 -
 sinfoni/sinfo_tilt_cfg.c                         |    2 +
 sinfoni/sinfo_time.c                             |    1 +
 sinfoni/sinfo_tpl_utils.c                        |   18 +-
 sinfoni/sinfo_tpl_utils.h                        |    2 -
 sinfoni/sinfo_utilities.c                        |  139 +-
 sinfoni/sinfo_utilities.h                        |   16 +-
 sinfoni/sinfo_utilities_scired.c                 |  542 ++----
 sinfoni/sinfo_utilities_scired.h                 |   19 -
 sinfoni/sinfo_utils_wrappers.c                   |   45 +-
 sinfoni/sinfo_utils_wrappers.h                   |    6 +-
 sinfoni/sinfo_utl_efficiency.c                   |    2 -
 sinfoni/sinfo_wave_calibration.c                 |  800 +-------
 sinfoni/sinfo_wave_calibration.h                 |  114 +-
 sinfoni/tests/Makefile.am                        |   14 +-
 sinfoni/tests/Makefile.in                        |   28 +-
 sinfoni/tests/sinfo_boltzmann_test.c             |    3 +-
 sinfoni/tests/sinfo_cube_measure_centroid_test.c |    2 +-
 sinfoni/tests/sinfo_intensity_scale_test.c       |  121 ++
 sinfoni/tests/sinfo_kappa_sigma_test.c           |   18 +-
 sinfoni/tests/sinfo_strehl_test.c                |    8 +-
 77 files changed, 1072 insertions(+), 10698 deletions(-)

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