[tango] 03/07: Merge tag 'upstream/9.2.1+dfsg'

[Frédéric-Emmanuel Picca]

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

picca pushed a commit to branch master
in repository tango.

commit c487354de7b36903ecc9f201aabeb72ff94d726d
Merge: b60078b 1dff876
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Fri Mar 11 18:27:58 2016 +0100

    Merge tag 'upstream/9.2.1+dfsg'
    
    Upstream version 9.2.1+dfsg

 README                                | 16 +++++++++-------
 TANGO_CHANGES                         |  7 +++++--
 configure                             | 22 +++++++++++-----------
 configure.ac                          |  4 ++--
 cppserver/database/DataBase.cpp       |  8 ++++----
 cppserver/database/stored_proc.sql.in | 24 ++++++++++++------------
 lib/cpp/client/Database.h             |  3 +++
 lib/cpp/client/dbapi_base.cpp         | 11 +++++++++--
 lib/cpp/client/devapi_base.cpp        | 11 +++--------
 lib/cpp/client/event.cpp              | 20 ++++++++++----------
 lib/cpp/client/eventconsumer.h        |  2 +-
 lib/cpp/client/zmqeventconsumer.cpp   | 31 ++++++++++++++-----------------
 lib/cpp/server/device_3.cpp           |  9 ++++-----
 lib/cpp/server/deviceclass.cpp        | 11 +++++++----
 lib/cpp/server/tango_const.h          |  4 ++--
 lib/cpp/server/zmqeventsupplier.cpp   | 16 ++++++++--------
 lib/java/Makefile.am                  |  2 +-
 lib/java/Makefile.in                  |  2 +-
 pogo/preferences/common_target.opt    | 35 +++++++++++++++++++++++------------
 pogo/preferences/tango.opt.in         | 12 +++++++-----
 pogo/templates/cpp/Makefile           |  2 +-
 21 files changed, 137 insertions(+), 115 deletions(-)

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