[Debian-astro-commits] [cpl-plugin-hawki] 01/02: 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-hawki.

commit 7e5adb5e5a32aedcd5ee8057121fadf426a18f6c
Merge: 7519d67 0bc3334
Author: Ole Streicher <ole at aip.de>
Date:   Wed Apr 20 14:22:56 2016 +0200

    Merge branch 'upstream' into debian

 AUTHORS                             |    2 +-
 Makefile.in                         |   66 +-
 aclocal.m4                          |  207 +-
 admin/compile                       |    2 +-
 admin/config.guess                  |   15 +-
 admin/config.sub                    |   19 +-
 admin/depcomp                       |    2 +-
 admin/install-sh                    |  366 ++-
 admin/ltmain.sh                     | 5528 ++++++++++++++++++++++-------------
 admin/missing                       |    6 +-
 admin/test-driver                   |   35 +-
 calib/gasgano/config/HAWKI.prefs    |    2 +-
 calib/gasgano/config/HAWKI.prefs.in |   53 -
 config.h.in                         |    6 +-
 configure                           | 3569 ++++++++++++----------
 configure.ac                        |    9 +-
 hawki/Makefile.in                   |   30 +-
 hawki/hawki_utils.c                 |    6 +-
 hawki/hawki_utils.h                 |    2 +-
 hawki/tests/Makefile.in             |   31 +-
 irplib/Makefile.in                  |   30 +-
 irplib/tests/Makefile.in            |   33 +-
 m4macros/gsl.m4                     |   93 +
 m4macros/libtool.m4                 | 2550 +++++++++-------
 m4macros/ltoptions.m4               |  127 +-
 m4macros/ltsugar.m4                 |    7 +-
 m4macros/ltversion.m4               |   12 +-
 m4macros/lt~obsolete.m4             |    7 +-
 recipes/Makefile.in                 |   29 +-
 recipes/hawki_cal_zpoint.c          |    2 +-
 reflex/Hawki_Calib_Science.xml.in   | 3960 -------------------------
 regtests/Makefile.in                |   23 +-
 regtests/tests/Makefile.in          |   23 +-
 tests/Makefile.in                   |   27 +-
 34 files changed, 7817 insertions(+), 9062 deletions(-)

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