[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 c3b5405e0ded8b68d5cdb73c6c64f9f995d04dfd
Merge: 9f43a21 7a6b7ce
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Nov 28 12:21:25 2014 +0100

    Merge branch 'upstream' into debian

 Makefile.in                 |   15 +-
 NEWS                        |   45 +
 aclocal.m4                  |  154 +-
 admin/config.guess          |  161 +-
 admin/config.sub            |   47 +-
 admin/ltmain.sh             | 5489 +++++++++++++++++++++++++++----------------
 admin/missing               |    4 +-
 admin/test-driver           |   20 +-
 config.h.in                 |    6 +-
 configure                   | 1888 ++++++++-------
 configure.ac                |    6 +-
 giraffe/Makefile.in         |    6 +-
 giraffe/gialias.h           |    1 +
 giraffe/giextract.c         |    4 +-
 giraffe/gifiberutils.c      |    1 +
 giraffe/gifov.c             |   31 +-
 giraffe/giframe.c           |    2 +-
 giraffe/giimage.c           |    7 +-
 giraffe/gilinedata.c        |    8 +
 giraffe/gipsfdata.c         |   12 +
 giraffe/girvcorrection.c    |  463 ++--
 giraffe/gitable.c           |   85 +-
 giraffe/giutils.c           |   62 +-
 m4/libtool.m4               | 2053 ++++++++--------
 m4/ltoptions.m4             |   72 +-
 m4/ltsugar.m4               |    7 +-
 m4/ltversion.m4             |   12 +-
 m4/lt~obsolete.m4           |    7 +-
 recipes/Makefile.am         |   14 +-
 recipes/Makefile.in         |   20 +-
 recipes/giscience.c         |    1 +
 recipes/gistandard.c        |    5 +-
 recipes/giwavecalibration.c |    4 +-
 regtests/Makefile.in        |    2 +-
 regtests/tests/Makefile.in  |    2 +-
 tests/Makefile.in           |    2 +-
 36 files changed, 6215 insertions(+), 4503 deletions(-)

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