[Debian-astro-commits] [cpl-plugin-giraf] 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-giraf.

commit 6e5cddf17af04fca9b97650357c5f97b2dee7fbe
Merge: 60f9449 053f7d4
Author: Ole Streicher <ole at aip.de>
Date:   Wed Apr 20 13:40:26 2016 +0200

    Merge branch 'upstream' into debian

 Makefile.in                      |   440 +-
 aclocal.m4                       |   783 ++-
 admin/compile                    |   232 +-
 admin/config.guess               |   564 +-
 admin/config.sub                 |   306 +-
 admin/depcomp                    |   531 +-
 admin/install-sh                 |   385 +-
 admin/ltmain.sh                  |  8139 +++++++++++++++++---------
 admin/missing                    |   461 +-
 admin/test-driver                |   148 +
 calib/gasgano/config/GIRAF.prefs |     2 +-
 config.h.in                      |    14 +-
 configure                        | 11273 +++++++++++++++++--------------------
 configure.ac                     |     4 +-
 giraffe/Makefile.in              |   296 +-
 giraffe/giutils.c                |   203 +
 giraffe/giutils.h                |     2 +
 irplib/Makefile.in               |   375 +-
 irplib/irplib_slitpos.c          |     3 +
 irplib/tests/Makefile.in         |   881 ++-
 m4/libtool.m4                    |  4187 ++++++++------
 m4/ltoptions.m4                  |   147 +-
 m4/ltsugar.m4                    |     7 +-
 m4/ltversion.m4                  |    14 +-
 m4/lt~obsolete.m4                |    17 +-
 recipes/Makefile.in              |   358 +-
 recipes/giframestack.c           |     2 +-
 recipes/gimasterbias.c           |     2 +-
 recipes/gimasterdark.c           |     2 +-
 recipes/gimasterflat.c           |     2 +-
 recipes/giscience.c              |    11 +-
 recipes/gistandard.c             |     9 +-
 recipes/giwavecalibration.c      |    22 +-
 regtests/Makefile.in             |   307 +-
 regtests/tests/Makefile.in       |   133 +-
 tests/Makefile.in                |   712 ++-
 36 files changed, 18130 insertions(+), 12844 deletions(-)

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