[Debian-astro-commits] [cpl-plugin-template] 08/81: 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-template.

commit 0ff48f10eac90677c3700ad8b169047f84ae52de
Merge: af42364 7c1c53b
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon May 6 17:45:47 2013 +0200

    Merge branch 'upstream' into debian

 AUTHORS                                    |     2 +-
 aclocal.m4                                 |    12 -
 amber/amdlibRawData.c                      |     4 +-
 amber/amdlibSpectralCalibration.c          |     4 +-
 amber/gipaf.c                              |     2 +-
 amber/gipaf.h                              |     2 +-
 amber/giqclog.c                            |     2 +-
 amber/giqclog.h                            |     2 +-
 calib/cal/BadPixelMap.fits                 |     1 -
 calib/cal/FlatFieldMap.fits                |  1506 -
 calib/cal/calibrator_database_amber_H.fits | 74157 --------------------------
 calib/cal/calibrator_database_amber_J.fits | 74206 --------------------------
 calib/cal/calibrator_database_amber_K.fits | 74227 ---------------------------
 calib/gasgano/config/AMBER.prefs           |     2 +-
 config.h.in                                |     6 +
 configure                                  |   645 +-
 configure.ac                               |     8 +-
 m4macros/cpl.m4                            |   104 +-
 m4macros/eso.m4                            |    40 +
 recipes/Makefile.am                        |    10 +-
 recipes/Makefile.in                        |    25 +-
 recipes/amber_BeamPos.c                    |     2 +-
 recipes/amber_ascii_export.c               |     2 +-
 recipes/amber_detector.c                   |     2 +-
 recipes/amber_p2vm.c                       |     2 +-
 recipes/amber_raw_to_fitsimage.c           |     2 +-
 recipes/amber_selector.c                   |     2 +-
 recipes/amber_spectral_calibration.c       |   407 +
 recipes/amber_trf.c                        |     2 +-
 regtests/Makefile.am                       |     2 +-
 regtests/tests/Makefile.am                 |     2 +-
 setup                                      |     2 +-
 32 files changed, 956 insertions(+), 224438 deletions(-)

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