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

commit 71794e114c13db2dde73a32230b5a0bd06f4bacb
Merge: 9060901 415225b
Author: Ole Streicher <olebole at debian.org>
Date:   Wed Apr 20 21:10:07 2016 +0200

    Merge branch 'upstream' into debian

 calib/gasgano/config/KMOS.prefs       |    2 +-
 calib/gasgano/config/kmos.oca         |   10 +-
 configure                             |   20 +-
 configure.ac                          |    2 +-
 kmos/kmo_dfs.c                        |    7 +-
 kmos/kmo_dfs.h                        |    3 +-
 kmos/kmos_priv_sky_tweak.c            | 1399 +++++++++++++++++++++++----------
 kmos/kmos_priv_sky_tweak.h            |    4 +-
 kmos/tests/kmos_priv_sky_tweak-test.c |    2 +-
 recipes/Makefile.am                   |    6 -
 recipes/Makefile.in                   |   19 +-
 recipes/kmo_arithmetic.c              |    2 +-
 recipes/kmo_copy.c                    |    2 +-
 recipes/kmo_fit_profile.c             |    2 +-
 recipes/kmo_fits_check.c              |  478 -----------
 recipes/kmo_fits_strip.c              |    2 +-
 recipes/kmo_illumination_flat.c       |    2 +-
 recipes/kmo_make_image.c              |    2 +-
 recipes/kmo_noise_map.c               |    2 +-
 recipes/kmo_rotate.c                  |    2 +-
 recipes/kmo_shift.c                   |    2 +-
 recipes/kmo_sky_mask.c                |    4 +-
 recipes/kmo_stats.c                   |    2 +-
 recipes/kmos_combine.c                |    2 +-
 recipes/kmos_dark.c                   |    2 +-
 recipes/kmos_extract_spec.c           |    3 +-
 recipes/kmos_flat.c                   |   19 +-
 recipes/kmos_gen_reflines.c           |    2 +-
 recipes/kmos_illumination.c           |    2 +-
 recipes/kmos_reconstruct.c            |    2 +-
 recipes/kmos_sci_red.c                |   17 +-
 recipes/kmos_sky_tweak.c              |   42 +-
 recipes/kmos_std_star.c               |    2 +-
 recipes/kmos_wave_cal.c               |    2 +-
 reflex/kmos.xml.in                    |   67 +-
 reflex/kmos_combine.py                |    5 +-
 reflex/kmos_sci_red.py                |    4 +-
 tools/Makefile                        |   34 +-
 tools/kmos_calib.py                   |    4 +-
 39 files changed, 1143 insertions(+), 1042 deletions(-)

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