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

commit 5053c4890440aa35aba05c3ae263706af5c2fee3
Merge: f5c09f2 40f6089
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Sep 2 16:04:06 2015 +0200

    Merge branch 'upstream' into debian

 ChangeLog                                          |    13 +
 calib/gasgano/config/UVES.prefs                    |     2 +-
 configure                                          |    20 +-
 configure.ac                                       |     2 +-
 flames/Makefile.am                                 |     4 +-
 flames/Makefile.in                                 |    30 +-
 flames/flames_cal_prep_sff_ofpos_impl.c            |     3 -
 ...flames_covsrt.c => flames_covariance_reorder.c} |     4 +-
 ...flames_covsrt.h => flames_covariance_reorder.h} |     4 +-
 flames/flames_lsfit.c                              |     2 +-
 flames/flames_obs_scired_impl.c                    |     3 -
 irplib/irplib_utils.c                              |     4 +-
 recipes/flames_cal_mkmaster.c                      |    34 -
 recipes/flames_cal_orderpos.c                      |    28 -
 recipes/flames_cal_predict.c                       |    28 -
 recipes/flames_cal_prep_sff_ofpos.c                |    28 -
 recipes/flames_cal_wavecal.c                       |    27 -
 recipes/flames_obs_redchain.c                      |    30 -
 recipes/flames_obs_scired.c                        |    28 -
 recipes/uves_cal_cd_align.c                        |    31 -
 recipes/uves_cal_mkmaster.c                        |    31 -
 recipes/uves_mbias.c                               |    28 -
 recipes/uves_mdark.c                               |    28 -
 recipes/uves_orderpos.c                            |    28 -
 recipes/uves_response.c                            |    30 -
 recipes/uves_scired.c                              |    28 -
 recipes/uves_wavecal.c                             |    28 -
 reflex/Makefile.am                                 |     2 +-
 reflex/Makefile.in                                 |     2 +-
 reflex/flames_cal_ofpos_interact.py                |     2 +-
 reflex/flames_cal_predict_interact.py              |     4 +-
 reflex/flames_cal_wavecal_interact.py              |     2 +-
 reflex/flames_obs_scired_interact.py               |     2 +-
 reflex/flames_plot_common.py                       |     2 +-
 reflex/uves-dflats.xml                             | 12584 -------------------
 reflex/uves-dflats.xml.in                          |  1073 +-
 reflex/uves-fibre.xml.in                           |  3549 +++---
 reflex/uves.xml                                    |  2918 ++++-
 reflex/uves.xml.in                                 |  2904 ++++-
 reflex/uves_cal_predict_interact.py                |     4 +-
 reflex/uves_cal_response_interact.py               |     2 +-
 reflex/uves_cal_wavecal_interact.py                |     2 +-
 reflex/uves_obs_scired_interact.py                 |     2 +-
 reflex/uves_plot_common.py                         |     3 +-
 uves/uves_reduce_scired.c                          |    12 +-
 45 files changed, 7445 insertions(+), 16150 deletions(-)

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