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

commit d735bd71a91d92cc3413213d4e88cf7e2edaa92c
Merge: 37ce880 d8be3f1
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Apr 11 13:23:10 2014 +0200

    Merge branch 'upstream' into debian

 Makefile.am                                  |    12 +-
 Makefile.in                                  |   333 +-
 aclocal.m4                                   |   394 +-
 admin/compile                                |   227 +-
 admin/config.guess                           |   261 +-
 admin/config.sub                             |   213 +-
 admin/depcomp                                |   189 +-
 admin/doxygen.am                             |    80 +
 admin/html.am                                |    74 -
 admin/install-sh                             |    35 +-
 admin/ltmain.sh                              |  4027 +++----
 admin/missing                                |   148 +-
 calib/gasgano/config/VIMOS.prefs             |     2 +-
 config.h.in                                  |     3 -
 config/Makefile.in                           |    64 +-
 configure                                    | 12567 ++++++++++++----------
 configure.ac                                 |     8 +-
 external/Makefile.in                         |   152 +-
 external/libwcs/Makefile.in                  |   168 +-
 external/libwcs/aclocal.m4                   |  2669 ++---
 external/libwcs/admin/compile                |   227 +-
 external/libwcs/admin/config.guess           |   261 +-
 external/libwcs/admin/config.sub             |   213 +-
 external/libwcs/admin/depcomp                |   189 +-
 external/libwcs/admin/install-sh             |    35 +-
 external/libwcs/admin/ltmain.sh              |  4027 +++----
 external/libwcs/admin/missing                |   148 +-
 external/libwcs/configure                    |  7532 +++++++------
 irplib/Makefile.in                           |   190 +-
 irplib/irplib_framelist.c                    |    16 +-
 irplib/tests/Makefile.in                     |   118 +-
 irplib/tests/irplib_polynomial-test.c        |     2 +-
 libpil/Makefile.in                           |   225 +-
 libpil/aclocal.m4                            |   394 +-
 libpil/admin/compile                         |   227 +-
 libpil/admin/config.guess                    |   261 +-
 libpil/admin/config.sub                      |   213 +-
 libpil/admin/depcomp                         |   189 +-
 libpil/admin/install-sh                      |    35 +-
 libpil/admin/ltmain.sh                       |  4027 +++----
 libpil/admin/missing                         |   148 +-
 libpil/config.h.in                           |     5 +-
 libpil/configure                             | 14036 ++++++++++++++++---------
 libpil/kazlib/Makefile.in                    |   245 +-
 libpil/kazlib/aclocal.m4                     |  2669 ++---
 libpil/kazlib/admin/compile                  |   227 +-
 libpil/kazlib/admin/config.guess             |   261 +-
 libpil/kazlib/admin/config.sub               |   213 +-
 libpil/kazlib/admin/depcomp                  |   189 +-
 libpil/kazlib/admin/install-sh               |    35 +-
 libpil/kazlib/admin/ltmain.sh                |  4027 +++----
 libpil/kazlib/admin/missing                  |   148 +-
 libpil/kazlib/config.h.in                    |     3 -
 libpil/kazlib/configure                      |  8132 +++++++-------
 libpil/kazlib/docs.dvi                       |   Bin 196916 -> 196884 bytes
 libpil/m4macros/libtool.m4                   |  2242 ++--
 libpil/m4macros/ltoptions.m4                 |    32 +-
 libpil/m4macros/ltversion.m4                 |    12 +-
 libpil/m4macros/lt~obsolete.m4               |    12 +-
 libpil/pil/Makefile.in                       |   100 +-
 libpil/tests/Makefile.am                     |     3 +-
 libpil/tests/Makefile.in                     |   101 +-
 m4macros/libtool.m4                          |  2242 ++--
 m4macros/ltoptions.m4                        |    32 +-
 m4macros/ltversion.m4                        |    12 +-
 m4macros/lt~obsolete.m4                      |    12 +-
 recipes/Makefile.am                          |   104 +-
 recipes/Makefile.in                          |   267 +-
 recipes/vimos_science.c                      |    13 +-
 recipes/vmifucombinecube.cc                  |     2 +-
 reflex/Makefile.am                           |     2 +-
 reflex/Makefile.in                           |    83 +-
 reflex/{VimosIfu.xml => vimos_ifu.xml}       |    10 +-
 reflex/{VimosIfu.xml.in => vimos_ifu.xml.in} |     4 +-
 reflex/{VimosMos.xml.in => vimos_mos.xml.in} |     4 +-
 regtests/Makefile.in                         |   152 +-
 regtests/tests/Makefile.am                   |    16 +
 regtests/tests/Makefile.in                   |    65 +-
 tests/Makefile.in                            |    70 +-
 vimos/Makefile.am                            |     3 +-
 vimos/Makefile.in                            |   127 +-
 vimos/vmcpl.c                                |     2 +-
 82 files changed, 36108 insertions(+), 40109 deletions(-)

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