[SCM] tango branch, upstream, updated. upstream/7.2.6-4-g657cebf

Sat Sep 15 19:56:14 UTC 2012

The following commit has been merged in the upstream branch:
commit 657cebf07dd5a6b5d9aa1bc43955029ed6386150
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Wed Jul 4 22:05:59 2012 +0200

    Imported Upstream version 8.0.5+dfsg

diff --git a/README b/README
index 8af9448..dd45f3d 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-		TANGO source code release version 8.0.5 - README (05/2012)
+		TANGO source code release version 8.0.5 - README (06/2012)
 		==========================================================
 
 
@@ -499,15 +499,15 @@ Changes between Tango distribution 7.2.6a and 8.0.5
 
 - Updated C++ library to						Release 8.0.5
 - Updated Log4Tango to 							Release 4.0.7
-- Updated Jive to								Release 4.23
-- Updated atkpanel to							Release 4.4
-- Updated Pogo to								Release 8.0.3
-- Updated Astor to							    Release 6.0.4
+- Updated Jive to								Release 4.24
+- Updated atkpanel to							Release 4.5
+- Updated Pogo to								Release 8.0.7
+- Updated Astor to								Release 6.0.4
 - Updated notifd2db to							Release 1.13
 - Updated tango_admin to 						Release 1.10
 - Updated DbServer to							Release 4.17
 - Updated TangORB to							Release 8.0.0 
-- Updated ATK to 								Release 4.3.6
+- Updated ATK to 								Release 4.3.9
 - Updated Starter to							Release 5.5
 - Updated TangoTest to							Release 1.7.0
 - Updated TangoAccessControl to					Release 2.5
diff --git a/TANGO_CHANGES b/TANGO_CHANGES
index c85b6e2..2598697 100644
--- a/TANGO_CHANGES
+++ b/TANGO_CHANGES
@@ -76,6 +76,7 @@ with polling defined in code
 - Optimize database calls during device server startup and shutdown sequence (When TAC is used or when
 dynamic attributes are used)
 - Added Database class copy constructor and assignment operator
+- Restore user signal handler for SIGPIPE after CORBA::ORB_init() call
 - Tango is now compiled with Debian hardenning flags on.
 
 
diff --git a/config/ltmain.sh b/config/ltmain.sh
old mode 100644
new mode 100755
diff --git a/cppserver/AbstractClass/AccessControl/Makefile.in b/cppserver/AbstractClass/AccessControl/Makefile.in
index 3cb5758..82a76db 100644
--- a/cppserver/AbstractClass/AccessControl/Makefile.in
+++ b/cppserver/AbstractClass/AccessControl/Makefile.in
@@ -209,7 +209,6 @@ VERSION_INFO = @VERSION_INFO@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ZMQ_PREFIX = @ZMQ_PREFIX@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
diff --git a/cppserver/database/DataBase.cpp b/cppserver/database/DataBase.cpp
index daf1ec3..7d8897d 100644
--- a/cppserver/database/DataBase.cpp
+++ b/cppserver/database/DataBase.cpp
@@ -1,5 +1,5 @@
 /*----- PROTECTED REGION ID(DataBase.cpp) ENABLED START -----*/
-static const char *RcsId = "$Id: DataBase.cpp 20316 2012-05-23 12:56:16Z taurel $";
+static const char *RcsId = "$Id: DataBase.cpp 20442 2012-06-01 08:41:15Z taurel $";
 //=============================================================================
 //
 // file :        DataBase.cpp
@@ -34,8 +34,8 @@ static const char *RcsId = "$Id: DataBase.cpp 20316 2012-05-23 12:56:16Z taurel
 // You should have received a copy of the GNU General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20316 $
-// $Date: 2012-05-23 14:56:16 +0200 (Wed, 23 May 2012) $
+// $Revision: 20442 $
+// $Date: 2012-06-01 10:41:15 +0200 (Fri, 01 Jun 2012) $
 //
 // $HeadURL: https://tango-cs.svn.sourceforge.net/svnroot/tango-cs/classes/cpp/dbase/tags/Database-Release4.17/DataBase.cpp $
 //
