[tango] 02/21: Merge branch 'upstream'
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Fri Jan 15 15:59:39 UTC 2016
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository tango.
commit 796b11dd7306f720f7d97e2aeab63de31eae187e
Merge: 6da060d 0a368ef
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Thu Jul 2 09:44:48 2015 +0200
Merge branch 'upstream'
Makefile.in | 364 +-
README | 106 +-
TANGO_CHANGES | 111 +
ac_config.h.tmp.in | 2 +-
aclocal.m4 | 707 +-
config/compile | 347 +
config/ltmain.sh | 4 +-
configure | 1005 +-
configure.in => configure.ac | 53 +-
.../AbstractClass/AccessControl/AccessControl.cpp | 103 +-
.../AbstractClass/AccessControl/AccessControl.h | 228 +-
.../AbstractClass/AccessControl/AccessControl.xmi | 41 +-
.../AccessControl/AccessControlClass.cpp | 163 +-
.../AccessControl/AccessControlClass.h | 99 +-
.../AccessControl/AccessControlStateMachine.cpp | 188 +-
cppserver/AbstractClass/AccessControl/Makefile.am | 3 +-
cppserver/AbstractClass/AccessControl/Makefile.in | 265 +-
cppserver/AbstractClass/Makefile.in | 263 +-
cppserver/Makefile.in | 280 +-
cppserver/database/DataBase.cpp | 1590 +-
cppserver/database/DataBase.h | 296 +-
cppserver/database/DataBaseClass.cpp | 598 +-
cppserver/database/DataBaseClass.h | 304 +-
cppserver/database/DataBaseStateMachine.cpp | 202 +-
cppserver/database/DataBaseUtils.cpp | 173 +-
cppserver/database/Makefile.am | 2 +-
cppserver/database/Makefile.in | 282 +-
cppserver/database/create_db.sql.in | 57 +-
cppserver/database/create_db_tables.sql.in | 88 +-
cppserver/database/main.cpp | 38 +-
cppserver/database/stored_proc.sql.in | 373 +-
cppserver/database/update_db.sql.in | 114 +-
cppserver/database/update_db7.sql.in | 10 +
cppserver/starter/CheckProcessUtil.cpp | 6 +-
cppserver/starter/CheckProcessUtil.h | 8 +-
cppserver/starter/ClassFactory.cpp | 8 +-
cppserver/starter/Makefile.am | 2 +-
cppserver/starter/Makefile.in | 267 +-
cppserver/starter/PingThread.cpp | 16 +-
cppserver/starter/PingThread.h | 8 +-
cppserver/starter/StartProcessThread.cpp | 396 +-
cppserver/starter/Starter.cpp | 169 +-
cppserver/starter/Starter.h | 78 +-
cppserver/starter/StarterClass.cpp | 26 +-
cppserver/starter/StarterClass.h | 6 +-
cppserver/starter/StarterStateMachine.cpp | 10 +-
cppserver/starter/StarterUtil.cpp | 127 +-
cppserver/starter/StarterUtil.h | 43 +-
cppserver/starter/main.cpp | 10 +-
cppserver/tangoaccesscontrol/ClassFactory.cpp | 45 +-
cppserver/tangoaccesscontrol/DbUtils.cpp | 21 +-
cppserver/tangoaccesscontrol/Makefile.am | 2 +-
cppserver/tangoaccesscontrol/Makefile.in | 376 +-
.../tangoaccesscontrol/TangoAccessControl.cpp | 27 +-
cppserver/tangoaccesscontrol/TangoAccessControl.h | 19 +-
.../tangoaccesscontrol/TangoAccessControlClass.cpp | 25 +-
.../tangoaccesscontrol/TangoAccessControlClass.h | 19 +-
.../TangoAccessControlStateMachine.cpp | 21 +-
cppserver/tangoaccesscontrol/main.cpp | 15 +-
cppserver/tangotest/Makefile.am | 2 +-
cppserver/tangotest/Makefile.in | 253 +-
cppserver/tangotest/TangoTest.cpp | 615 +-
cppserver/tangotest/TangoTest.h | 492 +-
cppserver/tangotest/TangoTestClass.cpp | 50 +-
cppserver/tangotest/TangoTestClass.h | 30 +-
cppserver/tangotest/TangoTestStateMachine.cpp | 24 +-
doc/Makefile.in | 261 +-
doc/man/Makefile.in | 138 +-
doc/src/Makefile.in | 107 +-
doc/src/advanced/advanced.lyx | 1368 +-
doc/src/advanced/line.lyx | 2 +-
doc/src/appendix/appendix.lyx | 1431 +-
doc/src/appendix/idl.lyx | 4258 +++-
doc/src/appendix/naming.lyx | 2 +-
doc/src/appendix/notifd2db.lyx | 2 +-
doc/src/appendix/prop_file.lyx | 2 +-
doc/src/appendix/starting_tango.lyx | 2 +-
doc/src/atk/programmersguid.lyx | 2 +-
doc/src/cpp_api/cppapi.lyx | 2 +-
doc/src/ds_model/ds_model.lyx | 160 +-
doc/src/ds_writing/ds_writing.lyx | 19648 +++++++------------
doc/src/ds_writing/r_pipe.eps | 296 +
doc/src/ds_writing/r_pipe.fig | 87 +
doc/src/ds_writing/w_pipe.eps | 296 +
doc/src/ds_writing/w_pipe.fig | 87 +
doc/src/gen_api/genapi.lyx | 5121 ++---
doc/src/gen_api/pipe.eps | 237 +
doc/src/gen_api/pipe.fig | 65 +
doc/src/intro/intro.lyx | 68 +-
doc/src/java_api/TangoApi.lyx | 2 +-
doc/src/started/started.lyx | 1211 +-
doc/src/tango.lyx | 50 +-
doc/tango.pdf | Bin 3085640 -> 2124820 bytes
lib/Makefile.in | 280 +-
lib/cpp/Makefile.in | 287 +-
lib/cpp/client/ApiUtil.h | 265 +
lib/cpp/client/AttributeProxy.h | 701 +
lib/cpp/client/Connection.h | 574 +
lib/cpp/client/Database.h | 1910 ++
lib/cpp/client/DbDevice.h | 237 +
lib/cpp/client/DeviceAttribute.h | 1323 ++
lib/cpp/client/DeviceData.h | 642 +
lib/cpp/client/DevicePipe.h | 1611 ++
lib/cpp/client/DeviceProxy.h | 1935 ++
lib/cpp/client/Makefile.am | 23 +-
lib/cpp/client/Makefile.in | 366 +-
lib/cpp/client/accessproxy.cpp | 6 +-
lib/cpp/client/accessproxy.h | 2 +-
lib/cpp/client/api_util.cpp | 1098 +-
lib/cpp/client/api_util.tpp | 327 +
lib/cpp/client/apiexcept.cpp | 6 +-
lib/cpp/client/apiexcept.h | 91 +-
lib/cpp/client/asynreq.cpp | 4 +-
lib/cpp/client/attr_proxy.cpp | 21 +-
lib/cpp/client/cbthread.cpp | 9 +-
lib/cpp/client/cbthread.h | 4 +-
lib/cpp/client/dbapi.h | 1190 +-
lib/cpp/client/dbapi_attribute.cpp | 4 +-
lib/cpp/client/dbapi_base.cpp | 861 +-
lib/cpp/client/dbapi_cache.cpp | 702 +-
lib/cpp/client/dbapi_class.cpp | 178 +-
lib/cpp/client/dbapi_datum.cpp | 12 +-
lib/cpp/client/dbapi_device.cpp | 270 +-
lib/cpp/client/dbapi_history.cpp | 4 +-
lib/cpp/client/dbapi_server.cpp | 8 +-
lib/cpp/client/dbapi_serverdata.cpp | 176 +-
lib/cpp/client/devapi.h | 1903 +-
lib/cpp/client/devapi_attr.cpp | 1294 +-
lib/cpp/client/devapi_attr.tpp | 437 +
lib/cpp/client/devapi_base.cpp | 2730 ++-
lib/cpp/client/devapi_data.cpp | 442 +-
lib/cpp/client/devapi_datahist.cpp | 86 +-
lib/cpp/client/devapi_pipe.cpp | 2371 +++
lib/cpp/client/devapi_pipe.tpp | 208 +
lib/cpp/client/devapi_utils.cpp | 455 +-
lib/cpp/client/devapi_utils.tpp | 405 +
lib/cpp/client/devasyn.h | 179 +-
lib/cpp/client/event.cpp | 2069 +-
lib/cpp/client/event.h | 372 +-
lib/cpp/client/event.tpp | 77 +
lib/cpp/client/eventconsumer.h | 253 +-
lib/cpp/client/eventkeepalive.cpp | 1870 +-
lib/cpp/client/eventqueue.cpp | 637 +-
lib/cpp/client/filedatabase.cpp | 110 +-
lib/cpp/client/filedatabase.h | 9 +-
lib/cpp/client/group.cpp | 38 +-
lib/cpp/client/group.h | 1041 +-
lib/cpp/client/helpers/DeviceProxyHelper.h | 7 +-
lib/cpp/client/helpers/Makefile.in | 172 +-
lib/cpp/client/helpers/PogoHelper.h | 4 +-
lib/cpp/client/helpers/TangoExceptionsHelper.h | 2 +-
lib/cpp/client/helpers/Xstring.h | 2 +-
lib/cpp/client/lockthread.cpp | 135 +-
lib/cpp/client/lockthread.h | 4 +-
lib/cpp/client/notifdeventconsumer.cpp | 7 +-
lib/cpp/client/proxy_asyn.cpp | 1237 +-
lib/cpp/client/proxy_asyn_cb.cpp | 119 +-
lib/cpp/client/zmq.hpp | 335 +-
lib/cpp/client/zmqeventconsumer.cpp | 1501 +-
lib/cpp/log4tango/configure | 22 +-
lib/cpp/log4tango/configure.in | 4 +-
lib/cpp/server/Makefile.am | 44 +-
lib/cpp/server/Makefile.in | 434 +-
lib/cpp/server/attrdesc.cpp | 254 +-
lib/cpp/server/attrdesc.h | 136 +-
lib/cpp/server/attrgetsetprop.cpp | 3579 ++++
lib/cpp/server/attribute.cpp | 9831 ++--------
lib/cpp/server/attribute.h | 1043 +-
lib/cpp/server/attribute.tpp | 1686 +-
lib/cpp/server/attribute_spec.tpp | 824 +
lib/cpp/server/attrmanip.cpp | 27 +-
lib/cpp/server/attrmanip.h | 4 +-
lib/cpp/server/attrprop.h | 99 +-
lib/cpp/server/attrprop.tpp | 99 +-
lib/cpp/server/attrsetval.cpp | 2308 +++
lib/cpp/server/attrsetval.tpp | 299 +
lib/cpp/server/auto_tango_monitor.h | 18 +-
lib/cpp/server/basiccommand.cpp | 132 +-
lib/cpp/server/basiccommand.h | 4 +-
lib/cpp/server/blackbox.cpp | 669 +-
lib/cpp/server/blackbox.h | 63 +-
lib/cpp/server/class_factory.cpp | 18 +-
lib/cpp/server/classattribute.cpp | 197 +-
lib/cpp/server/classattribute.h | 14 +-
lib/cpp/server/classpipe.cpp | 223 +
lib/cpp/server/classpipe.h | 95 +
lib/cpp/server/command.cpp | 271 +-
lib/cpp/server/command.h | 622 +-
lib/cpp/server/coutappender.cpp | 6 +-
lib/cpp/server/coutappender.h | 4 +-
lib/cpp/server/coutbuf.h | 4 +-
lib/cpp/server/dev_event.cpp | 439 +-
lib/cpp/server/dev_poll.cpp | 241 +-
lib/cpp/server/device.cpp | 3063 ++-
lib/cpp/server/device.h | 961 +-
lib/cpp/server/device_2.cpp | 196 +-
lib/cpp/server/device_2.h | 7 +-
lib/cpp/server/device_3.cpp | 1057 +-
lib/cpp/server/device_3.h | 26 +-
lib/cpp/server/device_3.tpp | 460 +
lib/cpp/server/device_4.cpp | 203 +-
lib/cpp/server/device_4.h | 6 +-
lib/cpp/server/device_5.cpp | 1430 ++
lib/cpp/server/{device_4.h => device_5.h} | 334 +-
lib/cpp/server/deviceclass.cpp | 472 +-
lib/cpp/server/deviceclass.h | 98 +-
lib/cpp/server/devicelog.cpp | 32 +-
lib/cpp/server/devintr.cpp | 321 +
lib/cpp/server/devintr.h | 89 +
lib/cpp/server/dintrthread.cpp | 257 +
lib/cpp/server/dintrthread.h | 106 +
lib/cpp/server/dserver.cpp | 664 +-
lib/cpp/server/dserver.h | 18 +-
lib/cpp/server/dserverclass.cpp | 8 +-
lib/cpp/server/dserverclass.h | 4 +-
lib/cpp/server/dserverlock.cpp | 8 +-
lib/cpp/server/dserverlog.cpp | 6 +-
lib/cpp/server/dserverpoll.cpp | 669 +-
lib/cpp/server/dserversignal.cpp | 276 +-
lib/cpp/server/dserversignal.h | 4 +-
lib/cpp/server/encoded_attribute.cpp | 8 +-
lib/cpp/server/encoded_attribute.h | 4 +-
lib/cpp/server/encoded_format.h | 4 +-
lib/cpp/server/eventcmds.cpp | 912 +-
lib/cpp/server/eventsupplier.cpp | 1341 +-
lib/cpp/server/eventsupplier.h | 83 +-
lib/cpp/server/except.cpp | 6 +-
lib/cpp/server/except.h | 37 +-
lib/cpp/server/fwdattrdesc.cpp | 744 +
lib/cpp/server/fwdattrdesc.h | 187 +
lib/cpp/server/fwdattribute.cpp | 1146 ++
lib/cpp/server/fwdattribute.h | 98 +
lib/cpp/server/fwdattribute.tpp | 341 +
lib/cpp/server/fwdattribute_spec.tpp | 82 +
lib/cpp/server/idl/Makefile.in | 170 +-
lib/cpp/server/idl/tango.h | 2701 ++-
lib/cpp/server/jpeg/Makefile.am | 2 +-
lib/cpp/server/jpeg/Makefile.in | 264 +-
lib/cpp/server/jpeg/jpeg_bitstream.cpp | 4 +-
lib/cpp/server/jpeg/jpeg_bitstream.h | 4 +-
lib/cpp/server/jpeg/jpeg_color.cpp | 4 +-
lib/cpp/server/jpeg/jpeg_const.h | 4 +-
lib/cpp/server/jpeg/jpeg_dct.cpp | 4 +-
lib/cpp/server/jpeg/jpeg_decoder.cpp | 4 +-
lib/cpp/server/jpeg/jpeg_encoder.cpp | 4 +-
lib/cpp/server/jpeg/jpeg_lib.h | 4 +-
lib/cpp/server/jpeg/jpeg_memory.cpp | 4 +-
lib/cpp/server/jpeg/jpeg_memory.h | 4 +-
lib/cpp/server/jpeg_mmx/Makefile.am | 2 +-
lib/cpp/server/jpeg_mmx/Makefile.in | 263 +-
lib/cpp/server/jpeg_mmx/jpeg_color_mmx.cpp | 4 +-
lib/cpp/server/jpeg_mmx/jpeg_dct_mmx.cpp | 4 +-
lib/cpp/server/log4tango.h | 2 +-
lib/cpp/server/logcmds.cpp | 6 +-
lib/cpp/server/logcmds.h | 4 +-
lib/cpp/server/logging.cpp | 6 +-
lib/cpp/server/logging.h | 4 +-
lib/cpp/server/logstream.cpp | 6 +-
lib/cpp/server/logstream.h | 2 +-
lib/cpp/server/multiattribute.cpp | 917 +-
lib/cpp/server/multiattribute.h | 35 +-
lib/cpp/server/notifdeventsupplier.cpp | 69 +-
lib/cpp/server/ntservice.h | 2 +-
lib/cpp/server/pipe.cpp | 863 +
lib/cpp/server/pipe.h | 541 +
lib/cpp/server/pipe.tpp | 77 +
lib/cpp/server/pipedesc.h | 115 +
lib/cpp/server/pollcmds.cpp | 6 +-
lib/cpp/server/pollcmds.h | 4 +-
lib/cpp/server/pollext.h | 243 +-
lib/cpp/server/pollext.tpp | 679 +
lib/cpp/server/pollobj.cpp | 222 +-
lib/cpp/server/pollobj.h | 16 +-
lib/cpp/server/pollring.cpp | 831 +-
lib/cpp/server/pollring.h | 53 +-
lib/cpp/server/pollring.tpp | 877 +
lib/cpp/server/pollthread.cpp | 1348 +-
lib/cpp/server/pollthread.h | 20 +-
lib/cpp/server/pollthread.tpp | 253 +
lib/cpp/server/readers_writers_lock.h | 8 +-
lib/cpp/server/rootattreg.cpp | 1420 ++
lib/cpp/server/rootattreg.h | 136 +
lib/cpp/server/seqvec.cpp | 4 +-
lib/cpp/server/seqvec.h | 4 +-
lib/cpp/server/subdev_diag.cpp | 13 +-
lib/cpp/server/subdev_diag.h | 4 +-
lib/cpp/server/tango.h | 48 +-
lib/cpp/server/tangoDynSK.cpp | 1919 +-
lib/cpp/server/tangoSK.cpp | 3536 +++-
lib/cpp/server/tango_config.h | 73 +-
lib/cpp/server/tango_const.h | 805 +-
lib/cpp/server/tango_monitor.h | 5 +-
lib/cpp/server/tangoappender.cpp | 6 +-
lib/cpp/server/tangoappender.h | 4 +-
lib/cpp/server/tangorollingfileappender.cpp | 6 +-
lib/cpp/server/tangorollingfileappender.h | 4 +-
lib/cpp/server/templ_inst.cpp | 1005 +
lib/cpp/server/thsig.cpp | 8 +-
lib/cpp/server/utils.cpp | 1175 +-
lib/cpp/server/utils.h | 318 +-
lib/cpp/server/utils.tpp | 260 +-
lib/cpp/server/utils_polling.cpp | 750 +-
lib/cpp/server/utils_shut.cpp | 10 +-
lib/cpp/server/utils_spec.tpp | 348 +
lib/cpp/server/w_attribute.cpp | 215 +-
lib/cpp/server/w_attribute.h | 134 +-
lib/cpp/server/w_attribute.tpp | 489 +-
lib/cpp/server/w_attribute_spec.tpp | 428 +
lib/cpp/server/w_attrsetval.tpp | 265 +
lib/cpp/server/w_pipe.cpp | 77 +
lib/cpp/server/w_pipe.h | 190 +
lib/cpp/server/w_pipe.tpp | 73 +
lib/cpp/server/zmqeventsupplier.cpp | 1117 +-
lib/cpp/tango.pc.in | 2 +-
lib/idl/Makefile.in | 112 +-
lib/idl/tango.idl | 225 +-
lib/java/Makefile.am | 20 +-
lib/java/Makefile.in | 402 +-
lib/java/TangoVers.in | 9 +-
lib/java/astor.in | 7 +-
lib/java/atkmoni.in | 7 +-
lib/java/atkpanel.in | 7 +-
lib/java/atktuning.in | 7 +-
lib/java/cvstag.in | 7 +-
lib/java/devicetree.in | 7 +-
lib/java/jdraw.in | 7 +-
lib/java/jive.in | 7 +-
lib/java/jzmq/Makefile.am | 60 -
lib/java/jzmq/Makefile.in | 707 -
lib/java/logviewer.in | 7 +-
lib/java/pogo-6.in | 2 +-
lib/java/pogo.in | 1 -
lib/java/synopticappli.in | 7 +-
lib/java/tg_devtest.in | 7 +-
m4/ax_jni_include_dir.m4 | 119 -
m4/libtool.m4 | 52 +-
pogo/Makefile.in | 280 +-
pogo/preferences/Makefile.in | 120 +-
pogo/templates/Makefile.in | 127 +-
pogo/templates/cpp/Makefile | 6 +-
scripts/Makefile.am | 4 +-
scripts/Makefile.in | 123 +-
scripts/notify_daemon.in | 50 -
utils/Makefile.am | 2 +-
utils/Makefile.in | 282 +-
utils/notifd2db/Makefile.am | 15 -
utils/notifd2db/Makefile.in | 608 -
utils/notifd2db/notifd2db.cpp | 462 -
utils/tango_admin/Makefile.am | 2 +-
utils/tango_admin/Makefile.in | 267 +-
utils/tango_admin/tango_admin.cpp | 177 +-
351 files changed, 97402 insertions(+), 54118 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tango.git
More information about the debian-science-commits
mailing list