[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 390504fef671f82c76d035e2a1eea9f213c37366
Merge: b636a18 55db1fb
Author: Ole Streicher <olebole at debian.org>
Date:   Sat Apr 18 17:26:32 2015 +0200

    Merge branch 'upstream' into debian

 Makefile.am                      |     2 +-
 Makefile.in                      |   422 +-
 aclocal.m4                       |   725 ++-
 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 +
 calib/gasgano/config/HAWKI.prefs |     2 +-
 config.h.in                      |     3 +
 configure                        | 11703 +++++++++++++++++--------------------
 configure.ac                     |     4 +-
 hawki/Makefile.in                |   437 +-
 hawki/tests/Makefile.in          |   698 ++-
 irplib/Makefile.in               |   362 +-
 irplib/tests/Makefile.in         |   848 ++-
 m4macros/eso.m4                  |    11 +
 m4macros/gsl.m4                  |     2 +-
 m4macros/libtool.m4              |  2256 ++++---
 m4macros/ltoptions.m4            |    32 +-
 m4macros/ltversion.m4            |    12 +-
 m4macros/lt~obsolete.m4          |    12 +-
 recipes/Makefile.in              |   500 +-
 recipes/hawki_cal_distortion.c   |     4 +-
 recipes/hawki_cal_flat.c         |     6 +-
 recipes/hawki_cal_zpoint.c       |     2 +-
 recipes/hawki_step_basic_calib.c |     4 +-
 recipes/hawki_step_combine.c     |     2 +-
 recipes/hawki_step_detect_obj.c  |    60 +-
 recipes/hawki_util_gendist.c     |     1 +
 reflex/Makefile.am               |    33 -
 reflex/Makefile.in               |   509 --
 reflex/hawki_wkf.oca             |   282 -
 regtests/Makefile.in             |   293 +-
 regtests/tests/Makefile.am       |    10 +-
 regtests/tests/Makefile.in       |   129 +-
 tests/Makefile.in                |   570 +-
 40 files changed, 14203 insertions(+), 11994 deletions(-)

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