[Debian-astro-commits] [cpl-plugin-sinfo] 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 cpl-plugin-sinfo.

commit f95bf81dac07bd429ffda5db2b4dfd4fad476579
Merge: f193be5 ba8575b
Author: Ole Streicher <ole at aip.de>
Date:   Wed Apr 20 14:15:23 2016 +0200

    Merge branch 'upstream' into debian

 ChangeLog                                  |   9 +
 calib/gasgano/config/SINFO.prefs           |   2 +-
 calib/gasgano/config/SINFO.rul             | Bin 12806 -> 0 bytes
 configure                                  | 365 ++++++-----------------------
 configure.ac                               |   5 +-
 irplib/irplib_slitpos.c                    |   3 +
 reflex/sinfo.xml.in                        | 114 ++++-----
 reflex/sinfo_wkf.oca                       | 166 ++++++-------
 sinfoni/sinfo_absolute.c                   |   4 +-
 sinfoni/sinfo_boltzmann.c                  |  27 ++-
 sinfoni/sinfo_cube_construct.c             | 128 ----------
 sinfoni/sinfo_dfs.c                        | 110 ++++++++-
 sinfoni/sinfo_distortion.c                 | 152 ------------
 sinfoni/sinfo_flat_ini_by_cpl.c            |   7 +-
 sinfoni/sinfo_focus.c                      |  10 +-
 sinfoni/sinfo_globals.h                    |  12 +
 sinfoni/sinfo_new_cube_ops.c               |  10 +
 sinfoni/sinfo_new_find_distortions.c       |  13 +-
 sinfoni/sinfo_new_lamp_flats.c             |  11 +
 sinfoni/sinfo_new_prepare_stacked_frames.c |  26 +-
 sinfoni/sinfo_new_resampling.c             |   2 +-
 sinfoni/sinfo_new_resampling.h             |   2 +-
 sinfoni/sinfo_new_wave_cal_slit2.c         |  10 +
 sinfoni/sinfo_pfits.c                      |  76 ------
 sinfoni/sinfo_recipes.c                    |   4 +-
 sinfoni/sinfo_wave_calibration.c           |  14 +-
 sinfoni/sinfo_wavecal.c                    |  12 +
 sinfoni/tests/Makefile.am                  |  10 +-
 sinfoni/tests/Makefile.in                  |  52 +++-
 sinfoni/tests/sinfo_arc_lamp_simul_test.c  | 182 ++++++++++++++
 sinfoni/tests/sinfo_find_lines_test.c      | 164 +++++++++++++
 31 files changed, 873 insertions(+), 829 deletions(-)

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