[cpl-plugin-amber] 02/03: Merge branch 'upstream' 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-amber.

commit fbf5c4cd62521a1a08d90b1da57cb934856ca773
Merge: 750b95f 17ae83e
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Apr 21 16:34:26 2015 +0200

    Merge branch 'upstream' into debian

 ChangeLog                        |   41 +
 Makefile.in                      |  413 +-
 aclocal.m4                       |  624 +--
 admin/compile                    |  232 +-
 admin/config.guess               |  559 +--
 admin/config.sub                 |  299 +-
 admin/depcomp                    |  531 ++-
 admin/install-sh                 |   35 +-
 admin/ltmain.sh                  | 4017 ++++++++++------
 admin/missing                    |  461 +-
 admin/test-driver                |  127 +
 amber/Makefile.in                |  282 +-
 amber/amber_dfs.c                |   11 +-
 amber/esolibCalibVis.c           |   10 +-
 amber/esolibSelector.c           |   21 +-
 amber/esolibSelector.h           |    2 +-
 amber/esolibTransferfunction.c   |   23 +-
 calib/gasgano/config/AMBER.prefs |    2 +-
 config.h.in                      |    8 +
 configure                        | 9776 +++++++++++++++++---------------------
 configure.ac                     |    2 +-
 m4macros/libtool.m4              | 2256 +++++----
 m4macros/ltoptions.m4            |   32 +-
 m4macros/ltversion.m4            |   12 +-
 m4macros/lt~obsolete.m4          |   12 +-
 recipes/Makefile.in              |  375 +-
 recipes/amber_BeamPos.c          |   48 +-
 recipes/amber_SciCal.c           |   25 +-
 recipes/amber_ascii_export.c     |   10 +-
 recipes/amber_calibrate.c        |    2 +-
 recipes/amber_detector.c         |    9 +-
 recipes/amber_oimerge.c          |   51 +-
 recipes/amber_p2vm.c             |   20 +-
 recipes/amber_raw_to_fitsimage.c |    2 +-
 recipes/amber_selector.c         |   31 +-
 recipes/amber_trf.c              |    2 +-
 regtests/Makefile.in             |  292 +-
 regtests/tests/Makefile.am       |   10 +-
 regtests/tests/Makefile.in       |  128 +-
 scripts/Makefile.in              |  137 +-
 tests/Makefile.in                |  569 ++-
 41 files changed, 11864 insertions(+), 9635 deletions(-)

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