[udunits] 02/07: Merge tag 'upstream/2.2.25' into debian/master

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository udunits.

commit 5823a619448264f896f6f67779b253d5e0b2b508
Merge: 7139926 0868f43
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Jul 18 09:27:53 2017 +0100

    Merge tag 'upstream/2.2.25' into debian/master

 CHANGE_LOG              |  68 +++-
 CMakeLists.txt          |   2 +-
 configure               |  20 +-
 configure.ac            |   2 +-
 lib/Makefile.am         |  53 +--
 lib/Makefile.in         |  30 +-
 lib/c99_snprintf.c      |  34 ++
 lib/parser.c            | 858 +++++++++++++++++++++---------------------------
 lib/scanner.c           |  30 +-
 lib/scanner.l           |   2 +-
 lib/systemMap.c         |   2 +-
 lib/testUnits-1.c       |  14 +
 lib/testUnits.c         |  26 +-
 lib/tsearch.c           | 113 +++++++
 lib/tsearch.h           |  14 +
 lib/udunits-1.c         |  59 +++-
 lib/udunits2-common.xml |  14 +
 lib/unitcore.c          | 108 ++----
 lib/xml.c               |  37 ++-
 prog/Makefile.am        |   3 +-
 prog/Makefile.in        |   3 +-
 prog/XGetopt.c          | 214 ++++++++++++
 prog/XGetopt.h          |  40 +++
 stamp-vti               |   8 +-
 udunits2.html           |  10 +-
 udunits2.info           |   4 +-
 version.texi            |   8 +-
 27 files changed, 1084 insertions(+), 692 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/udunits.git