@@ -4434,7 +4434,7 @@ Tango::DevVarStringArray *DataBase::db_get_device_property(const Tango::DevVarSt
 
 	   n_rows = mysql_num_rows(result);
 	   DEBUG_STREAM << "DataBase::GetDeviceProperty(): mysql_num_rows() " << n_rows << endl;
-	   sprintf(n_rows_str,"%6d",n_rows);
+	   sprintf(n_rows_str,"%d",n_rows);
 	   n_props = n_props+2;
 	   argout->length(n_props);
 	   (*argout)[n_props-2] = CORBA::string_dup(prop_name.c_str());
@@ -4543,7 +4543,7 @@ Tango::DevVarStringArray *DataBase::db_get_device_property_hist(const Tango::Dev
   		   int deleted = (atoi(row[3]) == 0); // count=0 for deleted property
   		   if(deleted) count = 0;
 		   char n_rows_str[256];
-		   sprintf(n_rows_str,"%6d",count);
+		   sprintf(n_rows_str,"%d",count);
 
     	   argout->length(nb_item+3+count);
 		   (*argout)[nb_item+0] = CORBA::string_dup(row[2]);
@@ -5133,7 +5133,7 @@ Tango::DevVarStringArray *DataBase::db_get_property(const Tango::DevVarStringArr
 
 	   n_rows = mysql_num_rows(result);
 	   DEBUG_STREAM << "DataBase::db_get_property(): mysql_num_rows() " << n_rows << endl;
-	   sprintf(n_rows_str,"%6d",n_rows);
+	   sprintf(n_rows_str,"%d",n_rows);
 	   n_props = n_props+2;
 	   argout->length(n_props);
 	   (*argout)[n_props-2] = CORBA::string_dup((*property_names)[i]);
@@ -5238,7 +5238,7 @@ Tango::DevVarStringArray *DataBase::db_get_property_hist(const Tango::DevVarStri
   		   int deleted = (atoi(row[3]) == 0); // count=0 for deleted property
   		   if(deleted) count = 0;
 		   char n_rows_str[256];
-		   sprintf(n_rows_str,"%6d",count);
+		   sprintf(n_rows_str,"%d",count);
 
     	   argout->length(nb_item+3+count);
 		   (*argout)[nb_item+0] = CORBA::string_dup(row[2]);
@@ -6309,7 +6309,7 @@ void DataBase::db_put_class_attribute_property2(const Tango::DevVarStringArray *
 	   			for (l=j+1; l<j+n_rows+1; l++)
 	   			{
           				string tmp_escaped_string = escape_string((*argin)[l+1]);
-	      				tmp_count++; sprintf(tmp_count_str, "%6d", tmp_count);
+	      				tmp_count++; sprintf(tmp_count_str, "%d", tmp_count);
 
 // then insert the new value for this tuple
 
@@ -6405,7 +6405,7 @@ void DataBase::db_put_class_property(const Tango::DevVarStringArray *argin)
 		   	for (j=k+2; j<k+n_rows+2; j++)
 		   	{
         	  	string tmp_escaped_string = escape_string((*property_list)[j]);
-	    	  	tmp_count++; sprintf(tmp_count_str, "%6d", tmp_count);
+	    	  	tmp_count++; sprintf(tmp_count_str, "%d", tmp_count);
 
 // then insert the new value for this tuple
 				sql_query_stream.str("");
@@ -6674,7 +6674,7 @@ void DataBase::db_put_device_attribute_property2(const Tango::DevVarStringArray
 	   			for (l=j+1; l<j+n_rows+1; l++)
 	   			{
           			string tmp_escaped_string = escape_string((*argin)[l+1]);
-	      			tmp_count++; sprintf(tmp_count_str, "%6d", tmp_count);
+	      			tmp_count++; sprintf(tmp_count_str, "%d", tmp_count);
 
 // then insert the new value for this tuple
 					sql_query_stream.str("");
@@ -6771,7 +6771,7 @@ void DataBase::db_put_device_property(const Tango::DevVarStringArray *argin)
 		   for (j=k+2; j<k+n_rows+2; j++)
 		   {
         	  string tmp_escaped_string = escape_string((*property_list)[j]);
-	    	  tmp_count++; sprintf(tmp_count_str, "%6d", tmp_count);
+	    	  tmp_count++; sprintf(tmp_count_str, "%d", tmp_count);
 
 			// then insert the new value for this tuple
 					sql_query_stream.str("");
diff --git a/cppserver/database/Makefile.in b/cppserver/database/Makefile.in
index e27cb98..2c4286a 100644
--- a/cppserver/database/Makefile.in
+++ b/cppserver/database/Makefile.in
@@ -251,7 +251,6 @@ VERSION_INFO = @VERSION_INFO@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ZMQ_PREFIX = @ZMQ_PREFIX@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
diff --git a/cppserver/starter/Makefile.in b/cppserver/starter/Makefile.in
index 3b526a2..457a390 100644
--- a/cppserver/starter/Makefile.in
+++ b/cppserver/starter/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -119,7 +119,6 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -174,7 +173,6 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MYSQL = @MYSQL@
 MYSQLCLIENT_CFLAGS = @MYSQLCLIENT_CFLAGS@
@@ -216,13 +214,11 @@ VERSION_INFO = @VERSION_INFO@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ZMQ_PREFIX = @ZMQ_PREFIX@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_aux_dir = @ac_aux_dir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -256,6 +252,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -379,7 +376,7 @@ clean-binPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-Starter$(EXEEXT): $(Starter_OBJECTS) $(Starter_DEPENDENCIES) $(EXTRA_Starter_DEPENDENCIES) 
+Starter$(EXEEXT): $(Starter_OBJECTS) $(Starter_DEPENDENCIES) 
 	@rm -f Starter$(EXEEXT)
 	$(CXXLINK) $(Starter_OBJECTS) $(Starter_LDADD) $(LIBS)
 
@@ -525,15 +522,10 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
diff --git a/cppserver/tangoaccesscontrol/Makefile.in b/cppserver/tangoaccesscontrol/Makefile.in
index dd107a9..e94efad 100644
--- a/cppserver/tangoaccesscontrol/Makefile.in
+++ b/cppserver/tangoaccesscontrol/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -157,7 +157,6 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -212,7 +211,6 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MYSQL = @MYSQL@
 MYSQLCLIENT_CFLAGS = @MYSQLCLIENT_CFLAGS@
@@ -254,13 +252,11 @@ VERSION_INFO = @VERSION_INFO@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ZMQ_PREFIX = @ZMQ_PREFIX@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_aux_dir = @ac_aux_dir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -294,6 +290,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -414,7 +411,7 @@ clean-binPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-TangoAccessControl$(EXEEXT): $(TangoAccessControl_OBJECTS) $(TangoAccessControl_DEPENDENCIES) $(EXTRA_TangoAccessControl_DEPENDENCIES) 
+TangoAccessControl$(EXEEXT): $(TangoAccessControl_OBJECTS) $(TangoAccessControl_DEPENDENCIES) 
 	@rm -f TangoAccessControl$(EXEEXT)
 	$(CXXLINK) $(TangoAccessControl_OBJECTS) $(TangoAccessControl_LDADD) $(LIBS)
 
@@ -669,15 +666,10 @@ install-am: all-am
 
 installcheck: installcheck-recursive
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
diff --git a/cppserver/tangotest/Makefile.in b/cppserver/tangotest/Makefile.in
index edba3d6..a5c700f 100644
--- a/cppserver/tangotest/Makefile.in
+++ b/cppserver/tangotest/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -105,12 +105,6 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
 HEADERS = $(tangoinclude_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -138,7 +132,6 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -193,7 +186,6 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MYSQL = @MYSQL@
 MYSQLCLIENT_CFLAGS = @MYSQLCLIENT_CFLAGS@
@@ -235,13 +227,11 @@ VERSION_INFO = @VERSION_INFO@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ZMQ_PREFIX = @ZMQ_PREFIX@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_aux_dir = @ac_aux_dir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -275,6 +265,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -392,7 +383,7 @@ clean-binPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-TangoTest$(EXEEXT): $(TangoTest_OBJECTS) $(TangoTest_DEPENDENCIES) $(EXTRA_TangoTest_DEPENDENCIES) 
+TangoTest$(EXEEXT): $(TangoTest_OBJECTS) $(TangoTest_DEPENDENCIES) 
 	@rm -f TangoTest$(EXEEXT)
 	$(CXXLINK) $(TangoTest_OBJECTS) $(TangoTest_LDADD) $(LIBS)
 
@@ -451,7 +442,9 @@ uninstall-tangoincludeHEADERS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(tangoinclude_HEADERS)'; test -n "$(tangoincludedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(tangoincludedir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(tangoincludedir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(tangoincludedir)" && rm -f $$files
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -552,15 +545,10 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
diff --git a/lib/cpp/client/accessproxy.cpp b/lib/cpp/client/accessproxy.cpp
index 881516c..085584a 100644
--- a/lib/cpp/client/accessproxy.cpp
+++ b/lib/cpp/client/accessproxy.cpp
@@ -27,7 +27,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 //-======================================================================
 
diff --git a/lib/cpp/client/api_util.cpp b/lib/cpp/client/api_util.cpp
index 5c5dd6a..795f9c1 100644
--- a/lib/cpp/client/api_util.cpp
+++ b/lib/cpp/client/api_util.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: api_util.cpp 19408 2012-02-23 09:35:52Z taurel $\n$Name$";
+static const char *RcsId = "$Id: api_util.cpp 20503 2012-06-05 15:19:18Z taurel $\n$Name$";
 
 //-----------------------------------------------------------------------------
 //
@@ -28,7 +28,7 @@ static const char *RcsId = "$Id: api_util.cpp 19408 2012-02-23 09:35:52Z taurel
 //
 // original 	- May 2002
 //
-// $Revision: 19408 $
+// $Revision: 20503 $
 //
 //-----------------------------------------------------------------------------
 
@@ -45,6 +45,7 @@ static const char *RcsId = "$Id: api_util.cpp 19408 2012-02-23 09:35:52Z taurel
 #include <net/if.h>
 #include <sys/ioctl.h>
 #include <netdb.h>
+#include <signal.h>
 
 // There is a NO_DATA defined in netdb.h
 
@@ -244,6 +245,20 @@ void ApiUtil::create_orb()
 	_argv[0] = (char*)"dummy";
 
 //
+// Get user signal handler for SIGPIPE
+// (ORB_init call install a SIG_IGN for SIGPIPE. This
+// could be annoying in case the user uses SIGPIPE)
+//
+
+#ifndef _TG_WINDOWS_
+	struct sigaction sa;
+	sa.sa_handler = NULL;
+
+	if (sigaction(SIGPIPE,NULL,&sa) == -1)
+		sa.sa_handler = NULL;
+#endif
+
+//
 // Init the ORB
 //
 
@@ -256,6 +271,24 @@ void ApiUtil::create_orb()
 	_orb = CORBA::ORB_init(_argc,_argv,"omniORB4",options);
 
 	free(_argv);
+
+//
+// Restore SIGPIPE handler
+//
+
+#ifndef _TG_WINDOWS_
+	if (sa.sa_handler != NULL)
+	{
+		struct sigaction sb;
+
+		sb = sa;
+
+		if (sigaction(SIGPIPE,&sb,NULL) == -1)
+		{
+			cerr << "Can re-install user signal handler for SIGPIPE!" << endl;
+		}
+	}
+#endif
 }
 
 //-----------------------------------------------------------------------------
diff --git a/lib/cpp/client/apiexcept.cpp b/lib/cpp/client/apiexcept.cpp
index 0abc57b..8ec6cd0 100644
--- a/lib/cpp/client/apiexcept.cpp
+++ b/lib/cpp/client/apiexcept.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: apiexcept.cpp 20278 2012-05-22 16:14:25Z taurel $\n$Name$";
+static const char *RcsId = "$Id: apiexcept.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //+============================================================================
 //
@@ -34,7 +34,7 @@ static const char *RcsId = "$Id: apiexcept.cpp 20278 2012-05-22 16:14:25Z taurel
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20278 $
+// $Revision: 20437 $
 //
 // $Log$
 // Revision 3.7  2010/09/09 13:43:38  taurel
diff --git a/lib/cpp/client/asynreq.cpp b/lib/cpp/client/asynreq.cpp
index 1cd005e..b768230 100644
--- a/lib/cpp/client/asynreq.cpp
+++ b/lib/cpp/client/asynreq.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: asynreq.cpp 18627 2011-12-12 13:19:55Z taurel $\n$Name$";
+static const char *RcsId = "$Id: asynreq.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //
 // cpp 	- C++ source code file for TANGO AsynReq class
diff --git a/lib/cpp/client/attr_proxy.cpp b/lib/cpp/client/attr_proxy.cpp
index a58e173..3d2be58 100644
--- a/lib/cpp/client/attr_proxy.cpp
+++ b/lib/cpp/client/attr_proxy.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: attr_proxy.cpp 19407 2012-02-23 08:42:36Z taurel $\n$Name$";
+static const char *RcsId = "$Id: attr_proxy.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 //
 // attr_proxy.cpp 	- C++ source code file for TANGO attribute proxy api
 //
diff --git a/lib/cpp/client/cbthread.cpp b/lib/cpp/client/cbthread.cpp
index 81898b4..e9a0083 100644
--- a/lib/cpp/client/cbthread.cpp
+++ b/lib/cpp/client/cbthread.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: cbthread.cpp 18627 2011-12-12 13:19:55Z taurel $\n$Name$";
+static const char *RcsId = "$Id: cbthread.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //+============================================================================
 //
@@ -34,7 +34,7 @@ static const char *RcsId = "$Id: cbthread.cpp 18627 2011-12-12 13:19:55Z taurel
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 //-============================================================================
 
diff --git a/lib/cpp/client/cbthread.h b/lib/cpp/client/cbthread.h
index 6d0b467..733a319 100644
--- a/lib/cpp/client/cbthread.h
+++ b/lib/cpp/client/cbthread.h
@@ -29,7 +29,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18898 $
+// $Revision: 20437 $
 //
 //=============================================================================
 
diff --git a/lib/cpp/client/dbapi_attribute.cpp b/lib/cpp/client/dbapi_attribute.cpp
index e162e70..7764864 100644
--- a/lib/cpp/client/dbapi_attribute.cpp
+++ b/lib/cpp/client/dbapi_attribute.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: dbapi_attribute.cpp 18627 2011-12-12 13:19:55Z taurel $\n$Name$";
+static const char *RcsId = "$Id: dbapi_attribute.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 //
 // dbdevice.cpp - C++ source code file for TANGO dbapi class DbAttribute
 //
diff --git a/lib/cpp/client/dbapi_base.cpp b/lib/cpp/client/dbapi_base.cpp
index d59099f..20fc8b7 100644
--- a/lib/cpp/client/dbapi_base.cpp
+++ b/lib/cpp/client/dbapi_base.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: dbapi_base.cpp 20278 2012-05-22 16:14:25Z taurel $\n$Name$";
+static const char *RcsId = "$Id: dbapi_base.cpp 20500 2012-06-05 08:50:39Z taurel $\n$Name$";
 
 //
 // cpp 	- C++ source code file for TANGO dbapi class Database
@@ -4255,7 +4255,7 @@ AccessControlType Database::check_access_control(string &devname)
 	}
 	catch (Tango::DevFailed &e)
 	{
-		if (::strcmp(e.errors[0].reason.in(),"API_DeviceNotExported") == 0)
+		if (::strcmp(e.errors[0].reason.in(),"API_DeviceNotExported") == 0 || ::strcmp(e.errors[0].reason.in(),"DB_DeviceNotDefined") == 0)
 		{
 			string tmp_err_desc(e.errors[0].desc.in());
 			tmp_err_desc = tmp_err_desc + "\nControlled access service defined in Db but unreachable --> Read access given to all devices...";
diff --git a/lib/cpp/client/dbapi_cache.cpp b/lib/cpp/client/dbapi_cache.cpp
index d92d4ff..d087276 100644
--- a/lib/cpp/client/dbapi_cache.cpp
+++ b/lib/cpp/client/dbapi_cache.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: dbapi_cache.cpp 20278 2012-05-22 16:14:25Z taurel $";
+static const char *RcsId = "$Id: dbapi_cache.cpp 20500 2012-06-05 08:50:39Z taurel $";
 
 //+============================================================================
 //
@@ -30,7 +30,7 @@ static const char *RcsId = "$Id: dbapi_cache.cpp 20278 2012-05-22 16:14:25Z taur
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20278 $
+// $Revision: 20500 $
 //
 //-============================================================================
 
@@ -1236,6 +1236,19 @@ const DevVarLongStringArray *DbServerCache::import_tac_dev(string &tac_dev)
     }
 
 //
+// Throw exception if the device is not found in DB
+//
+
+	if (::strcmp((*data_list)[imp_tac.first_idx + 1],"Not Found") == 0)
+	{
+		TangoSys_OMemStream o;
+		o << "Device " << tac_dev << " not defined in database" << ends;
+
+		Tango::Except::throw_exception((const char *)"DB_DeviceNotDefined",o.str(),
+									   (const char *)"DbServerCache::import_tac_dev");
+	}
+
+//
 // Return cache data
 //
 
diff --git a/lib/cpp/client/dbapi_class.cpp b/lib/cpp/client/dbapi_class.cpp
index 2e4a330..d8343ed 100644
--- a/lib/cpp/client/dbapi_class.cpp
+++ b/lib/cpp/client/dbapi_class.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: dbapi_class.cpp 18899 2012-01-12 15:58:57Z taurel $\n$Name$";
+static const char *RcsId = "$Id: dbapi_class.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 //
 // dbapi_class.cpp - C++ source code file for TANGO dbapi class DbClass
 //
diff --git a/lib/cpp/client/dbapi_datum.cpp b/lib/cpp/client/dbapi_datum.cpp
index 408cf20..157d051 100644
--- a/lib/cpp/client/dbapi_datum.cpp
+++ b/lib/cpp/client/dbapi_datum.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: dbapi_datum.cpp 19219 2012-02-08 12:49:17Z taurel $\n$Name$";
+static const char *RcsId = "$Id: dbapi_datum.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 //
 // dbdatum.cpp 	- C++ source code file for TANGO dbapi class DbDatum
 //
diff --git a/lib/cpp/client/dbapi_device.cpp b/lib/cpp/client/dbapi_device.cpp
index fa65436..5b2b1e2 100644
--- a/lib/cpp/client/dbapi_device.cpp
+++ b/lib/cpp/client/dbapi_device.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: dbapi_device.cpp 18899 2012-01-12 15:58:57Z taurel $\n$Name$";
+static const char *RcsId = "$Id: dbapi_device.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 //
 // dbdevice.cpp - C++ source code file for TANGO dbapi class DbDevice
 //
diff --git a/lib/cpp/client/dbapi_history.cpp b/lib/cpp/client/dbapi_history.cpp
index b514480..0ccaec2 100644
--- a/lib/cpp/client/dbapi_history.cpp
+++ b/lib/cpp/client/dbapi_history.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: dbapi_history.cpp 18627 2011-12-12 13:19:55Z taurel $\n$Name$";
+static const char *RcsId = "$Id: dbapi_history.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 //
 // dbapi_history.cpp - C++ source code file for TANGO dbapi class DbHistory
 //
diff --git a/lib/cpp/client/dbapi_server.cpp b/lib/cpp/client/dbapi_server.cpp
index 32da886..3b584a0 100644
--- a/lib/cpp/client/dbapi_server.cpp
+++ b/lib/cpp/client/dbapi_server.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: dbapi_server.cpp 18899 2012-01-12 15:58:57Z taurel $\n$Name$";
+static const char *RcsId = "$Id: dbapi_server.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 //
 // dbdevice.cpp - C++ source code file for TANGO dbapi class DbServer
 //
diff --git a/lib/cpp/client/devapi.h b/lib/cpp/client/devapi.h
index fcbee77..1aede3a 100644
--- a/lib/cpp/client/devapi.h
+++ b/lib/cpp/client/devapi.h
@@ -23,7 +23,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 19745 $
+// $Revision: 20437 $
 //
 ///////////////////////////////////////////////////////////////
 
diff --git a/lib/cpp/client/devapi_attr.cpp b/lib/cpp/client/devapi_attr.cpp
index 08931a8..d441f36 100644
--- a/lib/cpp/client/devapi_attr.cpp
+++ b/lib/cpp/client/devapi_attr.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: devapi_attr.cpp 20009 2012-04-16 15:03:00Z taurel $\n$Name$";
+static const char *RcsId = "$Id: devapi_attr.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 /////////////////////////////////////////////////////////////////////////////////////
 //
@@ -28,7 +28,7 @@ static const char *RcsId = "$Id: devapi_attr.cpp 20009 2012-04-16 15:03:00Z taur
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>
 //
-//      $Revision: 20009 $
+//      $Revision: 20437 $
 //
 ////////////////////////////////////////////////////////////////////////////
 
diff --git a/lib/cpp/client/devapi_base.cpp b/lib/cpp/client/devapi_base.cpp
index 91e6397..a2bcec6 100644
--- a/lib/cpp/client/devapi_base.cpp
+++ b/lib/cpp/client/devapi_base.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: devapi_base.cpp 20278 2012-05-22 16:14:25Z taurel $\n$Name$";
+static const char *RcsId = "$Id: devapi_base.cpp 20500 2012-06-05 08:50:39Z taurel $\n$Name$";
 
 ///////////////////////////////////////////////////////////////////////////////
 //
@@ -28,7 +28,7 @@ static const char *RcsId = "$Id: devapi_base.cpp 20278 2012-05-22 16:14:25Z taur
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-//		$Revision: 20278 $
+//		$Revision: 20500 $
 //
 /////////////////////////////////////////////////////////////////////////////////
 
@@ -1063,7 +1063,13 @@ DeviceData Connection::command_inout(string &command, DeviceData &data_in)
 					if (e.length() == 0)
 						desc << "Command " << command << " on device " << dev_name() << " is not authorized" << ends;
 					else
+					{
 						desc << "Command " << command << " on device " << dev_name() << " is not authorized because an error occurs while talking to the Controlled Access Service" << ends;
+						string ex(e[0].desc);
+						if (ex.find("defined") != string::npos)
+							desc << "\n" << ex;
+						desc << ends;
+					}
 
 					NotAllowedExcept::throw_exception((const char *)"API_ReadOnlyMode",desc.str(),
 													  (const char *)"Connection::command_inout()");
@@ -1249,7 +1255,13 @@ CORBA::Any_var Connection::command_inout(string &command, CORBA::Any &any)
 					if (e.length() == 0)
 						desc << "Command " << command << " on device " << dev_name() << " is not authorized" << ends;
 					else
+					{
 						desc << "Command " << command << " on device " << dev_name() << " is not authorized because an error occurs while talking to the Controlled Access Service" << ends;
+						string ex(e[0].desc);
+						if (ex.find("defined") != string::npos)
+							desc << "\n" << ex;
+						desc << ends;
+					}
 
 					NotAllowedExcept::throw_exception((const char *)"API_ReadOnlyMode",desc.str(),
 													  (const char *)"Connection::command_inout()");
diff --git a/lib/cpp/client/devapi_data.cpp b/lib/cpp/client/devapi_data.cpp
index fe1748f..f9dd0be 100644
--- a/lib/cpp/client/devapi_data.cpp
+++ b/lib/cpp/client/devapi_data.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: devapi_data.cpp 20278 2012-05-22 16:14:25Z taurel $";
+static const char *RcsId = "$Id: devapi_data.cpp 20437 2012-05-31 12:33:29Z taurel $";
 
 //
 // devapi_data.cpp 	- C++ source code file for TANGO devapi class DeviceData
@@ -27,7 +27,7 @@ static const char *RcsId = "$Id: devapi_data.cpp 20278 2012-05-22 16:14:25Z taur
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// version 		- $Revision: 20278 $
+// version 		- $Revision: 20437 $
 //
 
 #if HAVE_CONFIG_H
diff --git a/lib/cpp/client/devapi_datahist.cpp b/lib/cpp/client/devapi_datahist.cpp
index b06ee52..1f6bbfd 100644
--- a/lib/cpp/client/devapi_datahist.cpp
+++ b/lib/cpp/client/devapi_datahist.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: devapi_datahist.cpp 20009 2012-04-16 15:03:00Z taurel $\n$Name$";
+static const char *RcsId = "$Id: devapi_datahist.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //
 // devapi_datahist.cpp 	- C++ source code file for TANGO devapi class
@@ -29,7 +29,7 @@ static const char *RcsId = "$Id: devapi_datahist.cpp 20009 2012-04-16 15:03:00Z
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
 //
-// version 		- $Revision: 20009 $
+// version 		- $Revision: 20437 $
 //
 
 #if HAVE_CONFIG_H
diff --git a/lib/cpp/client/devapi_utils.cpp b/lib/cpp/client/devapi_utils.cpp
index 3cea32a..08789a8 100644
--- a/lib/cpp/client/devapi_utils.cpp
+++ b/lib/cpp/client/devapi_utils.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: devapi_utils.cpp 19138 2012-01-31 16:55:49Z taurel $";
+static const char *RcsId = "$Id: devapi_utils.cpp 20437 2012-05-31 12:33:29Z taurel $";
 
 //
 // devapi_utils.cpp 	- C++ source code file for TANGO device api
@@ -27,7 +27,7 @@ static const char *RcsId = "$Id: devapi_utils.cpp 19138 2012-01-31 16:55:49Z tau
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 19138 $
+// $Revision: 20437 $
 //
 //
 
diff --git a/lib/cpp/client/event.cpp b/lib/cpp/client/event.cpp
index 0a5a368..1a1c177 100644
--- a/lib/cpp/client/event.cpp
+++ b/lib/cpp/client/event.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: event.cpp 20278 2012-05-22 16:14:25Z taurel $";
+static const char *RcsId = "$Id: event.cpp 20437 2012-05-31 12:33:29Z taurel $";
 
 ////////////////////////////////////////////////////////////////////////////////
 ///
@@ -34,7 +34,7 @@ static const char *RcsId = "$Id: event.cpp 20278 2012-05-22 16:14:25Z taurel $";
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 ///
-///		$Revision: 20278 $
+///		$Revision: 20437 $
 ///
 ///
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/lib/cpp/client/event.h b/lib/cpp/client/event.h
index 0cff852..2aa6317 100644
--- a/lib/cpp/client/event.h
+++ b/lib/cpp/client/event.h
@@ -33,7 +33,7 @@
 ///
 /// 		original : 7 April 2003
 ///
-/// 		$Revision: 20278 $
+/// 		$Revision: 20437 $
 ///
 /// 		copyright : European Synchrotron Radiation Facility
 ///                         BP 220, Grenoble 38043
diff --git a/lib/cpp/client/eventconsumer.h b/lib/cpp/client/eventconsumer.h
index 47c9521..8f1231d 100644
--- a/lib/cpp/client/eventconsumer.h
+++ b/lib/cpp/client/eventconsumer.h
@@ -522,6 +522,7 @@ private :
     void process_event(zmq::message_t &,zmq::message_t &,zmq::message_t &,zmq::message_t &);
     void process_event(zmq_msg_t &,zmq_msg_t &,zmq_msg_t &,zmq_msg_t &);
     void multi_tango_host(zmq::socket_t *,SocketCmd,string &);
+	void print_error_message(const char *);
 
     friend class DelayEvent;
 };
diff --git a/lib/cpp/client/eventkeepalive.cpp b/lib/cpp/client/eventkeepalive.cpp
index a826995..927056e 100644
--- a/lib/cpp/client/eventkeepalive.cpp
+++ b/lib/cpp/client/eventkeepalive.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: eventkeepalive.cpp 20278 2012-05-22 16:14:25Z taurel $";
+static const char *RcsId = "$Id: eventkeepalive.cpp 20437 2012-05-31 12:33:29Z taurel $";
 
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ -35,7 +35,7 @@ static const char *RcsId = "$Id: eventkeepalive.cpp 20278 2012-05-22 16:14:25Z t
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
 //
-//		$Revision: 20278 $
+//		$Revision: 20437 $
 //
 //
 //		copyright : European Synchrotron Radiation Facility
diff --git a/lib/cpp/client/eventqueue.cpp b/lib/cpp/client/eventqueue.cpp
index be2c4ef..e643399 100644
--- a/lib/cpp/client/eventqueue.cpp
+++ b/lib/cpp/client/eventqueue.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: eventqueue.cpp 20278 2012-05-22 16:14:25Z taurel $\n$Name$";
+static const char *RcsId = "$Id: eventqueue.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //============================================================================
 //
@@ -31,7 +31,7 @@ static const char *RcsId = "$Id: eventqueue.cpp 20278 2012-05-22 16:14:25Z taure
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20278 $
+// $Revision: 20437 $
 //
 //
 //============================================================================
diff --git a/lib/cpp/client/group.cpp b/lib/cpp/client/group.cpp
index 3ad792e..27aeb06 100644
--- a/lib/cpp/client/group.cpp
+++ b/lib/cpp/client/group.cpp
@@ -28,7 +28,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20278 $
+// $Revision: 20437 $
 //
 //=============================================================================
 
diff --git a/lib/cpp/client/group.h b/lib/cpp/client/group.h
index 533e7d9..23dfac9 100644
--- a/lib/cpp/client/group.h
+++ b/lib/cpp/client/group.h
@@ -28,7 +28,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 //=============================================================================
 
diff --git a/lib/cpp/client/helpers/DeviceProxyHelper.h b/lib/cpp/client/helpers/DeviceProxyHelper.h
index b8ff484..bda3100 100644
--- a/lib/cpp/client/helpers/DeviceProxyHelper.h
+++ b/lib/cpp/client/helpers/DeviceProxyHelper.h
@@ -2,7 +2,7 @@
 //
 // project :      TANGO Utility
 // file :         DeviceProxyHelper.h:
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 //
 //   description :  This utility class helps to use command_inout,read_attributes and write_attribute(s)
@@ -108,7 +108,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 // $Log$
 // Revision 1.8  2010/09/21 12:08:44  taurel
diff --git a/lib/cpp/client/helpers/PogoHelper.h b/lib/cpp/client/helpers/PogoHelper.h
index 683ab85..e227b22 100644
--- a/lib/cpp/client/helpers/PogoHelper.h
+++ b/lib/cpp/client/helpers/PogoHelper.h
@@ -2,7 +2,7 @@
 //
 // project :      TANGO Utility
 // file :         PogoHelper.h:
-// $Revision: 18627 $
+// $Revision: 20437 $
 // $Author: taurel $
 //
 // Copyright (C) :      2004,2005,2006,2007,2008,2009,2010,2011,2012
diff --git a/lib/cpp/client/lockthread.cpp b/lib/cpp/client/lockthread.cpp
index e1fa1eb..7707795 100644
--- a/lib/cpp/client/lockthread.cpp
+++ b/lib/cpp/client/lockthread.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: lockthread.cpp 20278 2012-05-22 16:14:25Z taurel $";
+static const char *RcsId = "$Id: lockthread.cpp 20437 2012-05-31 12:33:29Z taurel $";
 
 //+============================================================================
 //
@@ -33,7 +33,7 @@ static const char *RcsId = "$Id: lockthread.cpp 20278 2012-05-22 16:14:25Z taure
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20278 $
+// $Revision: 20437 $
 //
 //-============================================================================
 
diff --git a/lib/cpp/client/lockthread.h b/lib/cpp/client/lockthread.h
index a1e28a6..cdcb033 100644
--- a/lib/cpp/client/lockthread.h
+++ b/lib/cpp/client/lockthread.h
@@ -29,7 +29,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 //=============================================================================
 
diff --git a/lib/cpp/client/proxy_asyn.cpp b/lib/cpp/client/proxy_asyn.cpp
index 4e708dd..ac0356b 100644
--- a/lib/cpp/client/proxy_asyn.cpp
+++ b/lib/cpp/client/proxy_asyn.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: proxy_asyn.cpp 19138 2012-01-31 16:55:49Z taurel $\n$Name$";
+static const char *RcsId = "$Id: proxy_asyn.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 //====================================================================================
 //
 // cpp 	- C++ source code file for TANGO api Connection and DeviceProxy
@@ -29,7 +29,7 @@ static const char *RcsId = "$Id: proxy_asyn.cpp 19138 2012-01-31 16:55:49Z taure
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
 //
-// $Revision: 19138 $
+// $Revision: 20437 $
 //
 //===================================================================================
 
diff --git a/lib/cpp/client/proxy_asyn_cb.cpp b/lib/cpp/client/proxy_asyn_cb.cpp
index 1e61ad8..3451007 100644
--- a/lib/cpp/client/proxy_asyn_cb.cpp
+++ b/lib/cpp/client/proxy_asyn_cb.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: proxy_asyn_cb.cpp 19138 2012-01-31 16:55:49Z taurel $\n$Name$";
+static const char *RcsId = "$Id: proxy_asyn_cb.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //
 // cpp 	- C++ source code file for TANGO api class and asynchronous callback
diff --git a/lib/cpp/client/zmqeventconsumer.cpp b/lib/cpp/client/zmqeventconsumer.cpp
index 746a2d6..8900300 100644
--- a/lib/cpp/client/zmqeventconsumer.cpp
+++ b/lib/cpp/client/zmqeventconsumer.cpp
@@ -219,11 +219,39 @@ void *ZmqEventConsumer::run_undetached(TANGO_UNUSED(void *arg))
         if (items[1].revents & ZMQ_POLLIN)
         {
 //cout << "For the heartbeat socket" << endl;
-            heartbeat_sub_sock->recv(&received_event_name);
-            heartbeat_sub_sock->recv(&received_endian);
-            heartbeat_sub_sock->recv(&received_call);
+            bool res;
+            try
+            {
+                res = heartbeat_sub_sock->recv(&received_event_name,ZMQ_DONTWAIT);
+                if (res == false)
+                {
+					print_error_message("First Zmq recv call on heartbeat socket returned false! De-synchronized event system?");
+                    continue;
+                }
+
+                res = heartbeat_sub_sock->recv(&received_endian,ZMQ_DONTWAIT);
+                if (res == false)
+                {
+                    print_error_message("Second Zmq recv call on heartbeat socket returned false! De-synchronized event system?");
+                    continue;
+                }
 
-            process_heartbeat(received_event_name,received_endian,received_call);
+                res = heartbeat_sub_sock->recv(&received_call,ZMQ_DONTWAIT);
+                if (res == false)
+                {
+                    print_error_message("Third Zmq recv call on heartbeat socket returned false! De-synchronized event system?");
+                    continue;
+                }
+
+                process_heartbeat(received_event_name,received_endian,received_call);
+            }
+            catch (zmq::error_t &e)
+            {
+                print_error_message("Zmq exception while receiving heartbeat data!");
+                cerr << "Error number: " << e.num() << ", error message: " << e.what() << endl;
+                items[1].revents = 0;
+                continue;
+            }
 
             items[1].revents = 0;
         }
@@ -276,12 +304,46 @@ void *ZmqEventConsumer::run_undetached(TANGO_UNUSED(void *arg))
         if (items[2].revents & ZMQ_POLLIN)
         {
 //cout << "For the event socket" << endl;
-            event_sub_sock->recv(&received_event_name);
-            event_sub_sock->recv(&received_endian);
-            event_sub_sock->recv(&received_call);
-            event_sub_sock->recv(&received_event_data);
+            bool res;
+            try
+            {
+                res = event_sub_sock->recv(&received_event_name,ZMQ_DONTWAIT);
+                if (res == false)
+                {
+                    print_error_message("First Zmq recv call on event socket returned false! De-synchronized event system?");
+                    continue;
+                }
 
-            process_event(received_event_name,received_endian,received_call,received_event_data);
+                res = event_sub_sock->recv(&received_endian,ZMQ_DONTWAIT);
+                if (res == false)
+                {
+                    print_error_message("Second Zmq recv call on event socket returned false! De-synchronized event system?");
+                    continue;
+                }
+
+                res = event_sub_sock->recv(&received_call,ZMQ_DONTWAIT);
+                if (res == false)
+                {
+                    print_error_message("Third Zmq recv call on event socket returned false! De-synchronized event system?");
+                    continue;
+                }
+
+                res = event_sub_sock->recv(&received_event_data,ZMQ_DONTWAIT);
+                if (res == false)
+                {
+                    print_error_message("Forth Zmq recv call on event socket returned false! De-synchronized event system?");
+                    continue;
+                }
+
+                process_event(received_event_name,received_endian,received_call,received_event_data);
+            }
+            catch (zmq::error_t &e)
+            {
+                print_error_message("Zmq exception while receiving event data!");
+                cerr << "Error number: " << e.num() << ", error message: " << e.what() << endl;
+                items[2].revents = 0;
+                continue;
+            }
 
             items[2].revents = 0;
         }
@@ -466,7 +528,9 @@ void ZmqEventConsumer::process_event(zmq::message_t &received_event_name,zmq::me
     }
     catch (...)
     {
-        cerr << "Received a malformed event call info data for event " << event_name << endl;
+        string st("Received a malformed event call info data for event ");
+		st = st + event_name;
+		print_error_message(st.c_str());
         unsigned char *tmp = (unsigned char *)received_call.data();
         for (unsigned int loop = 0;loop < received_call.size();loop++)
         {
@@ -542,7 +606,9 @@ void ZmqEventConsumer::process_event(zmq_msg_t &received_event_name,zmq_msg_t &r
     }
     catch (...)
     {
-        cerr << "Received a malformed event call info data for event " << event_name << endl;
+        string st("Received a malformed event call info data for event ");
+		st = st + event_name;
+		print_error_message(st.c_str());
         unsigned char *tmp = (unsigned char *)zmq_msg_data(&received_call);
         for (unsigned int loop = 0;loop < zmq_msg_size(&received_call);loop++)
         {
@@ -911,7 +977,7 @@ bool ZmqEventConsumer::process_ctrl(zmq::message_t &received_ctrl,zmq::pollitem_
                 if (event_mcast.insert(make_pair(ev_name,tmp_sock)).second == false)
                 {
                     delete tmp_sock;
-                    cerr << "Error while inserting pair<event name,mcast socket> in map!" << endl;
+                    print_error_message("Error while inserting pair<event name,mcast socket> in map!");
 
                     Except::throw_exception((const char *)"DServer_Events",
                                             (const char *)"Error while inserting pair<event name,multicast socket> in map",
@@ -946,7 +1012,7 @@ bool ZmqEventConsumer::process_ctrl(zmq::message_t &received_ctrl,zmq::pollitem_
         break;
 
         default:
-            cerr << "ZMQ main thread: Received an unknown command code from control socket!" << endl;
+            print_error_message("ZMQ main thread: Received an unknown command code from control socket!");
         break;
     }
 
@@ -1647,7 +1713,9 @@ void ZmqEventConsumer::push_heartbeat_event(string &ev_name)
         }
         catch (...)
         {
-            cerr << "Tango::ZmqEventConsumer::push_heartbeat_event() timeout on channel monitor of " << ipos->first << endl;
+            string st("Tango::ZmqEventConsumer::push_heartbeat_event() timeout on channel monitor of ");
+			st = st + ipos->first;
+			print_error_message(st.c_str());
         }
     }
     else
@@ -1677,7 +1745,9 @@ void ZmqEventConsumer::push_heartbeat_event(string &ev_name)
                         }
                         catch (...)
                         {
-                            cerr << "Tango::ZmqEventConsumer::push_heartbeat_event() timeout on channel monitor of " << ipos->first << endl;
+                            string st("Tango::ZmqEventConsumer::push_heartbeat_event() timeout on channel monitor of ");
+							st = st + ipos->first;
+							print_error_message(st.c_str());
                         }
                         break;
                     }
@@ -1685,7 +1755,11 @@ void ZmqEventConsumer::push_heartbeat_event(string &ev_name)
             }
         }
         if (loop == env_var_fqdn_prefix.size())
-            cerr << "No entry in channel map for heartbeat " << ev_name << "!" << endl;
+		{
+            string st("No entry in channel map for heartbeat ");
+			st = st + ev_name;
+			print_error_message(st.c_str());
+		}
     }
 
     map_modification_lock.readerOut();
@@ -2169,7 +2243,9 @@ void ZmqEventConsumer::push_zmq_event(string &ev_name,unsigned char endian,zmq::
                                 }
                                 catch (...)
                                 {
-                                    cerr << "Tango::ZmqEventConsumer::push_structured_event() exception in callback method of " << ipos->first << endl;
+                                    string st("Tango::ZmqEventConsumer::push_structured_event() exception in callback method of ");
+									st = st + ipos->first;
+									print_error_message(st.c_str());
                                 }
 
                                 delete event_data;
@@ -2223,7 +2299,9 @@ void ZmqEventConsumer::push_zmq_event(string &ev_name,unsigned char endian,zmq::
                                 }
                                 catch (...)
                                 {
-                                    cerr << "Tango::ZmqEventConsumer::push_structured_event() exception in callback method of " << ipos->first << endl;
+                                    string st("Tango::ZmqEventConsumer::push_structured_event() exception in callback method of ");
+									st = st + ipos->first;
+									print_error_message(st.c_str());
                                 }
 
                                 delete event_data;
@@ -2253,7 +2331,9 @@ void ZmqEventConsumer::push_zmq_event(string &ev_name,unsigned char endian,zmq::
                                 }
                                 catch (...)
                                 {
-                                    cerr << "Tango::ZmqEventConsumer::push_structured_event() exception in callback method of " << ipos->first << endl;
+                                    string st("Tango::ZmqEventConsumer::push_structured_event() exception in callback method of ");
+									st = st + ipos->first;
+									print_error_message(st.c_str());
                                 }
                                 delete event_data;
                             }
@@ -2303,7 +2383,11 @@ void ZmqEventConsumer::push_zmq_event(string &ev_name,unsigned char endian,zmq::
 
                 string reason = e.errors[0].reason.in();
                 if (reason == "API_CommandTimedOut")
-                    cerr << "Tango::ZmqEventConsumer::push_structured_event() timeout on callback monitor of " << ipos->first << endl;
+				{
+                    string st("Tango::ZmqEventConsumer::push_structured_event() timeout on callback monitor of ");
+					st = st + ipos->first;
+					print_error_message(st.c_str());
+				}
 
                 break;
             }
@@ -2319,7 +2403,10 @@ void ZmqEventConsumer::push_zmq_event(string &ev_name,unsigned char endian,zmq::
                     map_modification_lock.readerOut();
                 }
 
-                cerr << "Tango::ZmqEventConsumer::push_structured_event(): - " << ipos->first << " - Unknown exception (Not a DevFailed) while calling Callback " << endl;
+                string st("Tango::ZmqEventConsumer::push_structured_event(): - ");
+				st = st + ipos->first;
+				st = st + " - Unknown exception (Not a DevFailed) while calling Callback ";
+				print_error_message(st.c_str());
 
                 break;
             }
@@ -2332,7 +2419,10 @@ void ZmqEventConsumer::push_zmq_event(string &ev_name,unsigned char endian,zmq::
 
     if (loop == env_var_fqdn_prefix.size())
     {
-        cerr << "Event " << ev_name << " not found in event callback map !!!" << endl;
+        string st("Event ");
+		st = st + ev_name;
+		st = st + " not found in event callback map !!!";
+		print_error_message(st.c_str());
 		// even if nothing was found in the map, free the lock
         map_modification_lock.readerOut();
     }
@@ -2340,6 +2430,30 @@ void ZmqEventConsumer::push_zmq_event(string &ev_name,unsigned char endian,zmq::
 
 //+----------------------------------------------------------------------------
 //
+// method : 		ZmqEventConsumer::print_error_message
+//
+// description :    Print error message on stderr but first print date
+//
+// argument(s) : in : mess : The user error message
+//
+//-----------------------------------------------------------------------------
+
+void ZmqEventConsumer::print_error_message(const char *mess)
+{
+	time_t tmp_val = time(NULL);
+					
+	char tmp_date[128];
+#ifdef _TG_WINDOWS_
+	ctime_s(tmp_date,128,&tmp_val);
+#else
+	ctime_r(&tmp_val,tmp_date);
+#endif
+	tmp_date[strlen(tmp_date) - 1] = '\0';
+	cerr << tmp_date << ": " << mess << endl;
+}
+
+//+----------------------------------------------------------------------------
+//
 // method : 		ZmqAttrValUnion::operator<<=()
 //
 // description :    Write our own unmarshalling method. The omniORB one
diff --git a/lib/cpp/server/Makefile.in b/lib/cpp/server/Makefile.in
index c4905fd..67f3a68 100644
--- a/lib/cpp/server/Makefile.in
+++ b/lib/cpp/server/Makefile.in
@@ -285,7 +285,6 @@ VERSION_INFO = @VERSION_INFO@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ZMQ_PREFIX = @ZMQ_PREFIX@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
diff --git a/lib/cpp/server/attrdesc.cpp b/lib/cpp/server/attrdesc.cpp
index 2b77544..5e9e00d 100644
--- a/lib/cpp/server/attrdesc.cpp
+++ b/lib/cpp/server/attrdesc.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: attrdesc.cpp 20238 2012-05-18 15:31:33Z trogucki $\n$Name$";
+static const char *RcsId = "$Id: attrdesc.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //+============================================================================
 //
@@ -36,7 +36,7 @@ static const char *RcsId = "$Id: attrdesc.cpp 20238 2012-05-18 15:31:33Z troguck
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20238 $
+// $Revision: 20437 $
 //
 //-============================================================================
 
diff --git a/lib/cpp/server/attrdesc.h b/lib/cpp/server/attrdesc.h
index 0f76364..ec3e38d 100644
--- a/lib/cpp/server/attrdesc.h
+++ b/lib/cpp/server/attrdesc.h
@@ -32,7 +32,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20285 $
+// $Revision: 20440 $
 //
 //=============================================================================
 
@@ -57,8 +57,8 @@ class WAttribute;
  * this UserDefaultAttrProp class) and finally a Tango library default
  * value
  *
- * $Author: taurel $
- * $Revision: 20285 $
+ * $Author: trogucki $
+ * $Revision: 20440 $
  */
 
 class UserDefaultAttrProp
@@ -278,6 +278,36 @@ public:
 		archive_period = def_archive_period;
 	}
 //@}
+	
+	void set_abs_change(const char *def_abs_change)
+	{
+		set_event_abs_change(def_abs_change);
+	}
+	
+	void set_rel_change(const char *def_rel_change)
+	{
+		set_event_rel_change(def_rel_change);
+	}
+	
+	void set_period(const char *def_period)
+	{
+		set_event_period(def_period);
+	}
+	
+	void set_archive_abs_change(const char *def_archive_abs_change)
+	{
+		set_archive_event_abs_change(def_archive_abs_change);
+	}
+	
+	void set_archive_rel_change(const char *def_archive_rel_change)
+	{
+		set_archive_event_rel_change(def_archive_rel_change);
+	}
+	
+	void set_archive_period(const char *def_archive_period)
+	{
+		set_archive_event_period(def_archive_period);
+	}
 
 	string 			label;
 	string 			description;
@@ -319,8 +349,8 @@ private:
  * database allows the Tango core software to create the Attribute object
  * for the attribute created by the user.
  *
- * $Author: taurel $
- * $Revision: 20285 $
+ * $Author: trogucki $
+ * $Revision: 20440 $
  */
 
 class Attr
@@ -556,8 +586,8 @@ private:
  * database allows the Tango core software to create the Attribute object
  * for the attribute created by the user.
  *
- * $Author: taurel $
- * $Revision: 20285 $
+ * $Author: trogucki $
+ * $Revision: 20440 $
  */
 
 class SpectrumAttr: public Attr
@@ -651,8 +681,8 @@ private:
  * database allows the Tango core software to create the Attribute object
  * for the attribute created by the user.
  *
- * $Author: taurel $
- * $Revision: 20285 $
+ * $Author: trogucki $
+ * $Revision: 20440 $
  */
 
 class ImageAttr: public SpectrumAttr
diff --git a/lib/cpp/server/attribute.cpp b/lib/cpp/server/attribute.cpp
index fcbbfd5..a1f6d0d 100644
--- a/lib/cpp/server/attribute.cpp
+++ b/lib/cpp/server/attribute.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: attribute.cpp 20285 2012-05-23 10:46:43Z taurel $\n$Name$";
+static const char *RcsId = "$Id: attribute.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //+============================================================================
 //
@@ -34,7 +34,7 @@ static const char *RcsId = "$Id: attribute.cpp 20285 2012-05-23 10:46:43Z taurel
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20285 $
+// $Revision: 20437 $
 //
 //-============================================================================
 
diff --git a/lib/cpp/server/attribute.h b/lib/cpp/server/attribute.h
index 8f50d28..49d3c7d 100644
--- a/lib/cpp/server/attribute.h
+++ b/lib/cpp/server/attribute.h
@@ -31,7 +31,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20285 $
+// $Revision: 20437 $
 //
 //=============================================================================
 
@@ -157,7 +157,7 @@ class EventSupplier;
  * This class represents a Tango attribute.
  *
  * $Author: taurel $
- * $Revision: 20285 $
+ * $Revision: 20437 $
  */
 
 class Attribute
diff --git a/lib/cpp/server/attrmanip.cpp b/lib/cpp/server/attrmanip.cpp
index 9e5ca4b..dd00d6f 100644
--- a/lib/cpp/server/attrmanip.cpp
+++ b/lib/cpp/server/attrmanip.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: attrmanip.cpp 18627 2011-12-12 13:19:55Z taurel $\n$Name$";
+static const char *RcsId = "$Id: attrmanip.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //+============================================================================
 //
@@ -30,7 +30,7 @@ static const char *RcsId = "$Id: attrmanip.cpp 18627 2011-12-12 13:19:55Z taurel
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 //-============================================================================
 
diff --git a/lib/cpp/server/attrmanip.h b/lib/cpp/server/attrmanip.h
index a0d8e7c..a549556 100644
--- a/lib/cpp/server/attrmanip.h
+++ b/lib/cpp/server/attrmanip.h
@@ -28,7 +28,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20402 $
+// $Revision: 20437 $
 //
 //=============================================================================
 
diff --git a/lib/cpp/server/auto_tango_monitor.h b/lib/cpp/server/auto_tango_monitor.h
index 8b5505a..909edeb 100644
--- a/lib/cpp/server/auto_tango_monitor.h
+++ b/lib/cpp/server/auto_tango_monitor.h
@@ -29,7 +29,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 19888 $
+// $Revision: 20437 $
 //
 // $Log$
 // Revision 3.6  2010/09/09 13:44:46  taurel
diff --git a/lib/cpp/server/basiccommand.cpp b/lib/cpp/server/basiccommand.cpp
index 91e9e67..276a5d3 100644
--- a/lib/cpp/server/basiccommand.cpp
+++ b/lib/cpp/server/basiccommand.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: basiccommand.cpp 20402 2012-05-29 14:26:53Z taurel $\n$Name$";
+static const char *RcsId = "$Id: basiccommand.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //+============================================================================
 //
@@ -33,7 +33,7 @@ static const char *RcsId = "$Id: basiccommand.cpp 20402 2012-05-29 14:26:53Z tau
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20402 $
+// $Revision: 20437 $
 //
 //-============================================================================
 
diff --git a/lib/cpp/server/basiccommand.h b/lib/cpp/server/basiccommand.h
index d13efb8..0ac828e 100644
--- a/lib/cpp/server/basiccommand.h
+++ b/lib/cpp/server/basiccommand.h
@@ -32,7 +32,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20402 $
+// $Revision: 20437 $
 //
 //=============================================================================
 
diff --git a/lib/cpp/server/blackbox.cpp b/lib/cpp/server/blackbox.cpp
index 2a6687a..7e489a8 100644
--- a/lib/cpp/server/blackbox.cpp
+++ b/lib/cpp/server/blackbox.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: blackbox.cpp 20285 2012-05-23 10:46:43Z taurel $\n$Name$";
+static const char *RcsId = "$Id: blackbox.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //+============================================================================
 //
@@ -36,7 +36,7 @@ static const char *RcsId = "$Id: blackbox.cpp 20285 2012-05-23 10:46:43Z taurel
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20285 $
+// $Revision: 20437 $
 //
 //-============================================================================
 
diff --git a/lib/cpp/server/blackbox.h b/lib/cpp/server/blackbox.h
index 300dd12..868ab93 100644
--- a/lib/cpp/server/blackbox.h
+++ b/lib/cpp/server/blackbox.h
@@ -31,7 +31,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20278 $
+// $Revision: 20437 $
 //
 //=============================================================================
 
diff --git a/lib/cpp/server/class_factory.cpp b/lib/cpp/server/class_factory.cpp
index cd2bc33..cb696de 100644
--- a/lib/cpp/server/class_factory.cpp
+++ b/lib/cpp/server/class_factory.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: class_factory.cpp 18907 2012-01-13 13:15:55Z taurel $\n$Name$";
+static const char *RcsId = "$Id: class_factory.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //+===========================================================================
 //
@@ -36,7 +36,7 @@ static const char *RcsId = "$Id: class_factory.cpp 18907 2012-01-13 13:15:55Z ta
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18907 $
+// $Revision: 20437 $
 //
 //-===========================================================================
 
diff --git a/lib/cpp/server/classattribute.cpp b/lib/cpp/server/classattribute.cpp
index f533d24..17e3e75 100644
--- a/lib/cpp/server/classattribute.cpp
+++ b/lib/cpp/server/classattribute.cpp
@@ -1,5 +1,5 @@
 
-static const char *RcsId = "$Id: classattribute.cpp 20285 2012-05-23 10:46:43Z taurel $\n$Name$";
+static const char *RcsId = "$Id: classattribute.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //+============================================================================
 //
@@ -39,7 +39,7 @@ static const char *RcsId = "$Id: classattribute.cpp 20285 2012-05-23 10:46:43Z t
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20285 $
+// $Revision: 20437 $
 //
 //-============================================================================
 
diff --git a/lib/cpp/server/classattribute.h b/lib/cpp/server/classattribute.h
index 5d7b619..1293a93 100644
--- a/lib/cpp/server/classattribute.h
+++ b/lib/cpp/server/classattribute.h
@@ -40,7 +40,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 //=============================================================================
 
diff --git a/lib/cpp/server/command.cpp b/lib/cpp/server/command.cpp
index 4efd8e6..25d68a1 100644
--- a/lib/cpp/server/command.cpp
+++ b/lib/cpp/server/command.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: command.cpp 19492 2012-02-28 17:33:09Z trogucki $\n$Name$";
+static const char *RcsId = "$Id: command.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //+============================================================================
 //
@@ -34,7 +34,7 @@ static const char *RcsId = "$Id: command.cpp 19492 2012-02-28 17:33:09Z trogucki
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 19492 $
+// $Revision: 20437 $
 //
 //-============================================================================
 
diff --git a/lib/cpp/server/command.h b/lib/cpp/server/command.h
index 71bb8bc..feee1da 100644
--- a/lib/cpp/server/command.h
+++ b/lib/cpp/server/command.h
@@ -30,7 +30,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18899 $
+// $Revision: 20437 $
 //
 //=============================================================================
 
@@ -74,7 +74,7 @@ typedef bool (DeviceImpl::*ALLO_PTR)(const CORBA::Any &);
  * with the template command model
  *
  * $Author: taurel $
- * $Revision: 18899 $
+ * $Revision: 20437 $
  */
 
 class Command
@@ -1236,7 +1236,7 @@ private:
  * without input or output parameter
  *
  * $Author: taurel $
- * $Revision: 18899 $
+ * $Revision: 20437 $
  */
 
 class TemplCommand:public Command
@@ -1617,7 +1617,7 @@ protected:
  *<p>Usage : new TemplCommandInOut<Tango::DevLong,Tango::DevFloat>(...);</p>
  *
  * $Author: taurel $
- * $Revision: 18899 $
+ * $Revision: 20437 $
  */
 
 template <typename INARG,typename OUTARG>
@@ -2284,7 +2284,7 @@ CORBA::Any *TemplCommandInOut<INARG,OUTARG>::execute(DeviceImpl *dev_ptr,const C
  *<p>Usage : new TemplCommandIn<Tango::DevLong>(...);</p>
  *
  * $Author: taurel $
- * $Revision: 18899 $
+ * $Revision: 20437 $
  */
 
 
@@ -2947,7 +2947,7 @@ CORBA::Any *TemplCommandIn<INARG>::execute(DeviceImpl *dev_ptr,const CORBA::Any
  *<p>Usage : new TemplCommandOut<Tango::DevLong>(...);</p>
  *
  * $Author: taurel $
- * $Revision: 18899 $
+ * $Revision: 20437 $
  */
 
 template <typename OUTARG>
diff --git a/lib/cpp/server/coutappender.cpp b/lib/cpp/server/coutappender.cpp
index 63dd311..05aff20 100644
--- a/lib/cpp/server/coutappender.cpp
+++ b/lib/cpp/server/coutappender.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: coutappender.cpp 18627 2011-12-12 13:19:55Z taurel $\n$Name$";
+static const char *RcsId = "$Id: coutappender.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //+=============================================================================
 //
@@ -30,7 +30,7 @@ static const char *RcsId = "$Id: coutappender.cpp 18627 2011-12-12 13:19:55Z tau
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 // $Log$
 // Revision 3.6  2010/09/09 13:44:46  taurel
diff --git a/lib/cpp/server/coutappender.h b/lib/cpp/server/coutappender.h
index 06e4673..bc07b0f 100644
--- a/lib/cpp/server/coutappender.h
+++ b/lib/cpp/server/coutappender.h
@@ -23,7 +23,7 @@
  *
  * by NL - SOLEIL - 01/2003.
  *
- * $Revision: 18627 $
+ * $Revision: 20437 $
  *
  */
 
diff --git a/lib/cpp/server/coutbuf.h b/lib/cpp/server/coutbuf.h
index 09bf830..fcae875 100644
--- a/lib/cpp/server/coutbuf.h
+++ b/lib/cpp/server/coutbuf.h
@@ -28,7 +28,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 //=============================================================================
 
diff --git a/lib/cpp/server/dev_event.cpp b/lib/cpp/server/dev_event.cpp
index 8e4f1ac..b7750a6 100644
--- a/lib/cpp/server/dev_event.cpp
+++ b/lib/cpp/server/dev_event.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: dev_event.cpp 18627 2011-12-12 13:19:55Z taurel $\n$Name$";
+static const char *RcsId = "$Id: dev_event.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //+============================================================================
 //
@@ -31,7 +31,7 @@ static const char *RcsId = "$Id: dev_event.cpp 18627 2011-12-12 13:19:55Z taurel
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 //-============================================================================
 
diff --git a/lib/cpp/server/device.cpp b/lib/cpp/server/device.cpp
index 3ebafc1..b62085d 100644
--- a/lib/cpp/server/device.cpp
+++ b/lib/cpp/server/device.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: device.cpp 20285 2012-05-23 10:46:43Z taurel $";
+static const char *RcsId = "$Id: device.cpp 20437 2012-05-31 12:33:29Z taurel $";
 
 //+============================================================================
 //
@@ -35,7 +35,7 @@ static const char *RcsId = "$Id: device.cpp 20285 2012-05-23 10:46:43Z taurel $"
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20285 $
+// $Revision: 20437 $
 //
 //-============================================================================
 
diff --git a/lib/cpp/server/device.h b/lib/cpp/server/device.h
index 8124a12..38829a7 100644
--- a/lib/cpp/server/device.h
+++ b/lib/cpp/server/device.h
@@ -28,7 +28,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20285 $
+// $Revision: 20437 $
 //
 //=============================================================================
 
@@ -77,7 +77,7 @@ class Util;
  * implemented.
  *
  * $Author: taurel $
- * $Revision: 20285 $
+ * $Revision: 20437 $
  */
 
 class DeviceImpl : public virtual POA_Tango::Device
diff --git a/lib/cpp/server/device_2.cpp b/lib/cpp/server/device_2.cpp
index 49b212a..7691061 100644
--- a/lib/cpp/server/device_2.cpp
+++ b/lib/cpp/server/device_2.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: device_2.cpp 20285 2012-05-23 10:46:43Z taurel $\n$Name$";
+static const char *RcsId = "$Id: device_2.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //+============================================================================
 //
@@ -35,7 +35,7 @@ static const char *RcsId = "$Id: device_2.cpp 20285 2012-05-23 10:46:43Z taurel
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20285 $
+// $Revision: 20437 $
 //
 //-============================================================================
 
diff --git a/lib/cpp/server/device_2.h b/lib/cpp/server/device_2.h
index 2d05dd3..e23e33a 100644
--- a/lib/cpp/server/device_2.h
+++ b/lib/cpp/server/device_2.h
@@ -31,7 +31,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18898 $
+// $Revision: 20437 $
 //
 //=============================================================================
 
@@ -68,7 +68,7 @@ class DeviceClass;
  * which inherits from the original Device interface
  *
  * $Author: taurel $
- * $Revision: 18898 $
+ * $Revision: 20437 $
  */
 
 class Device_2Impl : public virtual POA_Tango::Device_2,
diff --git a/lib/cpp/server/device_3.cpp b/lib/cpp/server/device_3.cpp
index 5d6b06f..397229d 100644
--- a/lib/cpp/server/device_3.cpp
+++ b/lib/cpp/server/device_3.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: device_3.cpp 20285 2012-05-23 10:46:43Z taurel $\n$Name$";
+static const char *RcsId = "$Id: device_3.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //+============================================================================
 //
@@ -35,7 +35,7 @@ static const char *RcsId = "$Id: device_3.cpp 20285 2012-05-23 10:46:43Z taurel
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20285 $
+// $Revision: 20437 $
 //
 //-============================================================================
 
diff --git a/lib/cpp/server/device_3.h b/lib/cpp/server/device_3.h
index a9d8b14..9df6d55 100644
--- a/lib/cpp/server/device_3.h
+++ b/lib/cpp/server/device_3.h
@@ -76,7 +76,7 @@ struct AttIdx
  * which inherits from the original Device interface
  *
  * $Author: taurel $
- * $Revision: 18898 $
+ * $Revision: 20437 $
  */
 
 class Device_3Impl : public virtual POA_Tango::Device_3,
diff --git a/lib/cpp/server/device_4.cpp b/lib/cpp/server/device_4.cpp
index 07bae84..3b34a40 100644
--- a/lib/cpp/server/device_4.cpp
+++ b/lib/cpp/server/device_4.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: device_4.cpp 19888 2012-04-03 08:15:24Z taurel $";
+static const char *RcsId = "$Id: device_4.cpp 20437 2012-05-31 12:33:29Z taurel $";
 
 //+============================================================================
 //
@@ -35,7 +35,7 @@ static const char *RcsId = "$Id: device_4.cpp 19888 2012-04-03 08:15:24Z taurel
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 19888 $
+// $Revision: 20437 $
 //
 // $Log$
 // Revision 3.12  2010/09/09 13:45:22  taurel
diff --git a/lib/cpp/server/device_4.h b/lib/cpp/server/device_4.h
index b2708a8..55dad40 100644
--- a/lib/cpp/server/device_4.h
+++ b/lib/cpp/server/device_4.h
@@ -31,7 +31,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18898 $
+// $Revision: 20437 $
 //
 //
 //=============================================================================
@@ -69,7 +69,7 @@ namespace Tango
  * which inherits from the original Device interface
  *
  * $Author: taurel $
- * $Revision: 18898 $
+ * $Revision: 20437 $
  */
 
 class Device_4Impl : public virtual POA_Tango::Device_4,
diff --git a/lib/cpp/server/deviceclass.cpp b/lib/cpp/server/deviceclass.cpp
index d9d3d78..bf03fd1 100644
--- a/lib/cpp/server/deviceclass.cpp
+++ b/lib/cpp/server/deviceclass.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: deviceclass.cpp 19874 2012-04-02 07:35:13Z taurel $\n$Name$";
+static const char *RcsId = "$Id: deviceclass.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //+============================================================================
 //
@@ -33,7 +33,7 @@ static const char *RcsId = "$Id: deviceclass.cpp 19874 2012-04-02 07:35:13Z taur
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 19874 $
+// $Revision: 20437 $
 //
 //-============================================================================
 
diff --git a/lib/cpp/server/deviceclass.h b/lib/cpp/server/deviceclass.h
index 1bc7ada..5f80858 100644
--- a/lib/cpp/server/deviceclass.h
+++ b/lib/cpp/server/deviceclass.h
@@ -28,7 +28,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20285 $
+// $Revision: 20437 $
 //
 //
 //=============================================================================
@@ -66,7 +66,7 @@ class DServer;
  * device class
  *
  * $Author: taurel $
- * $Revision: 20285 $
+ * $Revision: 20437 $
  */
 
 class
diff --git a/lib/cpp/server/devicelog.cpp b/lib/cpp/server/devicelog.cpp
index 34ac309..f314645 100644
--- a/lib/cpp/server/devicelog.cpp
+++ b/lib/cpp/server/devicelog.cpp
@@ -28,7 +28,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20259 $
+// $Revision: 20437 $
 //
 // $Log$
 // Revision 3.14  2010/09/09 13:45:22  taurel
diff --git a/lib/cpp/server/dserver.cpp b/lib/cpp/server/dserver.cpp
index bf933d8..9f8898c 100644
--- a/lib/cpp/server/dserver.cpp
+++ b/lib/cpp/server/dserver.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: dserver.cpp 20020 2012-04-18 14:11:12Z taurel $\n$Name$";
+static const char *RcsId = "$Id: dserver.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //+=============================================================================
 //
@@ -34,7 +34,7 @@ static const char *RcsId = "$Id: dserver.cpp 20020 2012-04-18 14:11:12Z taurel $
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20020 $
+// $Revision: 20437 $
 //
 //-=============================================================================
 
diff --git a/lib/cpp/server/dserver.h b/lib/cpp/server/dserver.h
index f39fa23..ef4cfe6 100644
--- a/lib/cpp/server/dserver.h
+++ b/lib/cpp/server/dserver.h
@@ -31,7 +31,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20157 $
+// $Revision: 20437 $
 //
 //=============================================================================
 
diff --git a/lib/cpp/server/dserverclass.cpp b/lib/cpp/server/dserverclass.cpp
index 9e81d83..ad77805 100644
--- a/lib/cpp/server/dserverclass.cpp
+++ b/lib/cpp/server/dserverclass.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: dserverclass.cpp 20285 2012-05-23 10:46:43Z taurel $\n$Name$";
+static const char *RcsId = "$Id: dserverclass.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //+=============================================================================
 //
@@ -34,7 +34,7 @@ static const char *RcsId = "$Id: dserverclass.cpp 20285 2012-05-23 10:46:43Z tau
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20285 $
+// $Revision: 20437 $
 //
 //-=============================================================================
 
diff --git a/lib/cpp/server/dserverclass.h b/lib/cpp/server/dserverclass.h
index fe0d5e2..b484481 100644
--- a/lib/cpp/server/dserverclass.h
+++ b/lib/cpp/server/dserverclass.h
@@ -35,7 +35,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20402 $
+// $Revision: 20437 $
 //
 //=============================================================================
 
diff --git a/lib/cpp/server/dserverlock.cpp b/lib/cpp/server/dserverlock.cpp
index 1b1f5bb..2a45d0b 100644
--- a/lib/cpp/server/dserverlock.cpp
+++ b/lib/cpp/server/dserverlock.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: dserverlock.cpp 19138 2012-01-31 16:55:49Z taurel $\n$Name$";
+static const char *RcsId = "$Id: dserverlock.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //+=============================================================================
 //
@@ -34,7 +34,7 @@ static const char *RcsId = "$Id: dserverlock.cpp 19138 2012-01-31 16:55:49Z taur
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 19138 $
+// $Revision: 20437 $
 //
 //-=============================================================================
 
diff --git a/lib/cpp/server/dserverlog.cpp b/lib/cpp/server/dserverlog.cpp
index e9ffd7b..09b18f6 100644
--- a/lib/cpp/server/dserverlog.cpp
+++ b/lib/cpp/server/dserverlog.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: dserverlog.cpp 18627 2011-12-12 13:19:55Z taurel $\n$Name$";
+static const char *RcsId = "$Id: dserverlog.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //+=============================================================================
 //
@@ -30,7 +30,7 @@ static const char *RcsId = "$Id: dserverlog.cpp 18627 2011-12-12 13:19:55Z taure
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 // $Log$
 // Revision 3.7  2010/09/09 13:45:22  taurel
diff --git a/lib/cpp/server/dserverpoll.cpp b/lib/cpp/server/dserverpoll.cpp
index 4726d4b..3d2caa1 100644
--- a/lib/cpp/server/dserverpoll.cpp
+++ b/lib/cpp/server/dserverpoll.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: dserverpoll.cpp 20285 2012-05-23 10:46:43Z taurel $\n$Name$";
+static const char *RcsId = "$Id: dserverpoll.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //+=============================================================================
 //
@@ -34,7 +34,7 @@ static const char *RcsId = "$Id: dserverpoll.cpp 20285 2012-05-23 10:46:43Z taur
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20285 $
+// $Revision: 20437 $
 //
 //-=============================================================================
 
diff --git a/lib/cpp/server/dserversignal.cpp b/lib/cpp/server/dserversignal.cpp
index 7e35005..48614a5 100644
--- a/lib/cpp/server/dserversignal.cpp
+++ b/lib/cpp/server/dserversignal.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: dserversignal.cpp 18627 2011-12-12 13:19:55Z taurel $\n$Name$";
+static const char *RcsId = "$Id: dserversignal.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //+=============================================================================
 //
@@ -34,7 +34,7 @@ static const char *RcsId = "$Id: dserversignal.cpp 18627 2011-12-12 13:19:55Z ta
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 //-=============================================================================
 
diff --git a/lib/cpp/server/dserversignal.h b/lib/cpp/server/dserversignal.h
index 708a56a..4afee7c 100644
--- a/lib/cpp/server/dserversignal.h
+++ b/lib/cpp/server/dserversignal.h
@@ -31,7 +31,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 19456 $
+// $Revision: 20437 $
 //
 //=============================================================================
 
diff --git a/lib/cpp/server/encoded_attribute.cpp b/lib/cpp/server/encoded_attribute.cpp
index ae0c392..f57f075 100644
--- a/lib/cpp/server/encoded_attribute.cpp
+++ b/lib/cpp/server/encoded_attribute.cpp
@@ -28,7 +28,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18899 $
+// $Revision: 20437 $
 //
 //
 //=============================================================================
diff --git a/lib/cpp/server/encoded_attribute.h b/lib/cpp/server/encoded_attribute.h
index 495ccd2..d5a84ca 100644
--- a/lib/cpp/server/encoded_attribute.h
+++ b/lib/cpp/server/encoded_attribute.h
@@ -28,7 +28,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18898 $
+// $Revision: 20437 $
 //
 //
 //=============================================================================
diff --git a/lib/cpp/server/encoded_format.h b/lib/cpp/server/encoded_format.h
index 7feba50..421e5bc 100644
--- a/lib/cpp/server/encoded_format.h
+++ b/lib/cpp/server/encoded_format.h
@@ -29,7 +29,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 // $Log$
 //
diff --git a/lib/cpp/server/eventcmds.cpp b/lib/cpp/server/eventcmds.cpp
index 1af3523..cbf0014 100644
--- a/lib/cpp/server/eventcmds.cpp
+++ b/lib/cpp/server/eventcmds.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: eventcmds.cpp 20157 2012-05-10 09:13:55Z taurel $";
+static const char *RcsId = "$Id: eventcmds.cpp 20437 2012-05-31 12:33:29Z taurel $";
 //+=============================================================================
 //
 // file :        eventcmds.cpp
@@ -30,7 +30,7 @@ static const char *RcsId = "$Id: eventcmds.cpp 20157 2012-05-10 09:13:55Z taurel
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20157 $
+// $Revision: 20437 $
 //
 //-=============================================================================
 
diff --git a/lib/cpp/server/eventcmds.h b/lib/cpp/server/eventcmds.h
index 518bdf9..7a96214 100644
--- a/lib/cpp/server/eventcmds.h
+++ b/lib/cpp/server/eventcmds.h
@@ -29,7 +29,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 17558 $
+// $Revision: 20437 $
 //
 // $Log$
 // Revision 1.6  2010/09/09 13:46:00  taurel
diff --git a/lib/cpp/server/eventsupplier.cpp b/lib/cpp/server/eventsupplier.cpp
index ff67319..f79f1a5 100644
--- a/lib/cpp/server/eventsupplier.cpp
+++ b/lib/cpp/server/eventsupplier.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: eventsupplier.cpp 20285 2012-05-23 10:46:43Z taurel $";
+static const char *RcsId = "$Id: eventsupplier.cpp 20437 2012-05-31 12:33:29Z taurel $";
 
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ -34,7 +34,7 @@ static const char *RcsId = "$Id: eventsupplier.cpp 20285 2012-05-23 10:46:43Z ta
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-//		$Revision: 20285 $
+//		$Revision: 20437 $
 //
 //
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/lib/cpp/server/eventsupplier.h b/lib/cpp/server/eventsupplier.h
index 7efb0ef..4425c19 100644
--- a/lib/cpp/server/eventsupplier.h
+++ b/lib/cpp/server/eventsupplier.h
@@ -32,7 +32,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 ///
-/// 		$Revision: 19692 $
+/// 		$Revision: 20437 $
 ///
 /// 		copyright : European Synchrotron Radiation Facility
 ///                         BP 220, Grenoble 38043
diff --git a/lib/cpp/server/except.cpp b/lib/cpp/server/except.cpp
index 44ff3a1..384fcbd 100644
--- a/lib/cpp/server/except.cpp
+++ b/lib/cpp/server/except.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: except.cpp 18630 2011-12-12 13:51:20Z taurel $\n$Name$";
+static const char *RcsId = "$Id: except.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //+=============================================================================
 //
@@ -31,7 +31,7 @@ static const char *RcsId = "$Id: except.cpp 18630 2011-12-12 13:51:20Z taurel $\
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18630 $
+// $Revision: 20437 $
 //
 //-=============================================================================
 
diff --git a/lib/cpp/server/except.h b/lib/cpp/server/except.h
index 1062c9a..17576ca 100644
--- a/lib/cpp/server/except.h
+++ b/lib/cpp/server/except.h
@@ -28,7 +28,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 //=============================================================================
 
@@ -61,7 +61,7 @@ namespace Tango
  * static methods
  *
  * $Author: taurel $
- * $Revision: 18627 $
+ * $Revision: 20437 $
  */
 
 class Except
diff --git a/lib/cpp/server/idl/Makefile.in b/lib/cpp/server/idl/Makefile.in
index 6800691..a43c49a 100644
--- a/lib/cpp/server/idl/Makefile.in
+++ b/lib/cpp/server/idl/Makefile.in
@@ -212,7 +212,6 @@ VERSION_INFO = @VERSION_INFO@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ZMQ_PREFIX = @ZMQ_PREFIX@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
diff --git a/lib/cpp/server/jpeg/Makefile.in b/lib/cpp/server/jpeg/Makefile.in
index 24fbbe9..1410896 100644
--- a/lib/cpp/server/jpeg/Makefile.in
+++ b/lib/cpp/server/jpeg/Makefile.in
@@ -209,7 +209,6 @@ VERSION_INFO = @VERSION_INFO@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ZMQ_PREFIX = @ZMQ_PREFIX@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
diff --git a/lib/cpp/server/jpeg/jpeg_bitstream.cpp b/lib/cpp/server/jpeg/jpeg_bitstream.cpp
index dcd966d..5c80e60 100644
--- a/lib/cpp/server/jpeg/jpeg_bitstream.cpp
+++ b/lib/cpp/server/jpeg/jpeg_bitstream.cpp
@@ -29,7 +29,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 // $Log$
 // Revision 1.3  2009/11/02 08:36:17  taurel
diff --git a/lib/cpp/server/jpeg/jpeg_bitstream.h b/lib/cpp/server/jpeg/jpeg_bitstream.h
index 6d9adfe..64daf35 100644
--- a/lib/cpp/server/jpeg/jpeg_bitstream.h
+++ b/lib/cpp/server/jpeg/jpeg_bitstream.h
@@ -29,7 +29,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 // $Log$
 // Revision 1.3  2009/04/20 14:55:58  jlpons
diff --git a/lib/cpp/server/jpeg/jpeg_color.cpp b/lib/cpp/server/jpeg/jpeg_color.cpp
index 9356815..a928ee8 100644
--- a/lib/cpp/server/jpeg/jpeg_color.cpp
+++ b/lib/cpp/server/jpeg/jpeg_color.cpp
@@ -29,7 +29,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 // $Log$
 // Revision 1.3  2009/04/20 14:55:58  jlpons
diff --git a/lib/cpp/server/jpeg/jpeg_const.h b/lib/cpp/server/jpeg/jpeg_const.h
index 19d61bb..15c202d 100644
--- a/lib/cpp/server/jpeg/jpeg_const.h
+++ b/lib/cpp/server/jpeg/jpeg_const.h
@@ -29,7 +29,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 // $Log$
 // Revision 1.2  2009/04/20 14:55:58  jlpons
diff --git a/lib/cpp/server/jpeg/jpeg_dct.cpp b/lib/cpp/server/jpeg/jpeg_dct.cpp
index 2fa3054..a10bdf0 100644
--- a/lib/cpp/server/jpeg/jpeg_dct.cpp
+++ b/lib/cpp/server/jpeg/jpeg_dct.cpp
@@ -29,7 +29,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 // $Log$
 // Revision 1.2  2009/04/20 14:55:58  jlpons
diff --git a/lib/cpp/server/jpeg/jpeg_decoder.cpp b/lib/cpp/server/jpeg/jpeg_decoder.cpp
index de69c3d..80a19c8 100644
--- a/lib/cpp/server/jpeg/jpeg_decoder.cpp
+++ b/lib/cpp/server/jpeg/jpeg_decoder.cpp
@@ -30,7 +30,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 // $Log$
 // Revision 1.4  2009/11/02 08:36:17  taurel
diff --git a/lib/cpp/server/jpeg/jpeg_encoder.cpp b/lib/cpp/server/jpeg/jpeg_encoder.cpp
index 123072c..9335cee 100644
--- a/lib/cpp/server/jpeg/jpeg_encoder.cpp
+++ b/lib/cpp/server/jpeg/jpeg_encoder.cpp
@@ -29,7 +29,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 // $Log$
 // Revision 1.3  2009/09/08 14:23:16  taurel
diff --git a/lib/cpp/server/jpeg/jpeg_lib.h b/lib/cpp/server/jpeg/jpeg_lib.h
index 0d11482..dd1c51b 100644
--- a/lib/cpp/server/jpeg/jpeg_lib.h
+++ b/lib/cpp/server/jpeg/jpeg_lib.h
@@ -30,7 +30,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 // $Log$
 // Revision 1.2  2009/04/20 14:55:58  jlpons
diff --git a/lib/cpp/server/jpeg/jpeg_memory.cpp b/lib/cpp/server/jpeg/jpeg_memory.cpp
index 72e2674..e5fc20d 100644
--- a/lib/cpp/server/jpeg/jpeg_memory.cpp
+++ b/lib/cpp/server/jpeg/jpeg_memory.cpp
@@ -29,7 +29,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 // $Log$
 // Revision 1.4  2009/04/20 14:55:58  jlpons
diff --git a/lib/cpp/server/jpeg/jpeg_memory.h b/lib/cpp/server/jpeg/jpeg_memory.h
index d4209a1..9b0e9f2 100644
--- a/lib/cpp/server/jpeg/jpeg_memory.h
+++ b/lib/cpp/server/jpeg/jpeg_memory.h
@@ -29,7 +29,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 // $Log$
 // Revision 1.2  2009/04/20 14:55:58  jlpons
diff --git a/lib/cpp/server/jpeg_mmx/Makefile.in b/lib/cpp/server/jpeg_mmx/Makefile.in
index b74e3ac..7753577 100644
--- a/lib/cpp/server/jpeg_mmx/Makefile.in
+++ b/lib/cpp/server/jpeg_mmx/Makefile.in
@@ -204,7 +204,6 @@ VERSION_INFO = @VERSION_INFO@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ZMQ_PREFIX = @ZMQ_PREFIX@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
diff --git a/lib/cpp/server/jpeg_mmx/jpeg_color_mmx.cpp b/lib/cpp/server/jpeg_mmx/jpeg_color_mmx.cpp
index e283a12..d08fd7e 100644
--- a/lib/cpp/server/jpeg_mmx/jpeg_color_mmx.cpp
+++ b/lib/cpp/server/jpeg_mmx/jpeg_color_mmx.cpp
@@ -29,7 +29,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 19219 $
+// $Revision: 20437 $
 //
 // $Log$
 // Revision 1.7  2009/08/27 07:24:30  taurel
diff --git a/lib/cpp/server/jpeg_mmx/jpeg_dct_mmx.cpp b/lib/cpp/server/jpeg_mmx/jpeg_dct_mmx.cpp
index 9fc8c0d..80f85a1 100644
--- a/lib/cpp/server/jpeg_mmx/jpeg_dct_mmx.cpp
+++ b/lib/cpp/server/jpeg_mmx/jpeg_dct_mmx.cpp
@@ -29,7 +29,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 19219 $
+// $Revision: 20437 $
 //
 // $Log$
 // Revision 1.9  2009/09/02 08:01:43  taurel
diff --git a/lib/cpp/server/locked_att_value.h b/lib/cpp/server/locked_att_value.h
index ecde022..71cb247 100644
--- a/lib/cpp/server/locked_att_value.h
+++ b/lib/cpp/server/locked_att_value.h
@@ -28,7 +28,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 // $Log$
 //
diff --git a/lib/cpp/server/logcmds.cpp b/lib/cpp/server/logcmds.cpp
index 69c0fc2..11ba036 100644
--- a/lib/cpp/server/logcmds.cpp
+++ b/lib/cpp/server/logcmds.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: logcmds.cpp 18627 2011-12-12 13:19:55Z taurel $\n$Name$";
+static const char *RcsId = "$Id: logcmds.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //+=============================================================================
 //
@@ -30,7 +30,7 @@ static const char *RcsId = "$Id: logcmds.cpp 18627 2011-12-12 13:19:55Z taurel $
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 // $Log$
 // Revision 3.5  2010/09/09 13:46:00  taurel
diff --git a/lib/cpp/server/logcmds.h b/lib/cpp/server/logcmds.h
index 39d1931..a0ee458 100644
--- a/lib/cpp/server/logcmds.h
+++ b/lib/cpp/server/logcmds.h
@@ -28,7 +28,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 //=============================================================================
 
diff --git a/lib/cpp/server/logging.cpp b/lib/cpp/server/logging.cpp
index 4782479..5f163a9 100644
--- a/lib/cpp/server/logging.cpp
+++ b/lib/cpp/server/logging.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: logging.cpp 20285 2012-05-23 10:46:43Z taurel $\n$Name$";
+static const char *RcsId = "$Id: logging.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //+=============================================================================
 //
@@ -30,7 +30,7 @@ static const char *RcsId = "$Id: logging.cpp 20285 2012-05-23 10:46:43Z taurel $
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20285 $
+// $Revision: 20437 $
 //
 //-=============================================================================
 
diff --git a/lib/cpp/server/logging.h b/lib/cpp/server/logging.h
index e8ae457..55b7471 100644
--- a/lib/cpp/server/logging.h
+++ b/lib/cpp/server/logging.h
@@ -28,7 +28,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 //-=============================================================================
 
diff --git a/lib/cpp/server/multiattribute.cpp b/lib/cpp/server/multiattribute.cpp
index f3ba48f..d313dba 100644
--- a/lib/cpp/server/multiattribute.cpp
+++ b/lib/cpp/server/multiattribute.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: multiattribute.cpp 20285 2012-05-23 10:46:43Z taurel $\n$Name$";
+static const char *RcsId = "$Id: multiattribute.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //+============================================================================
 //
@@ -34,7 +34,7 @@ static const char *RcsId = "$Id: multiattribute.cpp 20285 2012-05-23 10:46:43Z t
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20285 $
+// $Revision: 20437 $
 //
 //-============================================================================
 
diff --git a/lib/cpp/server/multiattribute.h b/lib/cpp/server/multiattribute.h
index 46da14c..0b6fcf8 100644
--- a/lib/cpp/server/multiattribute.h
+++ b/lib/cpp/server/multiattribute.h
@@ -30,7 +30,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18898 $
+// $Revision: 20437 $
 //
 //
 //=============================================================================
@@ -75,7 +75,7 @@ struct EventPar
  * multiple attributes
  *
  * $Author: taurel $
- * $Revision: 18898 $
+ * $Revision: 20437 $
  */
 
 class MultiAttribute
diff --git a/lib/cpp/server/pollcmds.cpp b/lib/cpp/server/pollcmds.cpp
index 2711614..53a70a2 100644
--- a/lib/cpp/server/pollcmds.cpp
+++ b/lib/cpp/server/pollcmds.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: pollcmds.cpp 20402 2012-05-29 14:26:53Z taurel $\n$Name$";
+static const char *RcsId = "$Id: pollcmds.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //+=============================================================================
 //
@@ -34,7 +34,7 @@ static const char *RcsId = "$Id: pollcmds.cpp 20402 2012-05-29 14:26:53Z taurel
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20402 $
+// $Revision: 20437 $
 //
 //-=============================================================================
 
diff --git a/lib/cpp/server/pollcmds.h b/lib/cpp/server/pollcmds.h
index 5385e0c..cf047b6 100644
--- a/lib/cpp/server/pollcmds.h
+++ b/lib/cpp/server/pollcmds.h
@@ -35,7 +35,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20402 $
+// $Revision: 20437 $
 //
 //
 //=============================================================================
diff --git a/lib/cpp/server/pollext.h b/lib/cpp/server/pollext.h
index c0fdc84..c99cd39 100644
--- a/lib/cpp/server/pollext.h
+++ b/lib/cpp/server/pollext.h
@@ -178,7 +178,7 @@ public:
  * This class is used to store one element of an attribute history stack.
  *
  * $Author: taurel $
- * $Revision: 20285 $
+ * $Revision: 20437 $
  */
 
 template <typename T>
@@ -767,7 +767,7 @@ public:
  * will be used to store one element of the attribute polling buffer
  *
  * $Author: taurel $
- * $Revision: 20285 $
+ * $Revision: 20437 $
  */
 
 template <typename T>
@@ -839,7 +839,7 @@ public:
  * This class is used to store one element of a command history stack.
  *
  * $Author: taurel $
- * $Revision: 20285 $
+ * $Revision: 20437 $
  */
 
 template <typename T>
@@ -945,7 +945,7 @@ public:
  * will be used to store one element of the command polling buffer
  *
  * $Author: taurel $
- * $Revision: 20285 $
+ * $Revision: 20437 $
  */
 
 template <typename T>
diff --git a/lib/cpp/server/pollobj.cpp b/lib/cpp/server/pollobj.cpp
index f5349ea..c0ec36d 100644
--- a/lib/cpp/server/pollobj.cpp
+++ b/lib/cpp/server/pollobj.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: pollobj.cpp 20402 2012-05-29 14:26:53Z taurel $\n$Name$";
+static const char *RcsId = "$Id: pollobj.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //+============================================================================
 //
@@ -33,7 +33,7 @@ static const char *RcsId = "$Id: pollobj.cpp 20402 2012-05-29 14:26:53Z taurel $
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20402 $
+// $Revision: 20437 $
 //
 //-============================================================================
 
diff --git a/lib/cpp/server/pollobj.h b/lib/cpp/server/pollobj.h
index a1f0b50..1d504ef 100644
--- a/lib/cpp/server/pollobj.h
+++ b/lib/cpp/server/pollobj.h
@@ -31,7 +31,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 //=============================================================================
 
diff --git a/lib/cpp/server/pollring.cpp b/lib/cpp/server/pollring.cpp
index 05f8c4a..d952e21 100644
--- a/lib/cpp/server/pollring.cpp
+++ b/lib/cpp/server/pollring.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: pollring.cpp 19138 2012-01-31 16:55:49Z taurel $\n$Name$";
+static const char *RcsId = "$Id: pollring.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //+============================================================================
 //
@@ -34,7 +34,7 @@ static const char *RcsId = "$Id: pollring.cpp 19138 2012-01-31 16:55:49Z taurel
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 19138 $
+// $Revision: 20437 $
 //
 //-============================================================================
 
diff --git a/lib/cpp/server/pollring.h b/lib/cpp/server/pollring.h
index 9b873c2..cf14722 100644
--- a/lib/cpp/server/pollring.h
+++ b/lib/cpp/server/pollring.h
@@ -31,7 +31,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 //=============================================================================
 
diff --git a/lib/cpp/server/pollthread.cpp b/lib/cpp/server/pollthread.cpp
index 50bfc9b..525e822 100644
--- a/lib/cpp/server/pollthread.cpp
+++ b/lib/cpp/server/pollthread.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: pollthread.cpp 20285 2012-05-23 10:46:43Z taurel $\n$Name$";
+static const char *RcsId = "$Id: pollthread.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //+============================================================================
 //
@@ -33,7 +33,7 @@ static const char *RcsId = "$Id: pollthread.cpp 20285 2012-05-23 10:46:43Z taure
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20285 $
+// $Revision: 20437 $
 //
 //-============================================================================
 
diff --git a/lib/cpp/server/pollthread.h b/lib/cpp/server/pollthread.h
index d2e8a83..866ca1a 100644
--- a/lib/cpp/server/pollthread.h
+++ b/lib/cpp/server/pollthread.h
@@ -29,7 +29,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 //=============================================================================
 
diff --git a/lib/cpp/server/seqvec.cpp b/lib/cpp/server/seqvec.cpp
index 84c9098..68cdd57 100644
--- a/lib/cpp/server/seqvec.cpp
+++ b/lib/cpp/server/seqvec.cpp
@@ -28,7 +28,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 //=============================================================================
 
diff --git a/lib/cpp/server/seqvec.h b/lib/cpp/server/seqvec.h
index 8a3e42c..a43fa99 100644
--- a/lib/cpp/server/seqvec.h
+++ b/lib/cpp/server/seqvec.h
@@ -30,7 +30,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20285 $
+// $Revision: 20437 $
 //
 //
 //=============================================================================
diff --git a/lib/cpp/server/subdev_diag.cpp b/lib/cpp/server/subdev_diag.cpp
index 26c57d3..36972e7 100644
--- a/lib/cpp/server/subdev_diag.cpp
+++ b/lib/cpp/server/subdev_diag.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: subdev_diag.cpp 19781 2012-03-21 10:29:24Z taurel $\n$Name$";
+static const char *RcsId = "$Id: subdev_diag.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //+=============================================================================
 //
@@ -31,7 +31,7 @@ static const char *RcsId = "$Id: subdev_diag.cpp 19781 2012-03-21 10:29:24Z taur
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 19781 $
+// $Revision: 20437 $
 //
 //-=============================================================================
 
diff --git a/lib/cpp/server/subdev_diag.h b/lib/cpp/server/subdev_diag.h
index d3825ed..6e8f6b6 100644
--- a/lib/cpp/server/subdev_diag.h
+++ b/lib/cpp/server/subdev_diag.h
@@ -29,7 +29,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 19781 $
+// $Revision: 20437 $
 //
 //=============================================================================
 
diff --git a/lib/cpp/server/tango.h b/lib/cpp/server/tango.h
index 8b43f16..aa398e1 100644
--- a/lib/cpp/server/tango.h
+++ b/lib/cpp/server/tango.h
@@ -28,7 +28,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 19888 $
+// $Revision: 20437 $
 //
 //=============================================================================
 
diff --git a/lib/cpp/server/tango_config.h b/lib/cpp/server/tango_config.h
index ef53f68..2d320f7 100644
--- a/lib/cpp/server/tango_config.h
+++ b/lib/cpp/server/tango_config.h
@@ -29,7 +29,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 19436 $
+// $Revision: 20437 $
 //
 //=============================================================================
 
diff --git a/lib/cpp/server/tango_const.h b/lib/cpp/server/tango_const.h
index 870e2d3..75b9d8f 100644
--- a/lib/cpp/server/tango_const.h
+++ b/lib/cpp/server/tango_const.h
@@ -28,7 +28,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20040 $
+// $Revision: 20437 $
 //
 //=============================================================================
 
diff --git a/lib/cpp/server/tango_monitor.h b/lib/cpp/server/tango_monitor.h
index 16965ad..3beb7f5 100644
--- a/lib/cpp/server/tango_monitor.h
+++ b/lib/cpp/server/tango_monitor.h
@@ -28,7 +28,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20278 $
+// $Revision: 20437 $
 //
 //=============================================================================
 
diff --git a/lib/cpp/server/tangoappender.cpp b/lib/cpp/server/tangoappender.cpp
index f64385b..fb720c1 100644
--- a/lib/cpp/server/tangoappender.cpp
+++ b/lib/cpp/server/tangoappender.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: tangoappender.cpp 18627 2011-12-12 13:19:55Z taurel $\n$Name$";
+static const char *RcsId = "$Id: tangoappender.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //+=============================================================================
 //
@@ -31,7 +31,7 @@ static const char *RcsId = "$Id: tangoappender.cpp 18627 2011-12-12 13:19:55Z ta
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
 //
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 //-=============================================================================
 
diff --git a/lib/cpp/server/tangoappender.h b/lib/cpp/server/tangoappender.h
index fc2e761..5b10caa 100644
--- a/lib/cpp/server/tangoappender.h
+++ b/lib/cpp/server/tangoappender.h
@@ -23,7 +23,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Tango.  If not, see <http://www.gnu.org/licenses/>.
  *
- * $Revision: 18627 $
+ * $Revision: 20437 $
  *
  */
 
diff --git a/lib/cpp/server/tangorollingfileappender.cpp b/lib/cpp/server/tangorollingfileappender.cpp
index e5f85df..60c3e40 100644
--- a/lib/cpp/server/tangorollingfileappender.cpp
+++ b/lib/cpp/server/tangorollingfileappender.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: tangorollingfileappender.cpp 18627 2011-12-12 13:19:55Z taurel $\n$Name$";
+static const char *RcsId = "$Id: tangorollingfileappender.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //+=============================================================================
 //
@@ -30,7 +30,7 @@ static const char *RcsId = "$Id: tangorollingfileappender.cpp 18627 2011-12-12 1
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 //-=============================================================================
 
diff --git a/lib/cpp/server/tangorollingfileappender.h b/lib/cpp/server/tangorollingfileappender.h
index 19fd825..a9c4771 100644
--- a/lib/cpp/server/tangorollingfileappender.h
+++ b/lib/cpp/server/tangorollingfileappender.h
@@ -23,7 +23,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Tango.  If not, see <http://www.gnu.org/licenses/>.
  *
- * $Revision: 18627 $
+ * $Revision: 20437 $
  *
  *
  */
diff --git a/lib/cpp/server/thsig.cpp b/lib/cpp/server/thsig.cpp
index d0ce86c..ec8db62 100644
--- a/lib/cpp/server/thsig.cpp
+++ b/lib/cpp/server/thsig.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: thsig.cpp 18627 2011-12-12 13:19:55Z taurel $\n$Name$";
+static const char *RcsId = "$Id: thsig.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //+=============================================================================
 //
@@ -34,7 +34,7 @@ static const char *RcsId = "$Id: thsig.cpp 18627 2011-12-12 13:19:55Z taurel $\n
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 18627 $
+// $Revision: 20437 $
 //
 //-=============================================================================
 
diff --git a/lib/cpp/server/utils.cpp b/lib/cpp/server/utils.cpp
index fd8c2fb..ad5cc81 100644
--- a/lib/cpp/server/utils.cpp
+++ b/lib/cpp/server/utils.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: utils.cpp 20285 2012-05-23 10:46:43Z taurel $\n$Name$";
+static const char *RcsId = "$Id: utils.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //+=============================================================================
 //
@@ -31,7 +31,7 @@ static const char *RcsId = "$Id: utils.cpp 20285 2012-05-23 10:46:43Z taurel $\n
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20285 $
+// $Revision: 20437 $
 //
 //-=============================================================================
 
diff --git a/lib/cpp/server/utils.h b/lib/cpp/server/utils.h
index ecbd156..89a6833 100644
--- a/lib/cpp/server/utils.h
+++ b/lib/cpp/server/utils.h
@@ -28,7 +28,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20285 $
+// $Revision: 20437 $
 //
 //=============================================================================
 
@@ -144,7 +144,7 @@ public:
  * one instance of this class and its constructor is not public.
  *
  * $Author: taurel $
- * $Revision: 20285 $
+ * $Revision: 20437 $
  */
 
 class Util
diff --git a/lib/cpp/server/utils_polling.cpp b/lib/cpp/server/utils_polling.cpp
index ced1229..29a8529 100644
--- a/lib/cpp/server/utils_polling.cpp
+++ b/lib/cpp/server/utils_polling.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: utils_polling.cpp 20014 2012-04-17 14:07:11Z taurel $";
+static const char *RcsId = "$Id: utils_polling.cpp 20437 2012-05-31 12:33:29Z taurel $";
 
 //+=============================================================================
 //
@@ -31,7 +31,7 @@ static const char *RcsId = "$Id: utils_polling.cpp 20014 2012-04-17 14:07:11Z ta
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20014 $
+// $Revision: 20437 $
 //
 //-=============================================================================
 
diff --git a/lib/cpp/server/utils_shut.cpp b/lib/cpp/server/utils_shut.cpp
index 0aa8a57..d5c3f82 100644
--- a/lib/cpp/server/utils_shut.cpp
+++ b/lib/cpp/server/utils_shut.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: utils_shut.cpp 19692 2012-03-13 16:37:09Z taurel $";
+static const char *RcsId = "$Id: utils_shut.cpp 20437 2012-05-31 12:33:29Z taurel $";
 
 //+=============================================================================
 //
@@ -31,7 +31,7 @@ static const char *RcsId = "$Id: utils_shut.cpp 19692 2012-03-13 16:37:09Z taure
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 19692 $
+// $Revision: 20437 $
 //
 // $Log$
 // Revision 3.8  2010/09/12 12:19:21  taurel
diff --git a/lib/cpp/server/w_attribute.cpp b/lib/cpp/server/w_attribute.cpp
index 47cc1b0..4a316a1 100644
--- a/lib/cpp/server/w_attribute.cpp
+++ b/lib/cpp/server/w_attribute.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Id: w_attribute.cpp 20285 2012-05-23 10:46:43Z taurel $\n$Name$";
+static const char *RcsId = "$Id: w_attribute.cpp 20437 2012-05-31 12:33:29Z taurel $\n$Name$";
 
 //+============================================================================
 //
@@ -34,7 +34,7 @@ static const char *RcsId = "$Id: w_attribute.cpp 20285 2012-05-23 10:46:43Z taur
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20285 $
+// $Revision: 20437 $
 //
 //-============================================================================
 
diff --git a/lib/cpp/server/w_attribute.h b/lib/cpp/server/w_attribute.h
index de0cb6a..8f6cffa 100644
--- a/lib/cpp/server/w_attribute.h
+++ b/lib/cpp/server/w_attribute.h
@@ -28,7 +28,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with Tango.  If not, see <http://www.gnu.org/licenses/>.
 //
-// $Revision: 20285 $
+// $Revision: 20437 $
 //
 //=============================================================================
 
@@ -59,7 +59,7 @@ namespace Tango
  * class and only add what is specific to writable attribute.
  *
  * $Author: taurel $
- * $Revision: 20285 $
+ * $Revision: 20437 $
  */
 
 class WAttribute:public Attribute
diff --git a/lib/idl/Makefile.in b/lib/idl/Makefile.in
index f289eae..0174ee7 100644
--- a/lib/idl/Makefile.in
+++ b/lib/idl/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,9 +16,8 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -56,7 +54,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/ac_config.h.tmp
 CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -64,29 +61,9 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(idldir)"
+idlDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(idl_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -103,7 +80,6 @@ CFLAGS = @CFLAGS@
 CORBA_INCLUDES = @CORBA_INCLUDES@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CPP_ELEVEN = @CPP_ELEVEN@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
@@ -112,7 +88,6 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -160,14 +135,11 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIBZMQ_CFLAGS = @LIBZMQ_CFLAGS@
-LIBZMQ_LIBS = @LIBZMQ_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MYSQL = @MYSQL@
 MYSQLCLIENT_CFLAGS = @MYSQLCLIENT_CFLAGS@
@@ -191,12 +163,9 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -209,13 +178,11 @@ VERSION_INFO = @VERSION_INFO@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ZMQ_PREFIX = @ZMQ_PREFIX@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_aux_dir = @ac_aux_dir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -249,6 +216,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -286,9 +254,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/idl/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu lib/idl/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/idl/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  lib/idl/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -306,7 +274,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -316,21 +283,20 @@ clean-libtool:
 install-idlDATA: $(idl_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(idldir)" || $(MKDIR_P) "$(DESTDIR)$(idldir)"
-	@list='$(idl_DATA)'; test -n "$(idldir)" || list=; \
-	for p in $$list; do \
+	@list='$(idl_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(idldir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(idldir)" || exit $$?; \
+	  f=$(am__strip_dir) \
+	  echo " $(idlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(idldir)/$$f'"; \
+	  $(idlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(idldir)/$$f"; \
 	done
 
 uninstall-idlDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(idl_DATA)'; test -n "$(idldir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(idldir)'; $(am__uninstall_files_from_dir)
+	@list='$(idl_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(idldir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(idldir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -354,17 +320,13 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
 	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
 	    || exit 1; \
 	  fi; \
 	done
@@ -385,22 +347,16 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -419,8 +375,6 @@ dvi-am:
 
 html: html-am
 
-html-am:
-
 info: info-am
 
 info-am:
@@ -429,28 +383,18 @@ install-data-am: install-idlDATA
 
 install-dvi: install-dvi-am
 
-install-dvi-am:
-
 install-exec-am:
 
 install-html: install-html-am
 
-install-html-am:
-
 install-info: install-info-am
 
-install-info-am:
-
 install-man:
 
 install-pdf: install-pdf-am
 
-install-pdf-am:
-
 install-ps: install-ps-am
 
-install-ps-am:
-
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -485,7 +429,6 @@ uninstall-am: uninstall-idlDATA
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	uninstall uninstall-am uninstall-idlDATA
 
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/lib/java/Makefile.am b/lib/java/Makefile.am
index 08bb1b2..eacfc94 100644
--- a/lib/java/Makefile.am
+++ b/lib/java/Makefile.am
@@ -6,15 +6,15 @@ javadir = $(datadir)/java
 dist_java_DATA=\
    Astor-6.0.4.jar \
    DeviceTree-1.8.jar \
-   ATKCore-4.3.6.jar \
-   Jive-4.23.jar \
-   org.tango.pogo-8.0.3.jar \
-   atkpanel-4.4.jar \
+   ATKCore-4.3.9.jar \
+   Jive-4.24.jar \
+   org.tango.pogo-8.0.7.jar \
+   atkpanel-4.5.jar \
    log4j-1.2.15.jar \
    AtkTuning-2.8.jar \
    LogViewer-1.2.3.jar \
    TangORB-8.0.0.jar \
-   ATKWidget-4.3.6.jar \
+   ATKWidget-4.3.9.jar \
    tool_panels-1.9.jar
 
 if TANGO_JAVA_ENABLED
diff --git a/lib/java/Makefile.in b/lib/java/Makefile.in
index fae82d8..45186e3 100644
--- a/lib/java/Makefile.in
+++ b/lib/java/Makefile.in
@@ -280,15 +280,15 @@ javadir = $(datadir)/java
 dist_java_DATA = \
    Astor-6.0.4.jar \
    DeviceTree-1.8.jar \
-   ATKCore-4.3.6.jar \
-   Jive-4.23.jar \
-   org.tango.pogo-8.0.3.jar \
-   atkpanel-4.4.jar \
+   ATKCore-4.3.9.jar \
+   Jive-4.24.jar \
+   org.tango.pogo-8.0.7.jar \
+   atkpanel-4.5.jar \
    log4j-1.2.15.jar \
    AtkTuning-2.8.jar \
    LogViewer-1.2.3.jar \
    TangORB-8.0.0.jar \
-   ATKWidget-4.3.6.jar \
+   ATKWidget-4.3.9.jar \
    tool_panels-1.9.jar
 
 @TANGO_JAVA_ENABLED_TRUE at bin_SCRIPTS = \
diff --git a/pogo/templates/Makefile.in b/pogo/templates/Makefile.in
index c3cfe70..36f7456 100644
--- a/pogo/templates/Makefile.in
+++ b/pogo/templates/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,9 +16,8 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -59,7 +57,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/ac_config.h.tmp
 CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -67,33 +64,17 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(cpp_templatedir)" \
 	"$(DESTDIR)$(html_templatedir)" \
 	"$(DESTDIR)$(java_templatedir)" \
 	"$(DESTDIR)$(python_templatedir)" \
 	"$(DESTDIR)$(txt_templatedir)"
+dist_cpp_templateDATA_INSTALL = $(INSTALL_DATA)
+dist_html_templateDATA_INSTALL = $(INSTALL_DATA)
+dist_java_templateDATA_INSTALL = $(INSTALL_DATA)
+dist_python_templateDATA_INSTALL = $(INSTALL_DATA)
+dist_txt_templateDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_cpp_template_DATA) $(dist_html_template_DATA) \
 	$(dist_java_template_DATA) $(dist_python_template_DATA) \
 	$(dist_txt_template_DATA)
@@ -112,7 +93,6 @@ CFLAGS = @CFLAGS@
 CORBA_INCLUDES = @CORBA_INCLUDES@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CPP_ELEVEN = @CPP_ELEVEN@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
@@ -121,7 +101,6 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -169,14 +148,11 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIBZMQ_CFLAGS = @LIBZMQ_CFLAGS@
-LIBZMQ_LIBS = @LIBZMQ_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MYSQL = @MYSQL@
 MYSQLCLIENT_CFLAGS = @MYSQLCLIENT_CFLAGS@
@@ -200,12 +176,9 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -218,13 +191,11 @@ VERSION_INFO = @VERSION_INFO@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ZMQ_PREFIX = @ZMQ_PREFIX@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_aux_dir = @ac_aux_dir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -258,6 +229,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -353,9 +325,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu pogo/templates/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu pogo/templates/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  pogo/templates/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  pogo/templates/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -373,7 +345,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -383,93 +354,88 @@ clean-libtool:
 install-dist_cpp_templateDATA: $(dist_cpp_template_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(cpp_templatedir)" || $(MKDIR_P) "$(DESTDIR)$(cpp_templatedir)"
-	@list='$(dist_cpp_template_DATA)'; test -n "$(cpp_templatedir)" || list=; \
-	for p in $$list; do \
+	@list='$(dist_cpp_template_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(cpp_templatedir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(cpp_templatedir)" || exit $$?; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_cpp_templateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(cpp_templatedir)/$$f'"; \
+	  $(dist_cpp_templateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(cpp_templatedir)/$$f"; \
 	done
 
 uninstall-dist_cpp_templateDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_cpp_template_DATA)'; test -n "$(cpp_templatedir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(cpp_templatedir)'; $(am__uninstall_files_from_dir)
+	@list='$(dist_cpp_template_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(cpp_templatedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(cpp_templatedir)/$$f"; \
+	done
 install-dist_html_templateDATA: $(dist_html_template_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(html_templatedir)" || $(MKDIR_P) "$(DESTDIR)$(html_templatedir)"
-	@list='$(dist_html_template_DATA)'; test -n "$(html_templatedir)" || list=; \
-	for p in $$list; do \
+	@list='$(dist_html_template_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(html_templatedir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(html_templatedir)" || exit $$?; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_html_templateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(html_templatedir)/$$f'"; \
+	  $(dist_html_templateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(html_templatedir)/$$f"; \
 	done
 
 uninstall-dist_html_templateDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_html_template_DATA)'; test -n "$(html_templatedir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(html_templatedir)'; $(am__uninstall_files_from_dir)
+	@list='$(dist_html_template_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(html_templatedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(html_templatedir)/$$f"; \
+	done
 install-dist_java_templateDATA: $(dist_java_template_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(java_templatedir)" || $(MKDIR_P) "$(DESTDIR)$(java_templatedir)"
-	@list='$(dist_java_template_DATA)'; test -n "$(java_templatedir)" || list=; \
-	for p in $$list; do \
+	@list='$(dist_java_template_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(java_templatedir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(java_templatedir)" || exit $$?; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_java_templateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(java_templatedir)/$$f'"; \
+	  $(dist_java_templateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(java_templatedir)/$$f"; \
 	done
 
 uninstall-dist_java_templateDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_java_template_DATA)'; test -n "$(java_templatedir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(java_templatedir)'; $(am__uninstall_files_from_dir)
+	@list='$(dist_java_template_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(java_templatedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(java_templatedir)/$$f"; \
+	done
 install-dist_python_templateDATA: $(dist_python_template_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(python_templatedir)" || $(MKDIR_P) "$(DESTDIR)$(python_templatedir)"
-	@list='$(dist_python_template_DATA)'; test -n "$(python_templatedir)" || list=; \
-	for p in $$list; do \
+	@list='$(dist_python_template_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(python_templatedir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(python_templatedir)" || exit $$?; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_python_templateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(python_templatedir)/$$f'"; \
+	  $(dist_python_templateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(python_templatedir)/$$f"; \
 	done
 
 uninstall-dist_python_templateDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_python_template_DATA)'; test -n "$(python_templatedir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(python_templatedir)'; $(am__uninstall_files_from_dir)
+	@list='$(dist_python_template_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(python_templatedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(python_templatedir)/$$f"; \
+	done
 install-dist_txt_templateDATA: $(dist_txt_template_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(txt_templatedir)" || $(MKDIR_P) "$(DESTDIR)$(txt_templatedir)"
-	@list='$(dist_txt_template_DATA)'; test -n "$(txt_templatedir)" || list=; \
-	for p in $$list; do \
+	@list='$(dist_txt_template_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(txt_templatedir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(txt_templatedir)" || exit $$?; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_txt_templateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(txt_templatedir)/$$f'"; \
+	  $(dist_txt_templateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(txt_templatedir)/$$f"; \
 	done
 
 uninstall-dist_txt_templateDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_txt_template_DATA)'; test -n "$(txt_templatedir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(txt_templatedir)'; $(am__uninstall_files_from_dir)
+	@list='$(dist_txt_template_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(txt_templatedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(txt_templatedir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -493,17 +459,13 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
 	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
 	    || exit 1; \
 	  fi; \
 	done
@@ -524,22 +486,16 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -558,8 +514,6 @@ dvi-am:
 
 html: html-am
 
-html-am:
-
 info: info-am
 
 info-am:
@@ -570,28 +524,18 @@ install-data-am: install-dist_cpp_templateDATA \
 
 install-dvi: install-dvi-am
 
-install-dvi-am:
-
 install-exec-am:
 
 install-html: install-html-am
 
-install-html-am:
-
 install-info: install-info-am
 
-install-info-am:
-
 install-man:
 
 install-pdf: install-pdf-am
 
-install-pdf-am:
-
 install-ps: install-ps-am
 
-install-ps-am:
-
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -637,7 +581,6 @@ uninstall-am: uninstall-dist_cpp_templateDATA \
 	uninstall-dist_python_templateDATA \
 	uninstall-dist_txt_templateDATA
 
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/pogo/templates/cpp/Makefile b/pogo/templates/cpp/Makefile
index e2dbadb..9f14680 100644
--- a/pogo/templates/cpp/Makefile
+++ b/pogo/templates/cpp/Makefile
@@ -32,7 +32,7 @@ RELEASE    = Release_$(MAJOR_VERS)_$(MINOR_VERS)
 #	Set default home directories
 #-----------------------------------------
 
-TANGO_HOME   =  /home/taurel/tmp/tango_install
+TANGO_HOME   =  /usr/local
 CPP_SERVERS  =  $(TANGO_HOME)/cppserver
 
 ifdef no_debug
diff --git a/utils/notifd2db/Makefile.in b/utils/notifd2db/Makefile.in
index 55cb434..ef59012 100644
--- a/utils/notifd2db/Makefile.in
+++ b/utils/notifd2db/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -106,7 +106,6 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -161,7 +160,6 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MYSQL = @MYSQL@
 MYSQLCLIENT_CFLAGS = @MYSQLCLIENT_CFLAGS@
@@ -203,13 +201,11 @@ VERSION_INFO = @VERSION_INFO@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ZMQ_PREFIX = @ZMQ_PREFIX@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_aux_dir = @ac_aux_dir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -243,6 +239,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -351,7 +348,7 @@ clean-binPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-notifd2db$(EXEEXT): $(notifd2db_OBJECTS) $(notifd2db_DEPENDENCIES) $(EXTRA_notifd2db_DEPENDENCIES) 
+notifd2db$(EXEEXT): $(notifd2db_OBJECTS) $(notifd2db_DEPENDENCIES) 
 	@rm -f notifd2db$(EXEEXT)
 	$(CXXLINK) $(notifd2db_OBJECTS) $(notifd2db_LDADD) $(LIBS)
 
@@ -489,15 +486,10 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
diff --git a/utils/tango_admin/Makefile.in b/utils/tango_admin/Makefile.in
index c3766ce..f859960 100644
--- a/utils/tango_admin/Makefile.in
+++ b/utils/tango_admin/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -115,7 +115,6 @@ CYGPATH_W = @CYGPATH_W@
 DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -170,7 +169,6 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MYSQL = @MYSQL@
 MYSQLCLIENT_CFLAGS = @MYSQLCLIENT_CFLAGS@
@@ -212,13 +210,11 @@ VERSION_INFO = @VERSION_INFO@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ZMQ_PREFIX = @ZMQ_PREFIX@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_aux_dir = @ac_aux_dir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -252,6 +248,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -363,7 +360,7 @@ clean-binPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-tango_admin$(EXEEXT): $(tango_admin_OBJECTS) $(tango_admin_DEPENDENCIES) $(EXTRA_tango_admin_DEPENDENCIES) 
+tango_admin$(EXEEXT): $(tango_admin_OBJECTS) $(tango_admin_DEPENDENCIES) 
 	@rm -f tango_admin$(EXEEXT)
 	$(CXXLINK) $(tango_admin_OBJECTS) $(tango_admin_LDADD) $(LIBS)
 
@@ -502,15 +499,10 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:

-- 
TANGO distributed control system.

