[cpl-plugin-uves] 04/05: Merge branch 'upstream' into debian

[Ole Streicher]

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

olebole-guest pushed a commit to branch debian
in repository cpl-plugin-uves.

commit 2cdbaee3da632ca087b0eddf69de6d0728f72387
Merge: af55bbb 1e540f4
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Apr 11 14:44:09 2014 +0200

    Merge branch 'upstream' into debian
    
    Conflicts:
    	calib/cal_size

 ChangeLog                                     |   25 +
 calib/cal_size                                |    2 +-
 calib/gasgano/config/UVES.prefs               |    2 +-
 calib/gasgano/config/uves_wkf.oca             | 2530 -------
 configure                                     |   27 +-
 configure.ac                                  |    5 +-
 flames/flames_cal_prep_sff_ofpos_impl.c       |   71 +-
 flames/flames_dfs.c                           |   12 +-
 flames/flames_fastprepfibreff.c               |    3 +
 flames/flames_fileutils.c                     |   16 +-
 flames/flames_fillholes.c                     |    9 +-
 flames/flames_obs_scired_impl.c               |  116 +-
 flames/flames_preordpos.c                     |    1 +
 flames/flames_prepfibreff.c                   |    3 +
 flames/flames_prepframe.c                     |    2 +
 flames/flames_utils_science.c                 |   36 +-
 flames/tests/flames_add_extra_des-test.c      |    7 +-
 flames/tests/flames_cal_prep_sff_ofpos-test.c |   10 +-
 flames/tests/flames_dfs-test.c                |    6 -
 flames/tests/flames_drs-test.c                |    7 +-
 irplib/irplib_distortion.c                    |   14 -
 irplib/irplib_framelist.c                     |   16 +-
 irplib/irplib_plugin.c                        |    2 +-
 irplib/irplib_polynomial.c                    |  173 +-
 irplib/irplib_polynomial.h                    |   26 -
 irplib/irplib_strehl.c                        |  946 ++-
 irplib/irplib_strehl.h                        |   63 +-
 irplib/tests/Makefile.am                      |    5 +
 irplib/tests/Makefile.in                      |   21 +-
 irplib/tests/irplib_framelist-test.c          |   19 +
 irplib/tests/irplib_polynomial-test.c         |   13 +-
 irplib/tests/irplib_strehl-test.c             |  841 +++
 recipes/Makefile.am                           |  154 +-
 recipes/Makefile.in                           |  311 +-
 recipes/tests/Makefile.am                     |    2 +-
 recipes/tests/Makefile.in                     |    2 +-
 recipes/uves_utl_ima_arith.c                  |   12 +-
 reflex/Makefile.am                            |    4 +-
 reflex/Makefile.in                            |   13 +-
 reflex/flames_cal_ofpos_interact.py           |  333 +
 reflex/flames_cal_predict_interact.py         |    6 +-
 reflex/flames_cal_wavecal_interact.py         |  236 +-
 reflex/flames_obs_scired_interact.py          |  230 +-
 reflex/flames_plot_common.py                  |  101 +-
 reflex/uves-dflats.xml                        |  303 +-
 reflex/uves-dflats.xml.in                     |  291 +-
 reflex/uves-fibre-520.xml.in                  | 9737 -------------------------
 reflex/uves-fibre.xml                         | 9574 ------------------------
 reflex/uves-fibre.xml.in                      | 1182 ++-
 reflex/uves.xml                               |  106 +-
 reflex/uves.xml.in                            |   92 +-
 reflex/uves_cal_predict_interact.py           |    8 +-
 reflex/uves_cal_response_interact.py          |   22 +-
 reflex/uves_cal_wavecal_interact.py           |    8 +-
 reflex/uves_log_invocation.py                 |   20 +
 reflex/uves_obs_scired_interact.py            |   52 +-
 reflex/uves_wkf.oca                           |   12 +-
 reflex/uves_wkf_onlydflats.oca                |   12 +-
 regtests/tests/Makefile.am                    |   16 +
 regtests/tests/Makefile.in                    |   16 +
 uves/Makefile.am                              |    2 +-
 uves/Makefile.in                              |    2 +-
 uves/flames_midas_def.c                       |  258 +-
 uves/tests/cpl_propertylist-test.c            |   88 +-
 uves/tests/uves_dfs-test.c                    |    6 -
 uves/tests/uves_response-test.c               |    4 +-
 uves/tests/uves_utils-test.c                  |   28 +-
 uves/tests/uves_wavecal-test.c                |    6 -
 uves/uves_dfs.c                               |  642 +-
 uves/uves_dfs.h                               |  321 +-
 uves/uves_extract.c                           |   18 +-
 uves/uves_globals.h                           |    3 +
 uves/uves_parameters.c                        |  158 +-
 uves/uves_physmod_plotmod.c                   |   12 +-
 uves/uves_propertylist.c                      |   16 +-
 uves/uves_propertylist.h                      |    5 -
 uves/uves_qclog.h                             |   52 +-
 uves/uves_reduce.c                            |   62 +-
 uves/uves_reduce.h                            |    1 +
 uves/uves_reduce_mflat_combine.c              |    2 +-
 uves/uves_reduce_scired.c                     |   11 +-
 uves/uves_response_efficiency.c               |    2 +
 uves/uves_response_efficiency.h               |    1 +
 uves/uves_response_impl.c                     |    4 +
 uves/uves_utils_wrappers.c                    |    4 -
 uves/uves_wavecal_identify.c                  |   11 -
 86 files changed, 4631 insertions(+), 24972 deletions(-)

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