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

commit 694360b0024b059dfeaa77259c7084c28bbe1191
Merge: 53dd2b3 0f5093e
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Apr 11 10:22:01 2014 +0200

    Merge branch 'upstream' into debian

 Makefile.am                       |    2 +-
 Makefile.in                       |   73 +-
 README                            |   10 +-
 acinclude.m4                      |  101 +-
 aclocal.m4                        |  208 ++--
 admin/compile                     |    2 +-
 admin/config.guess                |   26 +-
 admin/config.sub                  |   35 +-
 admin/depcomp                     |    5 +-
 admin/missing                     |    2 +-
 admin/test-driver                 |    2 +-
 calib/dic/ESO-DFS-DIC.GIRAFFE_QC  |    6 +-
 calib/dic/ESO-VLT-DIC.GIRAFFE_CFG |   56 +
 calib/dic/ESO-VLT-DIC.GIRAFFE_DRS |   89 ++
 calib/dic/ESO-VLT-DIC.GIRAFFE_ICS | 2053 +++++++++++++++++++++++++++++++++++++
 calib/dic/ESO-VLT-DIC.GIRAFFE_OS  |  254 +++++
 calib/gasgano/config/GIRAF.prefs  |    2 +-
 calib/gasgano/config/giraf.oca    |    5 +
 configure                         |  192 +++-
 configure.ac                      |    7 +-
 giraffe/Makefile.in               |   61 +-
 giraffe/gifov.c                   |    6 +-
 giraffe/gitable.c                 |  109 +-
 giraffe/giutils.c                 |   38 +-
 m4/cpl.m4                         |  710 ++++++++++---
 m4/eso.m4                         |  356 ++++---
 m4/libtool.m4                     |   18 +-
 recipes/Makefile.am               |   15 +-
 recipes/Makefile.in               |   82 +-
 recipes/giframestack.c            |   34 +-
 regtests/Makefile.in              |   73 +-
 regtests/tests/Makefile.am        |   28 +-
 regtests/tests/Makefile.in        |   88 +-
 setup                             |    4 +-
 tests/Makefile.am                 |    2 +-
 tests/Makefile.in                 |   64 +-
 36 files changed, 4138 insertions(+), 680 deletions(-)

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