[Debian-astro-commits] [cpl-plugin-template] 61/76: 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 daf9435d050a93ebc9a06d54dd87ed1a2e217e0f
Merge: 706af4f 66e19a6
Author: Ole Streicher <olebole at debian.org>
Date:   Sat Apr 18 17:50:35 2015 +0200

    Merge branch 'upstream' into debian

 Makefile.am                             |    2 +-
 Makefile.in                             |    9 +-
 NEWS                                    |    8 +
 acinclude.m4                            |   26 +-
 calib/gasgano/config/GIRAF.prefs        |    2 +-
 config.h.in                             |   20 +
 configure                               | 1164 +++++++++++-
 configure.ac                            |    6 +-
 giraffe/Makefile.in                     |    7 +
 giraffe/gialias.h                       |   73 +
 giraffe/gibias.c                        |    5 +-
 giraffe/giextract.c                     |   18 +-
 giraffe/gifov.c                         |   10 +-
 giraffe/gifxcalibration.c               |    8 +-
 giraffe/gilinedata.c                    |    2 +-
 giraffe/gilocalize.c                    |   22 +-
 giraffe/gimath.c                        |    5 +-
 giraffe/gimath_lm.c                     |    9 +
 giraffe/gimatrix.c                      |   16 +-
 giraffe/gimodels.c                      |   12 +-
 giraffe/gipsf.c                         |   17 +-
 giraffe/gipsfdata.c                     |   13 +-
 giraffe/girebinning.c                   |   62 +-
 giraffe/gisgcalibration.c               |    6 +-
 giraffe/gislitgeometry.c                |   18 +-
 giraffe/gistacking.c                    |   10 +-
 giraffe/giutils.c                       |  106 +-
 giraffe/giutils.h                       |    2 +
 giraffe/giwlcalibration.c               |    9 +-
 giraffe/giwlresiduals.c                 |    4 +-
 irplib/Makefile.am                      |   89 +
 {giraffe => irplib}/Makefile.in         |  491 +++--
 irplib/irplib_calib.c                   |  661 +++++++
 irplib/irplib_calib.h                   |   49 +
 irplib/irplib_cat.c                     |  467 +++++
 irplib/irplib_cat.h                     |   57 +
 irplib/irplib_distortion.c              | 1384 ++++++++++++++
 irplib/irplib_distortion.h              |   44 +
 irplib/irplib_flat.c                    |  402 ++++
 irplib/irplib_flat.h                    |   40 +
 irplib/irplib_framelist.c               | 1282 +++++++++++++
 irplib/irplib_framelist.h               |  107 ++
 irplib/irplib_hist.c                    |  350 ++++
 irplib/irplib_hist.h                    |   93 +
 irplib/irplib_ksigma_clip.c             |  258 +++
 irplib/irplib_ksigma_clip.h             |   52 +
 irplib/irplib_ksigma_clip_body.h        |  107 ++
 irplib/irplib_match_cats.c              |  211 +++
 irplib/irplib_match_cats.h              |   46 +
 irplib/irplib_mkmaster.c                |  563 ++++++
 irplib/irplib_mkmaster.h                |   53 +
 irplib/irplib_oddeven.c                 |  338 ++++
 irplib/irplib_oddeven.h                 |   40 +
 irplib/irplib_plugin.c                  | 1296 +++++++++++++
 irplib/irplib_plugin.h                  |   93 +
 irplib/irplib_polynomial.c              | 1319 +++++++++++++
 irplib/irplib_polynomial.h              |   44 +
 irplib/irplib_ppm.c                     |  480 +++++
 irplib/irplib_ppm.h                     |   40 +
 irplib/irplib_sdp_spectrum.c            | 3080 +++++++++++++++++++++++++++++++
 irplib/irplib_sdp_spectrum.h            |  770 ++++++++
 irplib/irplib_slitpos.c                 |  554 ++++++
 irplib/irplib_slitpos.h                 |   39 +
 irplib/irplib_spectrum.c                |  593 ++++++
 irplib/irplib_spectrum.h                |   59 +
 irplib/irplib_stdstar.c                 |  835 +++++++++
 irplib/irplib_stdstar.h                 |   80 +
 irplib/irplib_strehl.c                  | 1069 +++++++++++
 irplib/irplib_strehl.h                  |  126 ++
 irplib/irplib_utils.c                   | 1727 +++++++++++++++++
 irplib/irplib_utils.h                   |  560 ++++++
 irplib/irplib_wavecal.c                 | 1738 +++++++++++++++++
 irplib/irplib_wavecal.h                 |  178 ++
 irplib/irplib_wavecal_impl.h            |   56 +
 irplib/irplib_wcs.c                     |  391 ++++
 irplib/irplib_wcs.h                     |   66 +
 irplib/irplib_wlxcorr.c                 | 1269 +++++++++++++
 irplib/irplib_wlxcorr.h                 |   73 +
 irplib/tests/Makefile.am                |  105 ++
 {tests => irplib/tests}/Makefile.in     |  537 +++++-
 irplib/tests/irplib_cat-test.c          |   98 +
 irplib/tests/irplib_framelist-test.c    |  117 ++
 irplib/tests/irplib_hist-test.c         |  151 ++
 irplib/tests/irplib_plugin-test.c       |  202 ++
 irplib/tests/irplib_polynomial-test.c   |  589 ++++++
 irplib/tests/irplib_sdp_spectrum-test.c | 1798 ++++++++++++++++++
 irplib/tests/irplib_strehl-test.c       |  841 +++++++++
 irplib/tests/irplib_utils-test.c        |  481 +++++
 irplib/tests/irplib_wcs-test.c          |  307 +++
 irplib/tests/irplib_wlxcorr-test.c      |  466 +++++
 m4/cpl.m4                               |   14 +-
 recipes/Makefile.am                     |    6 +-
 recipes/Makefile.in                     |   25 +-
 recipes/gimasterbias.c                  |   60 +-
 recipes/giscience.c                     | 1258 ++++++++++++-
 regtests/Makefile.in                    |    7 +
 regtests/tests/Makefile.in              |    7 +
 tests/Makefile.am                       |   12 +-
 tests/Makefile.in                       |  220 ++-
 tests/giraffe_sdp-test.c                |  339 ++++
 100 files changed, 32463 insertions(+), 567 deletions(-)

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