[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 d4776db3a3ab3fa4e87506041d4ac6f600c23195
Merge: d89856e 2eb84de
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Nov 4 13:45:15 2015 +0100

    Merge branch 'upstream' into debian

 Makefile.in                      |   423 +-
 aclocal.m4                       |   768 ++-
 admin/compile                    |   232 +-
 admin/config.guess               |   415 +-
 admin/config.sub                 |   288 +-
 admin/depcomp                    |   531 +-
 admin/install-sh                 |    35 +-
 admin/ltmain.sh                  |  8118 ++++++++++------------------
 admin/missing                    |   461 +-
 admin/test-driver                |   139 -
 calib/gasgano/config/GIRAF.prefs |     2 +-
 config.h.in                      |    14 +-
 configure                        | 10763 ++++++++++++++++++++-----------------
 configure.ac                     |     4 +-
 giraffe/Makefile.in              |   282 +-
 giraffe/gialias.h                |     1 +
 irplib/Makefile.in               |   361 +-
 irplib/irplib_utils.c            |     5 +-
 irplib/tests/Makefile.in         |   866 +--
 m4/libtool.m4                    |  3699 ++++++-------
 m4/ltoptions.m4                  |    92 +-
 m4/ltsugar.m4                    |     7 +-
 m4/ltversion.m4                  |    14 +-
 m4/lt~obsolete.m4                |    17 +-
 recipes/Makefile.in              |   344 +-
 recipes/giscience.c              |    44 +-
 regtests/Makefile.in             |   292 +-
 regtests/tests/Makefile.in       |   118 +-
 tests/Makefile.in                |   697 +--
 tests/giraffe_sdp-test.c         |    45 +-
 30 files changed, 12453 insertions(+), 16624 deletions(-)

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