[cpl-plugin-amber] 08/09: 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-amber.

commit ba38ab53f92cd5fcd435bc0204fd9ec8949cbe3b
Merge: e9c8d2a a7d3fca
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Apr 11 12:11:55 2014 +0200

    Merge branch 'upstream' into debian

 ChangeLog                        | 175 ++++++++++++++++++++++++++++++++++
 Makefile.in                      |  17 ++--
 Makefile.purify.in               |   2 +-
 aclocal.m4                       |   6 +-
 admin/compile                    |   6 +-
 admin/config.guess               | 196 ++++++++++++++-------------------------
 admin/config.sub                 |  43 ++++++---
 amber/Makefile.am                |   4 +-
 amber/Makefile.in                |  26 +++---
 amber/amberSupport.c             |  12 ---
 amber/esolibSelector.c           |  72 +++++++-------
 amber/esolibamdlibOi.c           |   2 +-
 amber/gipaf.c                    |   6 +-
 amber/gipaf.h                    |   6 +-
 amber/giqclog.c                  |   6 +-
 amber/giqclog.h                  |   6 +-
 calib/dic/ESO-DFS-DIC.AMBER_QC   |   4 +-
 calib/dic/ESO-VLT-DIC.AMBER_CFG  |   4 +-
 calib/dic/ESO-VLT-DIC.AMBER_DCS  |   2 +-
 calib/dic/ESO-VLT-DIC.AMBER_ICS  |   4 +-
 calib/dic/ESO-VLT-DIC.AMBER_OS   |   4 +-
 calib/gasgano/config/AMBER.prefs |   2 +-
 calib/gasgano/config/amber.oca   |  17 ----
 configure                        |  20 ++--
 configure.ac                     |   2 +-
 recipes/Makefile.am              |  53 +++++------
 recipes/Makefile.in              |  53 +++++------
 recipes/amber_BeamPos.c          |  57 +++++-------
 recipes/amber_SciCal.c           | 130 +++++++++++++-------------
 recipes/amber_ascii_export.c     |  44 ++++-----
 recipes/amber_detector.c         | 102 ++++++++++----------
 recipes/amber_p2vm.c             | 114 +++++++++++------------
 recipes/amber_raw_to_fitsimage.c | 187 ++++++++++---------------------------
 recipes/amber_selector.c         |   6 +-
 recipes/amber_trf.c              |   4 +-
 regtests/Makefile.am             |   2 +-
 regtests/Makefile.in             |   6 +-
 regtests/tests/Makefile.am       |  20 +++-
 regtests/tests/Makefile.in       |  20 +++-
 scripts/Makefile.in              |   2 +-
 setup                            |   4 +-
 tests/Makefile.am                |   4 +-
 tests/Makefile.in                |   6 +-
 43 files changed, 750 insertions(+), 708 deletions(-)

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