[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-guest pushed a commit to branch debian
in repository cpl-plugin-vimos.

commit 72a9c11cd0193f34aef7b1cfcf7b88a3d6eacb49
Merge: 36ca416 c337419
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri May 9 16:08:06 2014 +0200

    Merge branch 'upstream' into debian

 Makefile.in                        |   416 +-
 acinclude.m4                       |     8 +-
 aclocal.m4                         |   624 +-
 admin/compile                      |   232 +-
 admin/config.guess                 |   294 +-
 admin/config.sub                   |   263 +-
 admin/depcomp                      |   531 +-
 admin/install-sh                   |    35 +-
 admin/ltmain.sh                    |  4017 ++++++----
 admin/missing                      |   461 +-
 admin/test-driver                  |   127 +
 calib/gasgano/config/VIMOS.prefs   |     2 +-
 config.h.in                        |     3 +
 config/Makefile.in                 |   138 +-
 configure                          | 12817 ++++++++++++++----------------
 configure.ac                       |     2 +-
 external/Makefile.in               |   293 +-
 external/libwcs/Makefile.in        |   343 +-
 external/libwcs/aclocal.m4         |  2911 ++++---
 external/libwcs/admin/compile      |   232 +-
 external/libwcs/admin/config.guess |   294 +-
 external/libwcs/admin/config.sub   |   263 +-
 external/libwcs/admin/depcomp      |   531 +-
 external/libwcs/admin/install-sh   |    35 +-
 external/libwcs/admin/ltmain.sh    |  4017 ++++++----
 external/libwcs/admin/missing      |   461 +-
 external/libwcs/configure          |  7557 +++++++++---------
 irplib/Makefile.in                 |   362 +-
 irplib/tests/Makefile.in           |   829 +-
 libpil/Makefile.in                 |   397 +-
 libpil/acinclude.m4                |     5 +
 libpil/aclocal.m4                  |   624 +-
 libpil/admin/compile               |   232 +-
 libpil/admin/config.guess          |   294 +-
 libpil/admin/config.sub            |   263 +-
 libpil/admin/depcomp               |   531 +-
 libpil/admin/install-sh            |    35 +-
 libpil/admin/ltmain.sh             |  4017 ++++++----
 libpil/admin/missing               |   461 +-
 libpil/admin/test-driver           |   127 +
 libpil/config.h.in                 |     5 +-
 libpil/configure                   | 14801 +++++++++++++----------------------
 libpil/kazlib/Makefile.in          |   513 +-
 libpil/kazlib/aclocal.m4           |  2911 ++++---
 libpil/kazlib/admin/compile        |   232 +-
 libpil/kazlib/admin/config.guess   |   294 +-
 libpil/kazlib/admin/config.sub     |   263 +-
 libpil/kazlib/admin/depcomp        |   531 +-
 libpil/kazlib/admin/install-sh     |    35 +-
 libpil/kazlib/admin/ltmain.sh      |  4017 ++++++----
 libpil/kazlib/admin/missing        |   461 +-
 libpil/kazlib/config.h.in          |     3 +
 libpil/kazlib/configure            |  8111 ++++++++++---------
 libpil/kazlib/docs.dvi             |   Bin 196884 -> 196916 bytes
 libpil/m4macros/libtool.m4         |  2256 ++++--
 libpil/m4macros/ltoptions.m4       |    32 +-
 libpil/m4macros/ltversion.m4       |    12 +-
 libpil/m4macros/lt~obsolete.m4     |    12 +-
 libpil/pil/Makefile.am             |     4 +-
 libpil/pil/Makefile.in             |   326 +-
 libpil/pil/pilalias.c              |    26 +-
 libpil/pil/pilastroutils.c         |     4 +-
 libpil/pil/pilcdb.c                |    50 +-
 libpil/pil/pildfsconfig.c          |    26 +-
 libpil/pil/pildictionary.c         |    48 +-
 libpil/pil/pilfileutils.c          |    16 +-
 libpil/pil/pilfits.c               |     2 +-
 libpil/pil/pilkeyword.c            |    26 +-
 libpil/pil/pillist.c               |    68 +-
 libpil/pil/pilmemory.c             |     2 +-
 libpil/pil/pilmessages.c           |     8 +-
 libpil/pil/pilpaf.c                |    72 +-
 libpil/pil/pilrecipe.c             |    36 +-
 libpil/pil/pilstrutils.c           |     2 +-
 libpil/pil/piltimer.c              |     2 +-
 libpil/pil/pilutils.c              |    10 +-
 libpil/tests/Makefile.in           |   697 +-
 m4macros/libtool.m4                |  2256 ++++--
 m4macros/ltoptions.m4              |    32 +-
 m4macros/ltversion.m4              |    12 +-
 m4macros/lt~obsolete.m4            |    12 +-
 recipes/Makefile.in                |   585 +-
 recipes/vimos_calib.c              |     3 +
 reflex/Makefile.in                 |   144 +-
 reflex/vimos_ifu.xml               |   314 +-
 reflex/vimos_ifu.xml.in            |   308 +-
 reflex/vimos_mos.xml.in            |   132 +-
 regtests/Makefile.in               |   293 +-
 regtests/tests/Makefile.am         |    10 +-
 regtests/tests/Makefile.in         |   129 +-
 setup                              |     2 +-
 tests/Makefile.in                  |   570 +-
 vimos/Makefile.in                  |   327 +-
 93 files changed, 46288 insertions(+), 39839 deletions(-)

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