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

commit d2b6b2a9fb9550d3c43cbc0f03819153b56fec16
Merge: a970f77 90283df
Author: Ole Streicher <ole at aip.de>
Date:   Wed Apr 20 13:26:01 2016 +0200

    Merge branch 'upstream' into debian

 Makefile.in                      |   60 +-
 aclocal.m4                       |  207 +-
 admin/compile                    |    2 +-
 admin/config.guess               |   15 +-
 admin/config.sub                 |   19 +-
 admin/depcomp                    |    2 +-
 admin/install-sh                 |  366 ++-
 admin/ltmain.sh                  | 5528 ++++++++++++++++++++++++--------------
 admin/missing                    |    6 +-
 admin/test-driver                |   35 +-
 calib/gasgano/config/FORS1.prefs |    2 +-
 calib/gasgano/config/FORS2.prefs |    2 +-
 config.h.in                      |    6 +-
 configure                        | 3529 +++++++++++++-----------
 configure.ac                     |    5 +-
 fors/Makefile.am                 |   11 +-
 fors/Makefile.in                 |   41 +-
 fors/fors_ccd_config.cc          |    2 +
 fors/fors_dfs.c                  |   13 +-
 fors/fors_flat_normalise.cc      |   65 +-
 fors/fors_flat_normalise.h       |    4 +-
 fors/fors_landolt.sex.tpl        |  106 +
 fors/fors_photometry_impl.cc     |    6 +-
 fors/fors_response.cc            |   66 +-
 fors/fors_response.h             |   14 +-
 fors/moses.c                     |   20 +
 fors/tests/Makefile.in           |   33 +-
 irplib/Makefile.in               |   30 +-
 irplib/tests/Makefile.in         |   33 +-
 m4macros/libtool.m4              | 2550 ++++++++++--------
 m4macros/ltoptions.m4            |  127 +-
 m4macros/ltsugar.m4              |    7 +-
 m4macros/ltversion.m4            |   12 +-
 m4macros/lt~obsolete.m4          |    7 +-
 mosca/Makefile.in                |   23 +-
 mosca/hdrl/Makefile.in           |   30 +-
 mosca/hdrl/tests/Makefile.in     |   31 +-
 mosca/libmosca/Makefile.in       |   26 +-
 mosca/libmosca/tests/Makefile.in |   27 +-
 recipes/Makefile.in              |   29 +-
 recipes/fors_calib.cc            |  184 +-
 recipes/fors_science.cc          |  231 +-
 recipes/tests/Makefile.in        |   33 +-
 reflex/Makefile.in               |   26 +-
 reflex/fors_calib_interact.py    |   44 +-
 reflex/fors_imaging.xml          |  165 +-
 reflex/fors_imaging.xml.in       |  159 +-
 reflex/fors_imaging_wkf.oca      |   10 +-
 reflex/fors_pmos.xml.in          |  163 +-
 reflex/fors_pmos_wkf.oca         |   59 +-
 reflex/fors_science_interact.py  |   10 +-
 reflex/fors_spec.xml             |  357 +--
 reflex/fors_spec.xml.in          |  345 ++-
 reflex/fors_spec_wkf.oca         |  124 +-
 regtests/Makefile.in             |   23 +-
 regtests/tests/Makefile.in       |   23 +-
 56 files changed, 9102 insertions(+), 5951 deletions(-)

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