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

commit 6ed68562a430c12f19eda5a5288668fdb8f4bfe0
Merge: 684631c c0ae875
Author: Ole Streicher <ole at aip.de>
Date:   Wed Apr 20 14:31:37 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/VIMOS.prefs   |    2 +-
 config.h.in                        |    6 +-
 config/Makefile.in                 |   25 +-
 configure                          | 3533 +++++++++++++----------
 configure.ac                       |    5 +-
 external/Makefile.in               |   23 +-
 external/libwcs/Makefile.in        |   54 +-
 external/libwcs/aclocal.m4         | 2908 +++++++++++--------
 external/libwcs/admin/compile      |    2 +-
 external/libwcs/admin/config.guess |   15 +-
 external/libwcs/admin/config.sub   |   19 +-
 external/libwcs/admin/depcomp      |    2 +-
 external/libwcs/admin/install-sh   |  366 ++-
 external/libwcs/admin/ltmain.sh    | 5528 +++++++++++++++++++++++-------------
 external/libwcs/admin/missing      |    6 +-
 external/libwcs/configure          | 2374 +++++++++-------
 irplib/Makefile.in                 |   30 +-
 irplib/tests/Makefile.in           |   33 +-
 libpil/Makefile.in                 |   59 +-
 libpil/aclocal.m4                  |  207 +-
 libpil/admin/compile               |    2 +-
 libpil/admin/config.guess          |   15 +-
 libpil/admin/config.sub            |   19 +-
 libpil/admin/depcomp               |    2 +-
 libpil/admin/install-sh            |  366 ++-
 libpil/admin/ltmain.sh             | 5528 +++++++++++++++++++++++-------------
 libpil/admin/missing               |    6 +-
 libpil/admin/test-driver           |   35 +-
 libpil/config.h.in                 |    6 +-
 libpil/configure                   | 2378 +++++++++-------
 libpil/kazlib/Makefile.in          |   60 +-
 libpil/kazlib/aclocal.m4           | 2908 +++++++++++--------
 libpil/kazlib/admin/compile        |    2 +-
 libpil/kazlib/admin/config.guess   |   15 +-
 libpil/kazlib/admin/config.sub     |   19 +-
 libpil/kazlib/admin/depcomp        |    2 +-
 libpil/kazlib/admin/install-sh     |  366 ++-
 libpil/kazlib/admin/ltmain.sh      | 5528 +++++++++++++++++++++++-------------
 libpil/kazlib/admin/missing        |    6 +-
 libpil/kazlib/config.h.in          |    6 +-
 libpil/kazlib/configure            | 2313 ++++++++-------
 libpil/kazlib/docs.dvi             |  Bin 196916 -> 196916 bytes
 libpil/m4macros/libtool.m4         | 2550 ++++++++++-------
 libpil/m4macros/ltoptions.m4       |  127 +-
 libpil/m4macros/ltsugar.m4         |    7 +-
 libpil/m4macros/ltversion.m4       |   12 +-
 libpil/m4macros/lt~obsolete.m4     |    7 +-
 libpil/pil/Makefile.am             |    8 +-
 libpil/pil/Makefile.in             |  154 +-
 libpil/tests/Makefile.in           |   31 +-
 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/vimos_science.cc           |   24 +-
 recipes/vmbias.cc                  |   49 +-
 recipes/vmimstandard.c             |    2 +-
 reflex/Makefile.in                 |   25 +-
 reflex/vimos_ifu.xml               |  273 +-
 reflex/vimos_ifu.xml.in            |  267 +-
 reflex/vimos_ifu_wkf.dvd.oca       |  589 +---
 reflex/vimos_ifu_wkf.oca           |  489 +---
 reflex/vimos_mos.xml.in            |  291 +-
 reflex/vimos_mos_wkf.oca           |  103 +-
 regtests/Makefile.in               |   23 +-
 regtests/tests/Makefile.in         |   23 +-
 tests/Makefile.in                  |   27 +-
 vimos/Makefile.in                  |   29 +-
 vimos/vimos_calib_impl.cc          |    5 +-
 vimos/vimos_calib_mult.cc          |    7 +-
 vimos/vimos_overscan.cc            |   13 +
 vimos/vimos_overscan.h             |    2 +
 vimos/vimos_response.cc            |   74 +-
 vimos/vimos_response.h             |   19 +-
 vimos/vimos_science_impl.cc        |   21 +-
 vimos/vmextractiontable.c          |    4 +-
 93 files changed, 29138 insertions(+), 20005 deletions(-)

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