[Debian-astro-commits] [cpl-plugin-vimos] 03/05: Merge tag 'upstream/3.1.6+dfsg' 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 ebc671a1db4f2107c8df678acc8d96ae6b4f8a43
Merge: fe0b674 085c70d
Author: Ole Streicher <olebole at debian.org>
Date:   Fri Jul 8 09:33:31 2016 +0200

    Merge tag 'upstream/3.1.6+dfsg' into debian
    
    Upstream version 3.1.6+dfsg

 Makefile.am                               |   2 +-
 Makefile.in                               |   3 +-
 aclocal.m4                                | 211 +++++++++++++++++++-----------
 admin/config.guess                        | 143 ++++++++++++--------
 admin/config.sub                          |  38 +++---
 admin/install-sh                          |  23 ++--
 admin/ltmain.sh                           |  37 ++++--
 calib/gasgano/config/VIMOS.prefs          |   2 +-
 config/Makefile.in                        |   1 +
 configure                                 |  99 +++++++++-----
 configure.ac                              |   2 +-
 external/Makefile.in                      |   1 +
 external/libwcs/Makefile.in               |   1 +
 external/libwcs/aclocal.m4                |  32 +++--
 external/libwcs/admin/config.guess        | 143 ++++++++++++--------
 external/libwcs/admin/config.sub          |  38 +++---
 external/libwcs/admin/install-sh          |  23 ++--
 external/libwcs/admin/ltmain.sh           |  37 ++++--
 external/libwcs/configure                 |  41 ++++--
 irplib/Makefile.in                        |   1 +
 irplib/tests/Makefile.in                  |   1 +
 libpil/Makefile.in                        |   1 +
 libpil/admin/config.guess                 | 143 ++++++++++++--------
 libpil/admin/config.sub                   |  38 +++---
 libpil/admin/install-sh                   |  23 ++--
 libpil/admin/ltmain.sh                    |  37 ++++--
 libpil/configure                          |  45 +++++--
 libpil/kazlib/Makefile.in                 |   1 +
 libpil/kazlib/aclocal.m4                  |  32 +++--
 libpil/kazlib/admin/config.guess          | 143 ++++++++++++--------
 libpil/kazlib/admin/config.sub            |  38 +++---
 libpil/kazlib/admin/install-sh            |  23 ++--
 libpil/kazlib/admin/ltmain.sh             |  37 ++++--
 libpil/kazlib/configure                   |  41 ++++--
 libpil/kazlib/docs.dvi                    | Bin 196916 -> 196912 bytes
 libpil/m4macros/libtool.m4                |  32 +++--
 libpil/pil/Makefile.in                    |   1 +
 libpil/tests/Makefile.in                  |   1 +
 m4macros/libtool.m4                       |  32 +++--
 mosca/Makefile.in                         |   1 +
 mosca/hdrl/Makefile.in                    |   1 +
 mosca/hdrl/tests/Makefile.in              |   1 +
 mosca/libmosca/Makefile.in                |   1 +
 mosca/libmosca/tests/Makefile.in          |   1 +
 mosca/libmosca/wavelength_calibration.cpp |  50 +++----
 mosca/libmosca/wavelength_calibration.h   |   2 +
 recipes/Makefile.am                       | 104 +++++++--------
 recipes/Makefile.in                       | 105 +++++++--------
 reflex/Makefile.in                        |   1 +
 reflex/vimos_ifu.xml                      |   6 +-
 regtests/Makefile.in                      |   1 +
 regtests/tests/Makefile.am                |  12 --
 regtests/tests/Makefile.in                |   7 +-
 tests/Makefile.in                         |   1 +
 vimos/Makefile.in                         |   1 +
 vimos/vimos_flat_normalise.cc             |   2 +
 56 files changed, 1149 insertions(+), 695 deletions(-)

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