Глобальное переименование uniset --> uniset2, libUniSet --> libUniSet2.…

Глобальное переименование uniset --> uniset2, libUniSet --> libUniSet2. Подготовка к возможности одновременной установки двух версий в одну систему.

Глобальное переименование uniset --> uniset2, libUniSet --> libUniSet2.…
66c8d362 · Pavel Vainerman · b9012840 · 66c8d362 · 66c8d362 · 66c8d362
Commit 66c8d362 authored Jan 31, 2014 by Pavel Vainerman
74 changed files
--- a/AUTHORS
+++ b/AUTHORS
-Pavel Vainerman <pv@etersoft.ru>
+see git changelog
-Vitaly Lipatov <lav@etersoft.ru>
-Anton Korbin <ahtoh@etersoft.ru>
-and.. see git changelog
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ FIRSTSUBDIRS=IDL
 SUBDIRS=. src lib include Utilities extensions python docs
 pkgconfigdir 	= $(libdir)/pkgconfig
-pkgconfig_DATA 	= libUniSet.pc
+pkgconfig_DATA 	= libUniSet22.pc
 # Hack for fix build order
 all-local:

--- a/TODO
+++ b/TODO
@@ -28,8 +28,9 @@ Version 2.0
 - сделать MultiChannelSlave (слушает несколько каналов, но в SM сохраняет данные
 только от одного, при пропаже связи переключается на другой и т.д. по кругу)
+- Сделать поддержку threshold_aid (порогов) для процесса ModbusMaster
 // --- Оптимизация.. --- //
- отказаться от alias-ов.. (не прижилось, а накладные расходы большие)
+   - сделать ли ObjectId short?
-   - сделать ли ObjectId short? В связи с отказом от alias, нужна ли пара (id,node)
   - "продумать" функцию key()... может наложить ограничение на диапазон id..
--- a/Utilities/Admin/Makefile.am
+++ b/Utilities/Admin/Makefile.am
@@ -2,8 +2,8 @@
 # This file is part of the UniSet library                                  #
 ############################################################################
-bin_PROGRAMS 			= uniset-admin
+bin_PROGRAMS = @PACKAGE@-admin
-uniset_admin_SOURCES 	= admin.cc
+@PACKAGE@_admin_SOURCES  = admin.cc
-uniset_admin_LDADD 		= $(top_builddir)/lib/libUniSet.la
+@PACKAGE@_admin_LDADD    = $(top_builddir)/lib/libUniSet2.la
-uniset_admin_CPPFLAGS	= -I$(top_builddir)/lib
+@PACKAGE@_admin_CPPFLAGS = -I$(top_builddir)/lib
--- a/Utilities/Admin/create_links.sh
+++ b/Utilities/Admin/create_links.sh
@@ -16,7 +16,7 @@ ln -s -f admin.sh getCalibrate
 ln -s -f admin.sh help
 ln -s -f admin.sh oinfo
-ln -s -f ../../Utilities/scripts/uniset-start.sh 
+ln -s -f ../../Utilities/scripts/uniset2-start.sh
-ln -s -f ../../Utilities/scripts/uniset-stop.sh stop.sh
+ln -s -f ../../Utilities/scripts/uniset2-stop.sh stop.sh
-ln -s -f ../../Utilities/scripts/uniset-functions.sh 
+ln -s -f ../../Utilities/scripts/uniset2-functions.sh
 ln -s -f ../../conf/test.xml test.xml
--- a/Utilities/MBTester/Makefile.am
+++ b/Utilities/MBTester/Makefile.am
-bin_PROGRAMS 	= uniset-mbrtutest uniset-mbrtuslave-echo \
+bin_PROGRAMS 	= @PACKAGE@-mbrtutest @PACKAGE@-mbrtuslave-echo \
-		uniset-mbtcpserver-echo uniset-mbtcptest
+		@PACKAGE@-mbtcpserver-echo @PACKAGE@-mbtcptest
-#uniset-mbtest
+#@PACKAGE@-mbtest
-uniset_mbrtutest_SOURCES 	= mbrtutester.cc
+@PACKAGE@_mbrtutest_SOURCES 	= mbrtutester.cc
-uniset_mbrtutest_LDADD 	= $(top_builddir)/lib/libUniSet.la
+@PACKAGE@_mbrtutest_LDADD 	= $(top_builddir)/lib/libUniSet2.la
-uniset_mbtcptest_SOURCES 	= mbtcptester.cc
+@PACKAGE@_mbtcptest_SOURCES 	= mbtcptester.cc
-uniset_mbtcptest_LDADD 	= $(top_builddir)/lib/libUniSet.la $(COMCPP_LIBS)
+@PACKAGE@_mbtcptest_LDADD 	= $(top_builddir)/lib/libUniSet2.la $(COMCPP_LIBS)
-uniset_mbtcptest_CPPFLAGS = $(COMCPP_CFLAGS)
+@PACKAGE@_mbtcptest_CPPFLAGS = $(COMCPP_CFLAGS)
-uniset_mbrtuslave_echo_SOURCES 	= MBSlave.cc mbrtuslave.cc
+@PACKAGE@_mbrtuslave_echo_SOURCES 	= MBSlave.cc mbrtuslave.cc
-uniset_mbrtuslave_echo_LDADD 		= $(top_builddir)/lib/libUniSet.la $(SIGC_LIBS)
+@PACKAGE@_mbrtuslave_echo_LDADD 		= $(top_builddir)/lib/libUniSet2.la $(SIGC_LIBS)
-uniset_mbrtuslave_echo_CPPFLAGS	= $(SIGC_CFLAGS)
+@PACKAGE@_mbrtuslave_echo_CPPFLAGS	= $(SIGC_CFLAGS)
-uniset_mbtcpserver_echo_SOURCES 	= MBTCPServer.cc mbtcpserver.cc
+@PACKAGE@_mbtcpserver_echo_SOURCES 	= MBTCPServer.cc mbtcpserver.cc
-uniset_mbtcpserver_echo_LDADD 		= $(top_builddir)/lib/libUniSet.la $(SIGC_LIBS) $(COMCPP_LIBS)
+@PACKAGE@_mbtcpserver_echo_LDADD 		= $(top_builddir)/lib/libUniSet2.la $(SIGC_LIBS) $(COMCPP_LIBS)
-uniset_mbtcpserver_echo_CPPFLAGS	= $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
+@PACKAGE@_mbtcpserver_echo_CPPFLAGS	= $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
-#uniset_mbtest2_SOURCES 	= mbtester2.cc
+#@PACKAGE@_mbtest2_SOURCES 	= mbtester2.cc
-#uniset_mbtest2_LDADD 	= $(top_builddir)/lib/libUniSet.la
+#@PACKAGE@_mbtest2_LDADD 	= $(top_builddir)/lib/libUniSet2.la
--- a/Utilities/NullController/Makefile.am
+++ b/Utilities/NullController/Makefile.am
@@ -2,8 +2,8 @@
 # This file is part of the UniSet library                                  #
 ############################################################################
-bin_PROGRAMS 					= uniset-nullController
+bin_PROGRAMS = @PACKAGE@-nullController
-uniset_nullController_SOURCES	= NullController.cc main.cc
+@PACKAGE@_nullController_SOURCES  = NullController.cc main.cc
-uniset_nullController_LDADD 	= $(top_builddir)/lib/libUniSet.la
+@PACKAGE@_nullController_LDADD    = $(top_builddir)/lib/libUniSet2.la
-uniset_nullController_CPPFLAGS	= -I$(top_builddir)/lib $(SIGC_CFLAGS)
+@PACKAGE@_nullController_CPPFLAGS = -I$(top_builddir)/lib $(SIGC_CFLAGS)
--- a/Utilities/NullController/stop.sh
+++ b/Utilities/NullController/stop.sh
-../scripts/uniset-stop.sh
+../scripts/uniset2-stop.sh
\ No newline at end of file
--- a/Utilities/SImitator/Makefile.am
+++ b/Utilities/SImitator/Makefile.am
-bin_PROGRAMS 		= uniset-simitator
+bin_PROGRAMS = @PACKAGE@-simitator
-uniset_simitator_LDADD 		= $(top_builddir)/lib/libUniSet.la
+@PACKAGE@_simitator_LDADD    = $(top_builddir)/lib/libUniSet2.la
-uniset_simitator_SOURCES 	= main.cc
+@PACKAGE@t_simitator_SOURCES = main.cc
--- a/Utilities/SImitator/create_links.sh
+++ b/Utilities/SImitator/create_links.sh
 #!/bin/sh
-ln -s -f /usr/bin/uniset-stop.sh stop.sh
+ln -s -f /usr/bin/uniset2-stop.sh stop.sh
 ln -s -f ../../conf/test.xml test.xml
--- a/Utilities/SMonit/Makefile.am
+++ b/Utilities/SMonit/Makefile.am
-bin_PROGRAMS 			= uniset-smonit
+bin_PROGRAMS 			= @PACKAGE@-smonit
-uniset_smonit_LDADD 	= $(top_builddir)/lib/libUniSet.la
+@PACKAGE@_smonit_LDADD 	= $(top_builddir)/lib/libUniSet2.la
-uniset_smonit_SOURCES 	= smonitor.cc
+@PACKAGE@_smonit_SOURCES 	= smonitor.cc
--- a/Utilities/SMonit/stop.sh
+++ b/Utilities/SMonit/stop.sh
-../scripts/uniset-stop.sh
+../scripts/uniset2-stop.sh
\ No newline at end of file
--- a/Utilities/SViewer-text/Makefile.am
+++ b/Utilities/SViewer-text/Makefile.am
@@ -2,7 +2,7 @@
 # This file is part of the UniSet library                                  #
 ############################################################################
-bin_PROGRAMS 					= uniset-sviewer-text
+bin_PROGRAMS = @PACKAGE@-sviewer-text
-uniset_sviewer_text_SOURCES		= main.cc
+@PACKAGE@_sviewer_text_SOURCES  = main.cc
-uniset_sviewer_text_LDADD 		= $(top_builddir)/lib/libUniSet.la
+@PACKAGE@_sviewer_text_LDADD    = $(top_builddir)/lib/libUniSet2.la
-uniset_sviewer_text_CPPFLAGS	= -I$(top_builddir)/lib
+@PACKAGE@_sviewer_text_CPPFLAGS = -I$(top_builddir)/lib
--- a/Utilities/SViewer-text/stop.sh
+++ b/Utilities/SViewer-text/stop.sh
-../scripts/uniset-stop.sh
+../scripts/uniset2-stop.sh
\ No newline at end of file
--- a/Utilities/codegen/Makefile.am
+++ b/Utilities/codegen/Makefile.am
@@ -2,7 +2,7 @@
 bin_SCRIPTS = @PACKAGE@-codegen
-xsldir 		= $(datadir)/uniset/xslt
+xsldir 		= $(datadir)/@PACKAGE@/xslt
 xsl_DATA 	= *.xsl skel*
 all-local:

--- a/Utilities/codegen/tests/Makefile.am
+++ b/Utilities/codegen/tests/Makefile.am
 noinst_PROGRAMS = test test2
 #test2
-test_LDADD 		= $(top_builddir)/lib/libUniSet.la $(COMCPP_LIBS)
+test_LDADD 		= $(top_builddir)/lib/libUniSet2.la $(COMCPP_LIBS)
 test_CXXFLAGS	= -I$(top_builddir)/include $(COMCPP_CGLAGS)
 test_SOURCES 	= TestGen_SK.cc TestGen.cc TestGen-main.cc
-test2_LDADD 	= $(top_builddir)/lib/libUniSet.la $(COMCPP_LIBS)
+test2_LDADD 	= $(top_builddir)/lib/libUniSet2.la $(COMCPP_LIBS)
 test2_CXXFLAGS	= -I$(top_builddir)/include $(COMCPP_CGLAGS)
 test2_SOURCES 	= TestGenAlone_SK.cc TestGenAlone.cc TestGenAlone-main.cc

--- a/Utilities/codegen/uniset-codegen.in
+++ b/Utilities/codegen/uniset-codegen.in
@@ -29,11 +29,11 @@ Valid options are:
  --ask             - Use 'ask' templates. See the documentation.
  --alone           - Use 'alone' templates. See the documentation.
  --no-main         - Don't generate main.cc
  --make-skel name  - generate process skeleton (name.src.xml, Name.cc, Name.hh, Makefile.am, main.cc)
                      Additional arguments: --no-main, --no-makefile
 EOF
    [ -n "$1" ] && exit "$1" || exit
 }
@@ -116,7 +116,7 @@ while :; do
 	-l|--local)
 		shift
 		xsltdir=$1
-		[ -z "${xsltdir}" ] && xsltdir=.  
+		[ -z "${xsltdir}" ] && xsltdir=.
 		;;
 	--xsltdir)
@@ -130,15 +130,15 @@ while :; do
 		;;
    --make-skel)
-    	make_skel=1
+	make_skel=1
-    	shift
+	shift
-    	make_name="$1"
+	make_name="$1"
-    	;;
+	;;
    --no-makefile)
-    	no_makefile=1
+	no_makefile=1
-    	;;
+	;;
 	--) shift; break
 	;;
 	*) "unrecognized option: $1"
@@ -150,15 +150,15 @@ done
 if [ -n "$make_skel" ]; then
 	[ -z "$make_name" ] && print_usage -1
 	cp ${xsltdir}/$skel_h ${make_name}.h && subst "s|Skel|${make_name}|g" ${make_name}.h
 	cp ${xsltdir}/$skel_c ${make_name}.cc && subst "s|Skel|${make_name}|g" ${make_name}.cc
 	cp ${xsltdir}/$skel_xml ${make_name}.src.xml && subst "s|Skel|${make_name}|g" ${make_name}.src.xml
 	[ -z "$no_main" ] && cp ${xsltdir}/$skel_m ${make_name}-main.cc && subst "s|Skel|${make_name}|g" ${make_name}-main.cc
 	[ -z "$no_makefile" ] && cp ${xsltdir}/$skel_make Makefile.am && subst "s|Skel|${make_name}|g" Makefile.am
 	exit 0
 fi

--- a/Utilities/scripts/Makefile.am
+++ b/Utilities/scripts/Makefile.am
@@ -2,5 +2,5 @@
 # This file is part of the UniSet library                                  #
 ############################################################################
-bin_SCRIPTS = uniset-start.sh uniset-stop.sh uniset-functions.sh
+bin_SCRIPTS = @PACKAGE@-start.sh @PACKAGE@-stop.sh @PACKAGE@-functions.sh
--- a/Utilities/scripts/uniset-functions.sh
+++ b/Utilities/scripts/uniset-functions.sh
@@ -37,11 +37,11 @@ function set_omni_port
 {
 	while [ -n "$1" ]; do
 		case "$1" in
-			-p|--port) 
+			-p|--port)
 				shift
 					OMNIPORT=$1;
-					echo  "set OMNIPORT=$1" 
+					echo  "set OMNIPORT=$1"
-				shift; 
+				shift;
 				break;
 			;;
@@ -52,7 +52,7 @@ function set_omni_port
 	done
 }
-function set_omni 
+function set_omni
 {
 	# Каталог для хранения записей omniORB
 	OMNILOG=$TMPDIR/omniORB
@@ -92,8 +92,8 @@ function runOmniNames()
 		omniTest=$(ps aux | grep -q $OMNINAME | grep $USER  | grep -v grep | grep -v $0 | wc -l);
 	fi
-	if [ $omniTest \> 0 ]; 
+	if [ $omniTest \> 0 ];
-	then	 
+	then
 		echo $OMNINAME уже запущен. #Прерываем.
 		return 0;
 	fi
@@ -120,7 +120,7 @@ function runOmniNames()
 		return 1;
 	fi
 	#echo $! $OMNINAME >>$RANSERVICES
 	if [ $(grep -q $OMNINAME $RANSERVICES | wc -l) \= 0 ]
 	then
 		echo 0 $OMNINAME >>$RANSERVICES

--- a/Utilities/scripts/uniset-start.sh
+++ b/Utilities/scripts/uniset-start.sh
@@ -56,7 +56,7 @@ then
 	[ "$DBG" == "call" ] && start_line="valgrind --tool=callgrind --trace-children=yes --log-file=valgrind.log $COMLINE"
 	[ "$DBG" == "cache" ] && start_line="valgrind --tool=cachegrind --trace-children=yes --log-file=valgrind.log $COMLINE"
 	[ "$DBG" == "hel" ] && start_line="valgrind --tool=helgrind --trace-children=yes --log-file=valgrind.log $COMLINE"
 	PROG=`basename $1`
 	if [ "$DBG" == "gdb" ]; then
 		if [ -a "./.libs/lt-$PROG" ]; then
@@ -67,8 +67,8 @@ then
 			fi
 		fi
-  		shift
+		shift
-  		start_line="gdb --args $PROG $* --uniset-port $OMNIPORT"
+		start_line="gdb --args $PROG $* --uniset-port $OMNIPORT"
 	fi
 	echo Running "$start_line"
@@ -84,10 +84,10 @@ then
 			echo "Не указана команда для запуска"
 			exit 1
 		fi
 		COMLINE="$COMLINE --uniset-port $OMNIPORT"
 		echo Запускаем "$COMLINE"
-		$COMLINE 
+		$COMLINE
 		exit $?
 fi
@@ -112,7 +112,7 @@ fi
    ulimit -S -c 0 >/dev/null 2>&1
 #	$* --uniset-port $OMNIPORT &
 	echo ЗАПУСК: "$* --uniset-port $OMNIPORT"
 	pid=$!
 	echo $pid >$PIDFILE # создаём pid-файл
@@ -124,7 +124,7 @@ fi
 		echo $( echo $PROGLINE | cut -d " " -f 1 ) $NAMEPROG >>$RANSERVICES
 	else
 		RETVAL=0
-		echo [ FAILED ] 
+		echo [ FAILED ]
 	fi
 exit $RETVAL
--- a/Utilities/scripts/uniset-stop.sh
+++ b/Utilities/scripts/uniset-stop.sh
@@ -35,7 +35,7 @@ fi
 for i in $(tac $RANSERVICES | cut -d " " -f 2)
 do
 	TOKILL=$(basename $i)
-	echo -n Завершаем $TOKILL... 
+	echo -n Завершаем $TOKILL...
 	if [ $(ps ax | grep $TOKILL | wc -l) = 0 ]
 	then
 		echo " already stoppped [ OK ]"

--- a/conf/libuniset.spec
+++ b/conf/libuniset.spec
@@ -4,11 +4,11 @@
 %def_enable python
 %def_enable rrd
-%define oname uniset
+%define oname uniset2
-Name: libuniset
+Name: libuniset2
 Version: 2.0
-Release: alt0.3
+Release: alt0.4
 Summary: UniSet - library for building distributed industrial control systems
@@ -158,7 +158,7 @@ Documentations for developing with UniSet
 %package extensions
 Group: Development/C++
-Summary: libUniSet extensions
+Summary: libUniSet2 extensions
 Requires: %name = %version-%release
 Provides: %oname-extentions
 Obsoletes: %oname-extentions
@@ -217,7 +217,7 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
 %_datadir/%oname/xslt/skel*
 %files
-%_libdir/libUniSet.so.*
+%_libdir/libUniSet2.so.*
 %files devel
 %dir %_includedir/%oname/
@@ -232,9 +232,9 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
 %_includedir/%oname/sqlite/
 %endif
-%_libdir/libUniSet.so
+%_libdir/libUniSet2.so
 %_datadir/idl/%oname/
-%_pkgconfigdir/libUniSet.pc
+%_pkgconfigdir/libUniSet2.pc
 %if_enabled mysql
 %files mysql-dbserver
@@ -242,7 +242,7 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
 %_libdir/*-mysql.so*
 %files mysql-devel
-%_pkgconfigdir/libUniSetMySQL.pc
+%_pkgconfigdir/libUniSet2MySQL.pc
 %endif
 %if_enabled sqlite
@@ -252,7 +252,7 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
 %_libdir/*-sqlite.so*
 %files sqlite-devel
-%_pkgconfigdir/libUniSetSQLite.pc
+%_pkgconfigdir/libUniSet2SQLite.pc
 %endif
 %if_enabled python
@@ -288,53 +288,56 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
 #%_bindir/%oname-smdbserver
 %_libdir/*Extensions.so.*
-%_libdir/libUniSetIO*.so.*
+%_libdir/libUniSet2IO*.so.*
-%_libdir/libUniSetLP*.so.*
+%_libdir/libUniSet2LP*.so.*
-%_libdir/libUniSetMB*.so.*
+%_libdir/libUniSet2MB*.so.*
-%_libdir/libUniSetRT*.so.*
+%_libdir/libUniSet2RT*.so.*
-%_libdir/libUniSetShared*.so.*
+%_libdir/libUniSet2Shared*.so.*
-%_libdir/libUniSetNetwork*.so.*
+%_libdir/libUniSet2Network*.so.*
-%_libdir/libUniSetUNetUDP*.so.*
+%_libdir/libUniSet2UNetUDP*.so.*
-#%_libdir/libUniSetSMDBServer*.so.*
+#%_libdir/libUniSet2SMDBServer*.so.*
 %if_enabled rrd
 %_bindir/%oname-rrd*
-%_libdir/libUniSetRRD*.so.*
+%_libdir/libUniSet2RRD*.so.*
 %endif
 %files extensions-devel
 %_includedir/%oname/extensions/
 %_libdir/*Extensions.so
-%_libdir/libUniSetIO*.so
+%_libdir/libUniSet2IO*.so
-%_libdir/libUniSetLP*.so
+%_libdir/libUniSet2LP*.so
-%_libdir/libUniSetMB*.so
+%_libdir/libUniSet2MB*.so
-%_libdir/libUniSetRT*.so
+%_libdir/libUniSet2RT*.so
-%_libdir/libUniSetShared*.so
+%_libdir/libUniSet2Shared*.so
-%_libdir/libUniSetNetwork.so
+%_libdir/libUniSet2Network.so
-%_libdir/libUniSetUNetUDP.so
+%_libdir/libUniSet2UNetUDP.so
-#%_libdir/libUniSetSMDBServer.so
+#%_libdir/libUniSet2SMDBServer.so
 %_pkgconfigdir/*Extensions.pc
-%_pkgconfigdir/libUniSetIO*.pc
+%_pkgconfigdir/libUniSet2IO*.pc
-%_pkgconfigdir/libUniSetLog*.pc
+%_pkgconfigdir/libUniSet2Log*.pc
-%_pkgconfigdir/libUniSetMB*.pc
+%_pkgconfigdir/libUniSet2MB*.pc
-%_pkgconfigdir/libUniSetRT*.pc
+%_pkgconfigdir/libUniSet2RT*.pc
-%_pkgconfigdir/libUniSetShared*.pc
+%_pkgconfigdir/libUniSet2Shared*.pc
-%_pkgconfigdir/libUniSetNetwork*.pc
+%_pkgconfigdir/libUniSet2Network*.pc
-%_pkgconfigdir/libUniSetUNet*.pc
+%_pkgconfigdir/libUniSet2UNet*.pc
 %if_enabled rrd
-%_pkgconfigdir/libUniSetRRD*.pc
+%_pkgconfigdir/libUniSet2RRD*.pc
-%_libdir/libUniSetRRD*.so
+%_libdir/libUniSet2RRD*.so
 %endif
-#%_pkgconfigdir/libUniSetSMDBServer.pc
+#%_pkgconfigdir/libUniSet2SMDBServer.pc
-#%_pkgconfigdir/libUniSet*.pc
+#%_pkgconfigdir/libUniSet2*.pc
-%exclude %_pkgconfigdir/libUniSet.pc
+%exclude %_pkgconfigdir/libUniSet2.pc
 %changelog
+* Fri Jan 31 2014 Pavel Vainerman <pv@altlinux.ru> 2.0-alt0.4
+- rename uniset --> uniset2
 * Thu Jan 30 2014 Pavel Vainerman <pv@altlinux.ru> 2.0-alt0.3
- optimization: avoiding the use of 'alias mechanism' 
+- optimization: avoiding the use of 'alias mechanism'
  ('objectid@virtualnode:realnode' ==> 'objectid')
 - add ObjectActivator::Instance function (singlton pattern)
 - minor fixes
@@ -399,13 +402,13 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
 - fixed after cppcheck checking
 * Wed Jun 05 2013 Pavel Vainerman <pv@altlinux.ru> 1.6-alt10
- add for ModbusMaster (RTU|TCP) --xxx--aftersend-pause 
+- add for ModbusMaster (RTU|TCP) --xxx--aftersend-pause
 * Tue May 14 2013 Pavel Vainerman <pv@altlinux.ru> 1.6-alt9
 - add for Modbus (RTU|TCP) exchange  --xxx-reopen-timeout msec. (eterbug #9296)
 * Wed May 08 2013 Pavel Vainerman <pv@altlinux.ru> 1.6-alt8
- fixed minor bug in uniset-codegen (getValue) 
+- fixed minor bug in uniset-codegen (getValue)
 * Wed Mar 20 2013 Pavel Vainerman <pv@altlinux.ru> 1.6-alt7
 - modbus: add new function 0x2B/0x0E(43/14)"Read device identification"
@@ -535,7 +538,7 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
 - minor fixes in uniset-codegen (add "preAskSensors")
 * Fri Mar 02 2012 Pavel Vainerman <pv@altlinux.ru> 1.3-alt12
- fixed bug in DigitalFilter 
+- fixed bug in DigitalFilter
 - fixed bug in RTU188 exchange
 * Tue Feb 28 2012 Pavel Vainerman <pv@altlinux.ru> 1.3-alt11
@@ -615,7 +618,7 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
 - ModbusMaster extensions code refactoring
 * Tue Oct 25 2011 Pavel Vainerman <pv@altlinux.ru> 1.0-alt49
- added support 'const' and [private|protecte|public] 
+- added support 'const' and [private|protecte|public]
 for <variables> in uniset-codegen
 * Sat Oct 22 2011 Pavel Vainerman <pv@altlinux.ru> 1.0-alt48
@@ -694,10 +697,10 @@ for <variables> in uniset-codegen
 - (uniset-unet2): fixed bug (SEGFAULT with a large number of items)
 * Wed Apr 20 2011 Pavel Vainerman <pv@altlinux.ru> 1.0-alt22
- (uniset-unet2-tester): fixed minor bugs 
+- (uniset-unet2-tester): fixed minor bugs
 * Wed Apr 20 2011 Pavel Vainerman <pv@altlinux.ru> 1.0-alt21
- (uniset-unet2-tester): add new parameter 
+- (uniset-unet2-tester): add new parameter
   -l | --check-lost   - Check the lost packets.
 * Wed Apr 20 2011 Pavel Vainerman <pv@altlinux.ru> 1.0-alt20

--- a/conf/release_helper.sh
+++ b/conf/release_helper.sh
@@ -12,7 +12,7 @@ MAILDOMAIN=server
 TOPDIR=/var/ftp/pvt/Etersoft/Ourside/
 PKGNAME=uniset
-SPECNAME=libuniset.spec
+SPECNAME=libuniset2.spec
 PROJECT=$1
 test -n "$PROJECT" || PROJECT=$PKGNAME

--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 # See doc: http://www.gnu.org/software/hello/manual/autoconf/Generic-Programs.html
 # AC_PREREQ(2.59)
-AC_INIT([uniset], [2.0.0], pv@etersoft.ru)
+AC_INIT([uniset2], [2.0.0], pv@etersoft.ru)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
 # AC_CONFIG_MACRO_DIR([m4])
@@ -199,7 +199,7 @@ AC_TYPE_SIGNAL
 AC_CHECK_FUNCS([atexit getcwd gettimeofday atomic_set])
 AC_CONFIG_FILES([Makefile
-				 libUniSet.pc
+				 libUniSet2.pc
 				 lib/Makefile
 				 IDL/Makefile
 				 IDL/UniSetTypes/Makefile
@@ -232,32 +232,32 @@ AC_CONFIG_FILES([Makefile
 				 Utilities/codegen/uniset-codegen
 				 Utilities/codegen/tests/Makefile
 				 extensions/Makefile
-				 extensions/libUniSetExtensions.pc
+				 extensions/libUniSet2Extensions.pc
 				 extensions/lib/Makefile
 				 extensions/include/Makefile
 				 extensions/DBServer-MySQL/Makefile
-				 extensions/DBServer-MySQL/libUniSetMySQL.pc
+				 extensions/DBServer-MySQL/libUniSet2MySQL.pc
 				 extensions/DBServer-SQLite/Makefile
-				 extensions/DBServer-SQLite/libUniSetSQLite.pc
+				 extensions/DBServer-SQLite/libUniSet2SQLite.pc
 				 extensions/IOControl/Makefile
-				 extensions/IOControl/libUniSetIOControl.pc
+				 extensions/IOControl/libUniSet2IOControl.pc
 				 extensions/ModbusMaster/Makefile
-				 extensions/ModbusMaster/libUniSetRTU.pc
+				 extensions/ModbusMaster/libUniSet2RTU.pc
-				 extensions/ModbusMaster/libUniSetMBTCPMaster.pc
+				 extensions/ModbusMaster/libUniSet2MBTCPMaster.pc
 				 extensions/ModbusSlave/Makefile
-				 extensions/ModbusSlave/libUniSetMBSlave.pc
+				 extensions/ModbusSlave/libUniSet2MBSlave.pc
 				 extensions/LogicProcessor/Makefile
-				 extensions/LogicProcessor/libUniSetLogicProcessor.pc
+				 extensions/LogicProcessor/libUniSet2LogicProcessor.pc
 				 extensions/SMViewer/Makefile
 				 extensions/UniNetwork/Makefile
-				 extensions/UniNetwork/libUniSetNetwork.pc
+				 extensions/UniNetwork/libUniSet2Network.pc
 				 extensions/UNetUDP/Makefile
-				 extensions/UNetUDP/libUniSetUNetUDP.pc
+				 extensions/UNetUDP/libUniSet2UNetUDP.pc
 				 extensions/SharedMemory/Makefile
-				 extensions/SharedMemory/libUniSetSharedMemory.pc
+				 extensions/SharedMemory/libUniSet2SharedMemory.pc
 				 extensions/SharedMemoryPlus/Makefile
 				 extensions/RRDServer/Makefile
-				 extensions/RRDServer/libUniSetRRDServer.pc
+				 extensions/RRDServer/libUniSet2RRDServer.pc
 				 extensions/tests/Makefile
 				 extensions/tests/SMemoryTest/Makefile
 				 python/lib/Makefile
@@ -267,4 +267,4 @@ AC_CONFIG_FILES([Makefile
 AC_OUTPUT
 #				 extensions/SMDBServer/Makefile
-#				 extensions/SMDBServer/libUniSetSMDBServer.pc
+#				 extensions/SMDBServer/libUniSet2SMDBServer.pc
--- a/extensions/DBServer-MySQL/Makefile.am
+++ b/extensions/DBServer-MySQL/Makefile.am
@@ -4,20 +4,20 @@ else
 UMYSQL_VER=@LIBVER@
-lib_LTLIBRARIES 			= libUniSet-mysql.la
+lib_LTLIBRARIES 			= libUniSet2-mysql.la
-libUniSet_mysql_la_LDFLAGS  = -version-info $(UMYSQL_VER) 
+libUniSet2_mysql_la_LDFLAGS  = -version-info $(UMYSQL_VER)
-libUniSet_mysql_la_SOURCES	= DBInterface.cc DBServer_MySQL.cc
+libUniSet2_mysql_la_SOURCES	= DBInterface.cc DBServer_MySQL.cc
-libUniSet_mysql_la_LIBADD	= $(top_builddir)/lib/libUniSet.la -lmysqlclient
+libUniSet2_mysql_la_LIBADD	= $(top_builddir)/lib/libUniSet2.la -lmysqlclient
-bin_PROGRAMS 					= uniset-mysql-dbserver
+bin_PROGRAMS 					= @PACKAGE@-mysql-dbserver
-uniset_mysql_dbserver_LDADD		= libUniSet-mysql.la $(top_builddir)/lib/libUniSet.la
+@PACKAGE@_mysql_dbserver_LDADD		= libUniSet2-mysql.la $(top_builddir)/lib/libUniSet2.la
-uniset_mysql_dbserver_SOURCES	= main.cc
+@PACKAGE@_mysql_dbserver_SOURCES	= main.cc
 # install
 devel_include_HEADERS = *.h
 devel_includedir = $(includedir)/@PACKAGE@/mysql
 pkgconfigdir    = $(libdir)/pkgconfig
-pkgconfig_DATA  = libUniSetMySQL.pc
+pkgconfig_DATA  = libUniSet2MySQL.pc
 endif
--- a/extensions/IOControl/libUniSetIOControl.pc.in
+++ b/extensions/IOControl/libUniSetIOControl.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
-Name: libUniSetIOControl
+Name: libUniSet2MySQL
-Description: Support library for UniSetIOControl
+Description: Support library for libUniSet2MySQL
-Requires: libUniSetExtensions
+Requires: libUniSet2
 Version: @VERSION@
-Libs: -L${libdir} -lUniSetIOControl
+Libs: -L${libdir} -lUniSet2-mysql -lmysqlclient
-Cflags: -I${includedir}/uniset
+Cflags: -I${includedir}/@PACKAGE@ -I${includedir}/mysql
--- a/extensions/DBServer-MySQL/libUniSetMySQL.pc.in
+++ b/extensions/DBServer-MySQL/libUniSetMySQL.pc.in
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-Name: libUniSetMySQL
-Description: Support library for libUniSetMySQL
-Requires: libUniSet
-Version: 1.0.0
-Libs: -L${libdir} -lUniSet-mysql -lmysqlclient
-Cflags: -I${includedir}/uniset -I${includedir}/mysql
--- a/extensions/DBServer-SQLite/Makefile.am
+++ b/extensions/DBServer-SQLite/Makefile.am
@@ -4,18 +4,18 @@ else
 USQLITE_VER=@LIBVER@
-lib_LTLIBRARIES = libUniSet-sqlite.la
+lib_LTLIBRARIES = libUniSet2-sqlite.la
-libUniSet_sqlite_la_LDFLAGS = -version-info $(USQLITE_VER) 
+libUniSet2_sqlite_la_LDFLAGS = -version-info $(USQLITE_VER)
-libUniSet_sqlite_la_SOURCES = SQLiteInterface.cc DBServer_SQLite.cc
+libUniSet2_sqlite_la_SOURCES = SQLiteInterface.cc DBServer_SQLite.cc
-libUniSet_sqlite_la_LIBADD = $(top_builddir)/lib/libUniSet.la $(SQLITE3_LIBS)
+libUniSet2_sqlite_la_LIBADD = $(top_builddir)/lib/libUniSet2.la $(SQLITE3_LIBS)
-libUniSet_sqlite_la_CXXFLAGS = $(SQLITE3_CFLAGS)
+libUniSet2_sqlite_la_CXXFLAGS = $(SQLITE3_CFLAGS)
-bin_PROGRAMS = uniset-sqlite-dbserver
+bin_PROGRAMS = @PACKAGE@-sqlite-dbserver
-uniset_sqlite_dbserver_LDADD = libUniSet-sqlite.la $(top_builddir)/lib/libUniSet.la
+@PACKAGE@_sqlite_dbserver_LDADD = libUniSet2-sqlite.la $(top_builddir)/lib/libUniSet2.la
-uniset_sqlite_dbserver_SOURCES = main.cc
+@PACKAGE@_sqlite_dbserver_SOURCES = main.cc
 noinst_PROGRAMS = sqlite-test
-sqlite_test_LDADD = libUniSet-sqlite.la $(top_builddir)/lib/libUniSet.la
+sqlite_test_LDADD = libUniSet2-sqlite.la $(top_builddir)/lib/libUniSet2.la
 sqlite_test_SOURCES = test.cc
 # install
@@ -23,7 +23,7 @@ devel_include_HEADERS = *.h
 devel_includedir = $(includedir)/@PACKAGE@/sqlite
 pkgconfigdir    = $(libdir)/pkgconfig
-pkgconfig_DATA  = libUniSetSQLite.pc
+pkgconfig_DATA  = libUniSet2SQLite.pc
 endif
\ No newline at end of file
--- a/extensions/DBServer-SQLite/libUniSetSQLite.pc.in
+++ b/extensions/DBServer-SQLite/libUniSetSQLite.pc.in
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-Name: libUniSetSQLite
-Description: Support library for libUniSetSQLite
-Requires: libUniSet sqlite3
-Version: 1.0.0
-Libs: -L${libdir} -lUniSet-sqlite
-Cflags: -I${includedir}/uniset -I${includedir}/sqlite
--- a/extensions/LogicProcessor/libUniSetLogicProcessor.pc.in
+++ b/extensions/LogicProcessor/libUniSetLogicProcessor.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
-Name: libUniSetLogicProcessor
+Name: libUniSet2SQLite
-Description: Support library for UniSetIOControl
+Description: Support library for libUniSet2SQLite
-Requires: libUniSetExtensions
+Requires: libUniSet2 sqlite3
 Version: @VERSION@
-Libs: -L${libdir} -lUniSetLProcessor
+Libs: -L${libdir} -lUniSet2-sqlite
-Cflags: -I${includedir}/uniset
+Cflags: -I${includedir}/@PACKAGE@ -I${includedir}/sqlite
--- a/extensions/IOControl/Makefile.am
+++ b/extensions/IOControl/Makefile.am
 bin_PROGRAMS = @PACKAGE@-iocontrol @PACKAGE@-iotest @PACKAGE@-iocalibr
-# не забывайте править версию в pc-файле 
+# не забывайте править версию в2.pc-файле
 UIO_VER=@LIBVER@
-lib_LTLIBRARIES 	= libUniSetIOControl.la
+lib_LTLIBRARIES 	= libUniSet2IOControl.la
-libUniSetIOControl_la_LDFLAGS  = -version-info $(UIO_VER) 
+libUniSet2IOControl_la_LDFLAGS  = -version-info $(UIO_VER)
-libUniSetIOControl_la_LIBADD		= $(COMEDI_LIBS) $(SIGC_LIBS) \
+libUniSet2IOControl_la_LIBADD		= $(COMEDI_LIBS) $(SIGC_LIBS) \
-	$(top_builddir)/extensions/lib/libUniSetExtensions.la \
+	$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
-	$(top_builddir)/lib/libUniSet.la \
+	$(top_builddir)/lib/libUniSet2.la \
-	$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
+	$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
 	-lm
-libUniSetIOControl_la_CXXFLAGS 	= $(COMEDI_CFLAGS) $(SIGC_CFLAGS) \
+libUniSetIOControl2_la_CXXFLAGS = $(COMEDI_CFLAGS) $(SIGC_CFLAGS) \
 	-I$(top_builddir)/extensions/include \
 	-I$(top_builddir)/extensions/SharedMemory
-libUniSetIOControl_la_SOURCES 	= ComediInterface.cc IOControl.cc
+libUniSet2IOControl_la_SOURCES = ComediInterface.cc IOControl.cc
-@PACKAGE@_iocontrol_LDADD 	= libUniSetIOControl.la \
+@PACKAGE@_iocontrol_LDADD = libUniSet2IOControl.la \
-	$(top_builddir)/lib/libUniSet.la \
+	$(top_builddir)/lib/libUniSet2.la \
-	$(top_builddir)/extensions/lib/libUniSetExtensions.la $(COMEDI_LIBS) -lm
+	$(top_builddir)/extensions/lib/libUniSet2Extensions.la $(COMEDI_LIBS) -lm
-@PACKAGE@_iocontrol_CXXFLAGS 	= $(COMEDI_CFLAGS) $(SIGC_CFLAGS) \
+@PACKAGE@_iocontrol_CXXFLAGS = $(COMEDI_CFLAGS) $(SIGC_CFLAGS) \
 	-I$(top_builddir)/extensions/include \
 	-I$(top_builddir)/extensions/SharedMemory
-@PACKAGE@_iocontrol_SOURCES 	= iocontrol.cc
+@PACKAGE@_iocontrol_SOURCES = iocontrol.cc
 @PACKAGE@_iotest_CXXFLAGS = $(COMEDI_CFLAGS)
 @PACKAGE@_iotest_LDADD 	= $(COMEDI_LIBS) -lm
@@ -31,8 +31,8 @@ libUniSetIOControl_la_SOURCES 	= ComediInterface.cc IOControl.cc
 @PACKAGE@_iocalibr_CXXFLAGS 	= $(COMEDI_CFLAGS)
 @PACKAGE@_iocalibr_LDADD 		= $(COMEDI_LIBS) \
-	$(top_builddir)/lib/libUniSet.la \
+	$(top_builddir)/lib/libUniSet2.la \
-	$(top_builddir)/extensions/lib/libUniSetExtensions.la \
+	$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 	-lm
 @PACKAGE@_iocalibr_SOURCES 	= iocalibr.cc
@@ -41,7 +41,7 @@ devel_include_HEADERS = *.h
 devel_includedir = $(pkgincludedir)/extensions
 pkgconfigdir 	= $(libdir)/pkgconfig
-pkgconfig_DATA 	= libUniSetIOControl.pc
+pkgconfig_DATA 	= libUniSet2IOControl.pc
 all-local:
 	ln -sf ../IOControl/$(devel_include_HEADERS) ../include
--- a/extensions/ModbusSlave/libUniSetMBSlave.pc.in
+++ b/extensions/ModbusSlave/libUniSetMBSlave.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
-Name: libUniSetMBSlave
+Name: libUniSet2IOControl
-Description: Support library for UniSetModbusSlave
+Description: Support library for UniSet2IOControl
-Requires: libUniSetExtensions libUniSetSharedMemory
+Requires: libUniSet2Extensions
 Version: @VERSION@
-Libs: -L${libdir} -lUniSetMBSlave
+Libs: -L${libdir} -lUniSet2IOControl
-Cflags: -I${includedir}/uniset
+Cflags: -I${includedir}/@PACKAGE@
--- a/extensions/LogicProcessor/Makefile.am
+++ b/extensions/LogicProcessor/Makefile.am
-# не забывайте править версию в pc-файле 
+# не забывайте править версию в2.pc-файле
 ULPROC_VER=@LIBVER@
-lib_LTLIBRARIES 			= libUniSetLProcessor.la
+lib_LTLIBRARIES 			= libUniSet2LProcessor.la
-libUniSetLProcessor_la_LDFLAGS  = -version-info $(ULPROC_VER) 
+libUniSet2LProcessor_la_LDFLAGS  = -version-info $(ULPROC_VER)
-libUniSetLProcessor_la_LIBADD	= $(top_builddir)/lib/libUniSet.la \
+libUniSet2LProcessor_la_LIBADD	= $(top_builddir)/lib/libUniSet2.la \
-							$(top_builddir)/extensions/lib/libUniSetExtensions.la $(SIGC_LIBS)
+							$(top_builddir)/extensions/lib/libUniSet2Extensions.la $(SIGC_LIBS)
-libUniSetLProcessor_la_CXXFLAGS	= -I$(top_builddir)/extensions/include \
+libUniSet2LProcessor_la_CXXFLAGS	= -I$(top_builddir)/extensions/include \
 							-I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
-libUniSetLProcessor_la_SOURCES 	= Element.cc TOR.cc TAND.cc TDelay.cc TNOT.cc \
+libUniSet2LProcessor_la_SOURCES 	= Element.cc TOR.cc TAND.cc TDelay.cc TNOT.cc \
 Schema.cc SchemaXML.cc LProcessor.cc PassiveLProcessor.cc
 bin_PROGRAMS 		= @PACKAGE@-logicproc @PACKAGE@-plogicproc
 @PACKAGE@_logicproc_SOURCES 	= logicproc.cc
-@PACKAGE@_logicproc_LDADD 	= libUniSetLProcessor.la \
+@PACKAGE@_logicproc_LDADD 	= libUniSetLProcessor2.la \
-						$(top_builddir)/extensions/lib/libUniSetExtensions.la \
+						$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
-						$(top_builddir)/lib/libUniSet.la $(SIGC_LIBS)
+						$(top_builddir)/lib/libUniSet2.la $(SIGC_LIBS)
 @PACKAGE@_logicproc_CXXFLAGS	= -I$(top_builddir)/extensions/include \
 				-I$(top_builddir)/extensions/SharedMemory \
 				$(SIGC_CFLAGS)
 @PACKAGE@_plogicproc_SOURCES 	= plogicproc.cc
-@PACKAGE@_plogicproc_LDADD 	= libUniSetLProcessor.la \
+@PACKAGE@_plogicproc_LDADD 	= libUniSet2LProcessor.la \
-						$(top_builddir)/extensions/lib/libUniSetExtensions.la \
+						$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
-						$(top_builddir)/lib/libUniSet.la $(SIGC_LIBS)
+						$(top_builddir)/lib/libUniSet2.la $(SIGC_LIBS)
 @PACKAGE@_plogicproc_CXXFLAGS	= -I$(top_builddir)/extensions/include \
 				-I$(top_builddir)/extensions/SharedMemory \
 				$(SIGC_CFLAGS)
@@ -34,7 +34,7 @@ devel_include_HEADERS = *.h
 devel_includedir = $(pkgincludedir)/extensions
 pkgconfigdir 	= $(libdir)/pkgconfig
-pkgconfig_DATA 	= libUniSetLogicProcessor.pc
+pkgconfig_DATA 	= libUniSet2LogicProcessor.pc
 all-local:
 	ln -sf ../LogicProcessor/$(devel_include_HEADERS) ../include
--- a/extensions/RRDServer/libUniSetRRDServer.pc.in
+++ b/extensions/RRDServer/libUniSetRRDServer.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
-Name: libUniSetRRDServer
+Name: libUniSet2LogicProcessor
-Description: Support library for UniSetRRDServer
+Description: Support library for UniSet2LogicProcessor
-Requires: libUniSetExtensions librrd
+Requires: libUniSet2Extensions
 Version: @VERSION@
-Libs: -L${libdir} -lUniSetRRDServer
+Libs: -L${libdir} -lUniSet2LProcessor
-Cflags: -I${includedir}/uniset
+Cflags: -I${includedir}/@PACKAGE@
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -11,7 +11,7 @@ SUBDIRS = lib include SharedMemory IOControl LogicProcessor \
 #SharedMemoryPlus
 pkgconfigdir 	= $(libdir)/pkgconfig
-pkgconfig_DATA 	= libUniSetExtensions.pc
+pkgconfig_DATA 	= libUniSet2Extensions.pc
 else
 SUBDIRS =

--- a/extensions/ModbusMaster/Makefile.am
+++ b/extensions/ModbusMaster/Makefile.am
 noinst_LTLIBRARIES 		= libMBMaster.la
-libMBMaster_la_LIBADD	= $(top_builddir)/lib/libUniSet.la \
+libMBMaster_la_LIBADD	= $(top_builddir)/lib/libUniSet2.la \
-								$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
+								$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
-								$(top_builddir)/extensions/lib/libUniSetExtensions.la \
+								$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 								$(SIGC_LIBS)
 libMBMaster_la_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
 libMBMaster_la_SOURCES 	= MBExchange.cc RTUStorage.cc
 bin_PROGRAMS 		= @PACKAGE@-mbtcpmaster @PACKAGE@-mbtcpmultimaster @PACKAGE@-rtuexchange @PACKAGE@-mtr-conv @PACKAGE@-rtu188-state @PACKAGE@-vtconv @PACKAGE@-mtr-setup @PACKAGE@-mtr-read
-lib_LTLIBRARIES 	= libUniSetMBTCPMaster.la libUniSetRTU.la
+lib_LTLIBRARIES 	= libUniSetMBTCPMaster2.la libUniSet2RTU.la
 # -------------------- Mobus TCP -------------------
-# не забывайте править версию в pc-файле
+# не забывайте править версию в2.pc-файле
 UMBTCP_VER=@LIBVER@
-libUniSetMBTCPMaster_la_LDFLAGS  = -version-info $(UMBTCP_VER)
+libUniSet2MBTCPMaster_la_LDFLAGS  = -version-info $(UMBTCP_VER)
-libUniSetMBTCPMaster_la_LIBADD	 = libMBMaster.la $(top_builddir)/lib/libUniSet.la \
+libUniSet2MBTCPMaster_la_LIBADD	 = libMBMaster.la $(top_builddir)/lib/libUniSet2.la \
-								$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
+								$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
-								$(top_builddir)/extensions/lib/libUniSetExtensions.la \
+								$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 								$(SIGC_LIBS)
-libUniSetMBTCPMaster_la_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
+libUniSet2MBTCPMaster_la_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
-libUniSetMBTCPMaster_la_SOURCES 	= MBTCPMaster.cc MBTCPMultiMaster.cc
+libUniSet2MBTCPMaster_la_SOURCES 	= MBTCPMaster.cc MBTCPMultiMaster.cc
 @PACKAGE@_mbtcpmaster_SOURCES 	= main.cc
-@PACKAGE@_mbtcpmaster_LDADD 	= libUniSetMBTCPMaster.la libMBMaster.la $(top_builddir)/lib/libUniSet.la \
+@PACKAGE@_mbtcpmaster_LDADD 	= libUniSet2MBTCPMaster.la libMBMaster.la $(top_builddir)/lib/libUniSet2.la \
-									$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
+									$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
-									$(top_builddir)/extensions/lib/libUniSetExtensions.la \
+									$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 									$(SIGC_LIBS)
 @PACKAGE@_mbtcpmaster_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
 @PACKAGE@_mbtcpmultimaster_SOURCES 	= multi-main.cc
-@PACKAGE@_mbtcpmultimaster_LDADD 	= libUniSetMBTCPMaster.la libMBMaster.la $(top_builddir)/lib/libUniSet.la \
+@PACKAGE@_mbtcpmultimaster_LDADD 	= libUniSet2MBTCPMaster.la libMBMaster.la $(top_builddir)/lib/libUniSet2.la \
-									$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
+									$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
-									$(top_builddir)/extensions/lib/libUniSetExtensions.la \
+									$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 									$(SIGC_LIBS)
 @PACKAGE@_mbtcpmultimaster_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
 # -------------------- Mobus RTU -------------------
-# не забывайте править версию в pc-файле
+# не забывайте править версию в2.pc-файле
-URTU_VER=2:2:0
+URTU_VER=@LIBVER@
-libUniSetRTU_la_LDFLAGS  = -version-info $(URTU_VER)
+libUniSet2RTU.la_LDFLAGS  = -version-info $(URTU_VER)
-libUniSetRTU_la_LIBADD		= libMBMaster.la $(top_builddir)/lib/libUniSet.la \
+libUniSet2RTU.la_LIBADD		= libMBMaster.la $(top_builddir)/lib/libUniSet2.la \
-								$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
+								$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
-								$(top_builddir)/extensions/lib/libUniSetExtensions.la \
+								$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 								$(SIGC_LIBS)
-libUniSetRTU_la_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
+libUniSet2RTU.la_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
-libUniSetRTU_la_SOURCES 	= RTUExchange.cc
+libUniSet2RTU.la_SOURCES 	= RTUExchange.cc
 @PACKAGE@_rtuexchange_SOURCES 	= rtuexchange.cc
-@PACKAGE@_rtuexchange_LDADD 	= libUniSetRTU.la libMBMaster.la $(top_builddir)/lib/libUniSet.la \
+@PACKAGE@_rtuexchange_LDADD 	= libUniSet2RTU.la libMBMaster.la $(top_builddir)/lib/libUniSet2.la \
-									$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
+									$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
-									$(top_builddir)/extensions/lib/libUniSetExtensions.la \
+									$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 									$(SIGC_LIBS)
 @PACKAGE@_rtuexchange_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
 @PACKAGE@_mtr_conv_SOURCES	= mtr-conv.cc
-@PACKAGE@_mtr_conv_LDADD	= $(top_builddir)/extensions/lib/libUniSetExtensions.la $(top_builddir)/lib/libUniSet.la
+@PACKAGE@_mtr_conv_LDADD	= $(top_builddir)/extensions/lib/libUniSet2Extensions.la $(top_builddir)/lib/libUniSet2.la
 @PACKAGE@_mtr_conv_CXXFLAGS = -I$(top_builddir)/extensions/include
 @PACKAGE@_mtr_setup_SOURCES	= mtr-setup.cc
-@PACKAGE@_mtr_setup_LDADD	= $(top_builddir)/extensions/lib/libUniSetExtensions.la $(top_builddir)/lib/libUniSet.la
+@PACKAGE@_mtr_setup_LDADD	= $(top_builddir)/extensions/lib/libUniSet2Extensions.la $(top_builddir)/lib/libUniSet2.la
 @PACKAGE@_mtr_setup_CXXFLAGS = -I$(top_builddir)/extensions/include
 @PACKAGE@_mtr_read_SOURCES	= mtr-read.cc
-@PACKAGE@_mtr_read_LDADD	= $(top_builddir)/extensions/lib/libUniSetExtensions.la $(top_builddir)/lib/libUniSet.la
+@PACKAGE@_mtr_read_LDADD	= $(top_builddir)/extensions/lib/libUniSet2Extensions.la $(top_builddir)/lib/libUniSet2.la
 @PACKAGE@_mtr_read_CXXFLAGS = -I$(top_builddir)/extensions/include
 @PACKAGE@_vtconv_SOURCES	= vtconv.cc
-@PACKAGE@_vtconv_LDADD	= $(top_builddir)/extensions/lib/libUniSetExtensions.la $(top_builddir)/lib/libUniSet.la
+@PACKAGE@_vtconv_LDADD	= $(top_builddir)/extensions/lib/libUniSet2Extensions.la $(top_builddir)/lib/libUniSet2.la
 @PACKAGE@_vtconv_CXXFLAGS = -I$(top_builddir)/extensions/include
-@PACKAGE@_rtu188_state_LDADD 		= libUniSetRTU.la libMBMaster.la \
+@PACKAGE@_rtu188_state_LDADD 		= libUniSet2RTU.la libMBMaster.la \
-		$(top_builddir)/extensions/lib/libUniSetExtensions.la $(top_builddir)/lib/libUniSet.la
+		$(top_builddir)/extensions/lib/libUniSet2Extensions.la $(top_builddir)/lib/libUniSet2.la
 @PACKAGE@_rtu188_state_CXXFLAGS	= -I$(top_builddir)/extensions/include
 @PACKAGE@_rtu188_state_SOURCES		= rtustate.cc
@@ -81,7 +81,7 @@ devel_include_HEADERS = *.h
 devel_includedir = $(pkgincludedir)/extensions
 pkgconfigdir 	= $(libdir)/pkgconfig
-pkgconfig_DATA 	= libUniSetMBTCPMaster.pc libUniSetRTU.pc
+pkgconfig_DATA 	= libUniSet2MBTCPMaster.pc libUniSet2RTU.pc
 all-local:
 	ln -sf ../ModbusMaster/$(devel_include_HEADERS) ../include

--- a/extensions/ModbusMaster/libUniSet2MBTCPMaster.pc.in
+++ b/extensions/ModbusMaster/libUniSet2MBTCPMaster.pc.in
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+Name: libUniSet2MBTCPMaster
+Description: Support library for UniSet2ModbusTCPMaster
+Requires: libUniSet2Extensions libUniSet2SharedMemory
+Version: @VERSION@
+Libs: -L${libdir} -lUniSet2MBTCPMaster
+Cflags: -I${includedir}/@PACKAGE@
--- a/extensions/SharedMemory/libUniSetSharedMemory.pc.in
+++ b/extensions/SharedMemory/libUniSetSharedMemory.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
-Name: libUniSetSharedMemory
+Name: libUniSet2RTU
-Description: Support library for UniSet SharedMemory
+Description: Support library for UniSet2RTUExchange
-Requires: libUniSetExtensions
+Requires: libUniSet2Extensions
 Version: @VERSION@
-Libs: -L${libdir} -lUniSetSharedMemory
+Libs: -L${libdir} -lUniSet2RTU
-Cflags: -I${includedir}/uniset
+Cflags: -I${includedir}/@PACKAGE@
--- a/extensions/ModbusMaster/libUniSetMBTCPMaster.pc.in
+++ b/extensions/ModbusMaster/libUniSetMBTCPMaster.pc.in
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-Name: libUniSetMBTCPMaster
-Description: Support library for UniSetModbusTCPMaster
-Requires: libUniSetExtensions libUniSetSharedMemory
-Version: 1.3.1
-Libs: -L${libdir} -lUniSetMBTCPMaster
-Cflags: -I${includedir}/uniset
--- a/extensions/ModbusMaster/libUniSetRTU.pc.in
+++ b/extensions/ModbusMaster/libUniSetRTU.pc.in
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-Name: libUniSetRTU
-Description: Support library for UniSetRTUExchange
-Requires: libUniSetExtensions
-Version: 2.2.0
-Libs: -L${libdir} -lUniSetRTU
-Cflags: -I${includedir}/uniset
--- a/extensions/ModbusMaster/stop.sh
+++ b/extensions/ModbusMaster/stop.sh
-../../Utilities/scripts/uniset-stop.sh
+../../Utilities/scripts/uniset2-stop.sh
\ No newline at end of file
--- a/extensions/ModbusMaster/uniset-functions.sh
+++ b/extensions/ModbusMaster/uniset-functions.sh
-../../Utilities/scripts/uniset-functions.sh
+../../Utilities/scripts/uniset2-functions.sh
\ No newline at end of file
--- a/extensions/ModbusMaster/uniset-start.sh
+++ b/extensions/ModbusMaster/uniset-start.sh
-../../Utilities/scripts/uniset-start.sh
+../../Utilities/scripts/uniset2-start.sh
\ No newline at end of file
--- a/extensions/ModbusSlave/Makefile.am
+++ b/extensions/ModbusSlave/Makefile.am
 bin_PROGRAMS = @PACKAGE@-mbslave
-# не забывайте править версию в pc-файле 
+# не забывайте править версию в2.pc-файле
 UMBS_VER=@LIBVER@
-lib_LTLIBRARIES 				= libUniSetMBSlave.la
+lib_LTLIBRARIES 			  = libUniSet2MBSlave.la
-libUniSetMBSlave_la_LDFLAGS  = -version-info $(UMBS_VER) 
+libUniSet2MBSlave_la_LDFLAGS  = -version-info $(UMBS_VER)
-libUniSetMBSlave_la_LIBADD		= $(top_builddir)/lib/libUniSet.la \
+libUniSet2MBSlave_la_LIBADD		= $(top_builddir)/lib/libUniSet2.la \
-								$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
+								$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
-								$(top_builddir)/extensions/lib/libUniSetExtensions.la \
+								$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 								$(SIGC_LIBS)
-libUniSetMBSlave_la_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
+libUniSet2MBSlave_la_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
-libUniSetMBSlave_la_SOURCES 	= MBSlave.cc
+libUniSet2MBSlave_la_SOURCES 	= MBSlave.cc
 @PACKAGE@_mbslave_SOURCES 	= mbslave.cc
-@PACKAGE@_mbslave_LDADD 	= libUniSetMBSlave.la $(top_builddir)/lib/libUniSet.la \
+@PACKAGE@_mbslave_LDADD 	= libUniSet2MBSlave.la $(top_builddir)/lib/libUniSet2.la \
-									$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
+									$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
-									$(top_builddir)/extensions/lib/libUniSetExtensions.la \
+									$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 									$(SIGC_LIBS)
 @PACKAGE@_mbslave_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS)
@@ -24,7 +24,7 @@ devel_include_HEADERS = *.h
 devel_includedir = $(pkgincludedir)/extensions
 pkgconfigdir 	= $(libdir)/pkgconfig
-pkgconfig_DATA 	= libUniSetMBSlave.pc
+pkgconfig_DATA 	= libUniSet2MBSlave.pc
 all-local:
 	ln -sf ../ModbusSlave/$(devel_include_HEADERS) ../include
--- a/extensions/UNetUDP/libUniSetUNetUDP.pc.in
+++ b/extensions/UNetUDP/libUniSetUNetUDP.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
-Name: libUniSetUNetUDP
+Name: libUniSet2MBSlave
-Description: Support library for UniSetUNetUDP
+Description: Support library for UniSet2ModbusSlave
-Requires: libUniSetExtensions
+Requires: libUniSet2Extensions libUniSet2SharedMemory
 Version: @VERSION@
-Libs: -L${libdir} -lUniSetUNetUDP
+Libs: -L${libdir} -lUniSet2MBSlave
-Cflags: -I${includedir}/uniset
+Cflags: -I${includedir}/@PACKAGE@
--- a/extensions/RRDServer/Makefile.am
+++ b/extensions/RRDServer/Makefile.am
@@ -6,21 +6,21 @@ bin_PROGRAMS = @PACKAGE@-rrdserver
 RRD_VER=@LIBVER@
-lib_LTLIBRARIES = libUniSetRRDServer.la
+lib_LTLIBRARIES = libUniSet2RRDServer.la
-libUniSetRRDServer_la_LDFLAGS  = -version-info $(RRD_VER) 
+libUniSet2RRDServer_la_LDFLAGS  = -version-info $(RRD_VER)
-libUniSetRRDServer_la_LIBADD		= $(top_builddir)/lib/libUniSet.la \
+libUniSet2RRDServer_la_LIBADD		= $(top_builddir)/lib/libUniSet2.la \
-									$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
+									$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
-									$(top_builddir)/extensions/lib/libUniSetExtensions.la \
+									$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 									$(SIGC_LIBS) $(RRD_LIBS)
-libUniSetRRDServer_la_CXXFLAGS	= -I$(top_builddir)/extensions/include \
+libUniSet2RRDServer_la_CXXFLAGS	= -I$(top_builddir)/extensions/include \
 									-I$(top_builddir)/extensions/SharedMemory \
 									$(SIGC_CFLAGS) $(RRD_CFLAGS)
-libUniSetRRDServer_la_SOURCES 	= RRDServer.cc
+libUniSet2RRDServer_la_SOURCES 	= RRDServer.cc
 @PACKAGE@_rrdserver_SOURCES 	= main.cc
-@PACKAGE@_rrdserver_LDADD 	= libUniSetRRDServer.la $(top_builddir)/lib/libUniSet.la \
+@PACKAGE@_rrdserver_LDADD 	= libUniSet2RRDServer.la $(top_builddir)/lib/libUniSet2.la \
-									$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
+									$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
-									$(top_builddir)/extensions/lib/libUniSetExtensions.la \
+									$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 									$(SIGC_LIBS) $(RRD_LIBS)
 @PACKAGE@_rrdserver_CXXFLAGS	= -I$(top_builddir)/extensions/include \
 									-I$(top_builddir)/extensions/SharedMemory \
@@ -31,7 +31,7 @@ devel_include_HEADERS = *.h
 devel_includedir = $(pkgincludedir)/extensions
 pkgconfigdir 	= $(libdir)/pkgconfig
-pkgconfig_DATA 	= libUniSetRRDServer.pc
+pkgconfig_DATA 	= libUniSet2RRDServer2.pc
 all-local:
 	ln -sf ../RRDServer/$(devel_include_HEADERS) ../include

--- a/extensions/UniNetwork/libUniSetNetwork.pc.in
+++ b/extensions/UniNetwork/libUniSetNetwork.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
-Name: libUniSetNetwork
+Name: libUniSet2RRDServer
-Description: Support library for UniSet net exchange
+Description: Support library for UniSet2RRDServer
-Requires: libUniSetExtensions libUniSetSharedMemory
+Requires: libUniSet2Extensions librrd
 Version: @VERSION@
-Libs: -L${libdir} -lUniSetNetwork
+Libs: -L${libdir} -lUniSet2RRDServer
-Cflags: -I${includedir}/uniset
+Cflags: -I${includedir}/@PACKAGE@
--- a/extensions/SMDBServer/Makefile.am
+++ b/extensions/SMDBServer/Makefile.am
@@ -2,24 +2,24 @@ bin_PROGRAMS 			= @PACKAGE@-smdbserver
 USMDB_VER=@LIBVER@
-lib_LTLIBRARIES 			= libUniSetSMDBServer.la
+lib_LTLIBRARIES 			= libUniSet2SMDBServer.la
-libUniSetSMDBServer_la_LDFLAGS  = -version-info $(USMDB_VER) 
+libUniSet2SMDBServer_la_LDFLAGS  = -version-info $(USMDB_VER)
-libUniSetSMDBServer_la_LIBADD		= $(top_builddir)/lib/libUniSet.la \
+libUniSet2SMDBServer_la_LIBADD		= $(top_builddir)/lib/libUniSet2.la \
-									$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
+									$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
-									$(top_builddir)/extensions/lib/libUniSetExtensions.la \
+									$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
-									$(top_builddir)/Utilities/DBServer-MySQL/libUniSet-mysql.la \
+									$(top_builddir)/Utilities/DBServer-MySQL/libUniSet2-mysql.la \
 									$(SIGC_LIBS)
-libUniSetSMDBServer_la_CXXFLAGS	= -I$(top_builddir)/extensions/include \
+libUniSet2SMDBServer_la_CXXFLAGS	= -I$(top_builddir)/extensions/include \
 									-I$(top_builddir)/extensions/SharedMemory \
 									-I$(top_builddir)/Utilities/DBServer-MySQL \
 									$(SIGC_CFLAGS)
-libUniSetSMDBServer_la_SOURCES 	= SMDBServer.cc
+libUniSet2SMDBServer_la_SOURCES 	= SMDBServer.cc
 @PACKAGE@_smdbserver_SOURCES 	= main.cc
-@PACKAGE@_smdbserver_LDADD 	= libUniSetSMDBServer.la $(top_builddir)/lib/libUniSet.la \
+@PACKAGE@_smdbserver_LDADD 	= libUniSet2SMDBServer.la $(top_builddir)/lib/libUniSet2.la \
-									$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
+									$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
-									$(top_builddir)/extensions/lib/libUniSetExtensions.la \
+									$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
-									$(top_builddir)/Utilities/DBServer-MySQL/libUniSet-mysql.la \
+									$(top_builddir)/Utilities/DBServer-MySQL/libUniSet2-mysql.la \
 									$(SIGC_LIBS)
 @PACKAGE@_smdbserver_CXXFLAGS	= -I$(top_builddir)/extensions/include \
 									-I$(top_builddir)/extensions/SharedMemory \
@@ -31,7 +31,7 @@ devel_include_HEADERS = *.h
 devel_includedir = $(pkgincludedir)/extensions
 pkgconfigdir 	= $(libdir)/pkgconfig
-pkgconfig_DATA 	= libUniSetSMDBServer.pc
+pkgconfig_DATA 	= libUniSet2SMDBServer.pc
 all-local:
 	ln -sf ../SMDBServer/$(devel_include_HEADERS) ../include
--- a/extensions/SMDBServer/libUniSetSMDBServer.pc.in
+++ b/extensions/SMDBServer/libUniSetSMDBServer.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
-Name: libUniSetSMDBServer
+Name: libUniSet2SMDBServer
 Description: Support library for UniSetSMDBServer
-Requires: libUniSetExtensions
+Requires: libUniSet2Extensions
 Version: @VERSION@
-Libs: -L${libdir} -lUniSetSMDBServer
+Libs: -L${libdir} -lUniSet2SMDBServer
-Cflags: -I${includedir}/uniset
+Cflags: -I${includedir}/@PACKAGE@
--- a/extensions/SMViewer/Makefile.am
+++ b/extensions/SMViewer/Makefile.am
 bin_PROGRAMS 	= @PACKAGE@-smviewer
-@PACKAGE@_smviewer_LDADD		= $(SIGC_LIBS) $(top_builddir)/lib/libUniSet.la \
+@PACKAGE@_smviewer_LDADD		= $(SIGC_LIBS) $(top_builddir)/lib/libUniSet2.la \
-	$(top_builddir)/extensions/lib/libUniSetExtensions.la
+	$(top_builddir)/extensions/lib/libUniSet2Extensions.la
 @PACKAGE@_smviewer_CPPFLAGS	= $(SIGC_CFLAGS) -I$(top_builddir)/extensions/include
 @PACKAGE@_smviewer_SOURCES = SMViewer.cc main.cc
--- a/extensions/SharedMemory/Makefile.am
+++ b/extensions/SharedMemory/Makefile.am
 bin_PROGRAMS		= @PACKAGE@-smemory
-# не забывайте править версию в pc-файле 
+# не забывайте править версию в2.pc-файле
 USM_VER=@LIBVER@
-lib_LTLIBRARIES 	= libUniSetSharedMemory.la
+lib_LTLIBRARIES 	= libUniSet2SharedMemory.la
-libUniSetSharedMemory_la_LDFLAGS	= -version-info $(USM_VER)
+libUniSet2SharedMemory.la_LDFLAGS	= -version-info $(USM_VER)
-libUniSetSharedMemory_la_LIBADD		= $(SIGC_LIBS) $(top_builddir)/lib/libUniSet.la \
+libUniSet2SharedMemory.la_LIBADD		= $(SIGC_LIBS) $(top_builddir)/lib/libUniSet2.la \
-	$(top_builddir)/extensions/lib/libUniSetExtensions.la
+	$(top_builddir)/extensions/lib/libUniSet2Extensions.la
-libUniSetSharedMemory_la_CPPFLAGS	= $(SIGC_CFLAGS) -I$(top_builddir)/extensions/include
+libUniSet2SharedMemory.la_CPPFLAGS	= $(SIGC_CFLAGS) -I$(top_builddir)/extensions/include
-libUniSetSharedMemory_la_SOURCES 	= SharedMemory.cc 
+libUniSet2SharedMemory.la_SOURCES 	= SharedMemory.cc
-@PACKAGE@_smemory_LDADD 	= libUniSetSharedMemory.la $(top_builddir)/lib/libUniSet.la \
+@PACKAGE@_smemory_LDADD 	= libUniSet2SharedMemory.la $(top_builddir)/lib/libUniSet2.la \
-	$(top_builddir)/extensions/lib/libUniSetExtensions.la
+	$(top_builddir)/extensions/lib/libUniSet2Extensions.la
 @PACKAGE@_smemory_CPPFLAGS	= $(SIGC_CFLAGS) -I$(top_builddir)/extensions/include
 @PACKAGE@_smemory_SOURCES 	= smemory.cc
@@ -22,7 +22,7 @@ devel_include_HEADERS = *.h
 devel_includedir = $(pkgincludedir)/extensions
 pkgconfigdir 	= $(libdir)/pkgconfig
-pkgconfig_DATA 	= libUniSetSharedMemory.pc
+pkgconfig_DATA 	= libUniSet2SharedMemory.pc
 all-local:
 	ln -sf ../SharedMemory/$(devel_include_HEADERS) ../include
--- a/extensions/libUniSetExtensions.pc.in
+++ b/extensions/libUniSetExtensions.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
-Name: libUniSetExtensions
+Name: libUniSet2SharedMemory
-Description: Support library for UniSet Extensions
+Description: Support library for UniSet2 SharedMemory
-Requires: libUniSet comedilib
+Requires: libUniSet2Extensions
 Version: @VERSION@
-Libs: -L${libdir} -lUniSetExtensions
+Libs: -L${libdir} -lUniSet2SharedMemory
-Cflags: -I${includedir}/uniset
+Cflags: -I${includedir}/@PACKAGE@
--- a/extensions/SharedMemoryPlus/Makefile.am
+++ b/extensions/SharedMemoryPlus/Makefile.am
 bin_PROGRAMS 		= @PACKAGE@-smemory-plus
-@PACKAGE@_smemory_plus_LDADD 		= $(top_builddir)/lib/libUniSet.la \
+@PACKAGE@_smemory_plus_LDADD 		= $(top_builddir)/lib/libUniSet2.la \
-	$(top_builddir)/extensions/UNetUDP/libUniSetUNetUDP.la \
+	$(top_builddir)/extensions/UNetUDP/libUniSet2UNetUDP.la \
-	$(top_builddir)/extensions/ModbusMaster/libUniSetMBTCPMaster.la \
+	$(top_builddir)/extensions/ModbusMaster/libUniSet2MBTCPMaster.la \
-	$(top_builddir)/extensions/ModbusMaster/libUniSetRTU.la \
+	$(top_builddir)/extensions/ModbusMaster/libUniSet2RTU.la \
-	$(top_builddir)/extensions/ModbusSlave/libUniSetMBSlave.la \
+	$(top_builddir)/extensions/ModbusSlave/libUniSet2MBSlave.la \
-	$(top_builddir)/extensions/IOControl/libUniSetIOControl.la \
+	$(top_builddir)/extensions/IOControl/libUniSet2IOControl.la \
-	$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
+	$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
-	$(top_builddir)/extensions/lib/libUniSetExtensions.la \
+	$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 	$(SIGC_LIBS) $(COMCPP_LIBS)
 @PACKAGE@_smemory_plus_CXXFLAGS	= -I$(top_builddir)/extensions/CanNetwork \

--- a/extensions/SharedMemoryPlus/stop.sh
+++ b/extensions/SharedMemoryPlus/stop.sh
-../../Utilities/scripts/uniset-stop.sh
+../../Utilities/scripts/uniset2-stop.sh
\ No newline at end of file
--- a/extensions/UNetUDP/Makefile.am
+++ b/extensions/UNetUDP/Makefile.am
 bin_PROGRAMS = @PACKAGE@-unetexchange @PACKAGE@-unet-udp-tester
-# не забывайте править версию в pc-файле 
+# не забывайте править версию в2.pc-файле
 UNETUDP_VER=@LIBVER@
-lib_LTLIBRARIES 			= libUniSetUNetUDP.la
+lib_LTLIBRARIES 			= libUniSet2UNetUDP.la
-libUniSetUNetUDP_la_LDFLAGS  = -version-info $(UNETUDP_VER)
+libUniSet2UNetUDP_la_LDFLAGS  = -version-info $(UNETUDP_VER)
-libUniSetUNetUDP_la_LIBADD		= $(top_builddir)/lib/libUniSet.la \
+libUniSet2UNetUDP_la_LIBADD		= $(top_builddir)/lib/libUniSet2.la \
-								$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
+								$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
-								$(top_builddir)/extensions/lib/libUniSetExtensions.la \
+								$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 								$(SIGC_LIBS) $(COMCPP_LIBS)
-libUniSetUNetUDP_la_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
+libUniSet2UNetUDP_la_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
-libUniSetUNetUDP_la_SOURCES 	= UDPPacket.cc UNetReceiver.cc UNetSender.cc UNetExchange.cc
+libUniSet2UNetUDP_la_SOURCES 	= UDPPacket.cc UNetReceiver.cc UNetSender.cc UNetExchange.cc
 @PACKAGE@_unetexchange_SOURCES 		= unetexchange.cc
-@PACKAGE@_unetexchange_LDADD 		= libUniSetUNetUDP.la $(top_builddir)/lib/libUniSet.la \
+@PACKAGE@_unetexchange_LDADD 		= libUniSet2UNetUDP.la $(top_builddir)/lib/libUniSet2.la \
-									$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
+									$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
-									$(top_builddir)/extensions/lib/libUniSetExtensions.la \
+									$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
 									$(SIGC_LIBS) $(COMCPP_LIBS)
 @PACKAGE@_unetexchange_CXXFLAGS	= -I$(top_builddir)/extensions/include -I$(top_builddir)/extensions/SharedMemory $(SIGC_CFLAGS) $(COMCPP_CFLAGS)
@@ -29,7 +29,7 @@ devel_include_HEADERS = *.h
 devel_includedir = $(pkgincludedir)/extensions
 pkgconfigdir 	= $(libdir)/pkgconfig
-pkgconfig_DATA 	= libUniSetUNetUDP.pc
+pkgconfig_DATA 	= libUniSet2UNetUDP.pc
 all-local:
 	ln -sf ../UNetUDP/$(devel_include_HEADERS) ../include
--- a/extensions/UNetUDP/libUniSet2UNetUDP.pc.in
+++ b/extensions/UNetUDP/libUniSet2UNetUDP.pc.in
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+Name: libUniSet2UNetUDP
+Description: Support library for UniSet2UNetUDP
+Requires: libUniSet2Extensions
+Version: @VERSION@
+Libs: -L${libdir} -lUniSet2UNetUDP
+Cflags: -I${includedir}/@PACKAGE@
--- a/extensions/UNetUDP/stop.sh
+++ b/extensions/UNetUDP/stop.sh
-../../Utilities/scripts/uniset-stop.sh
+../../Utilities/scripts/uniset2-stop.sh
\ No newline at end of file
--- a/extensions/UNetUDP/uniset-functions.sh
+++ b/extensions/UNetUDP/uniset-functions.sh
-../../Utilities/scripts/uniset-functions.sh
+../../Utilities/scripts/uniset2-functions.sh
\ No newline at end of file
--- a/extensions/UNetUDP/uniset-start.sh
+++ b/extensions/UNetUDP/uniset-start.sh
-../../Utilities/scripts/uniset-start.sh
+../../Utilities/scripts/uniset2-start.sh
\ No newline at end of file
--- a/extensions/UniNetwork/Makefile.am
+++ b/extensions/UniNetwork/Makefile.am
 bin_PROGRAMS		= @PACKAGE@-network
-# не забывайте править версию в pc-файле 
+# не забывайте править версию в2.pc-файле
 UNET_VER=@LIBVER@
-lib_LTLIBRARIES 	= libUniSetNetwork.la
+lib_LTLIBRARIES 	= libUniSet2Network.la
-libUniSetNetwork_la_LDFLAGS  = -version-info $(UNET_VER) 
+libUniSet2Network_la_LDFLAGS  = -version-info $(UNET_VER)
-libUniSetNetwork_la_LIBADD = $(SIGC_LIBS) $(top_builddir)/lib/libUniSet.la \
+libUniSet2Network_la_LIBADD = $(SIGC_LIBS) $(top_builddir)/lib/libUniSet2.la \
-	$(top_builddir)/extensions/lib/libUniSetExtensions.la \
+	$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
-	$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la
+	$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la
-libUniSetNetwork_la_CPPFLAGS	= $(SIGC_CFLAGS) \
+libUniSet2Network_la_CPPFLAGS	= $(SIGC_CFLAGS) \
 	-I$(top_builddir)/extensions/include \
 	-I$(top_builddir)/extensions/SharedMemory
-libUniSetNetwork_la_SOURCES 	= UniExchange.cc 
+libUniSet2Network_la_SOURCES 	= UniExchange.cc
-@PACKAGE@_network_LDADD 	= libUniSetNetwork.la \
+@PACKAGE@_network_LDADD 	= libUniSet2Network.la \
-	$(top_builddir)/lib/libUniSet.la \
+	$(top_builddir)/lib/libUniSet2.la \
-	$(top_builddir)/extensions/lib/libUniSetExtensions.la
+	$(top_builddir)/extensions/lib/libUniSet2Extensions.la
 @PACKAGE@_network_CPPFLAGS	= $(SIGC_CFLAGS) -I$(top_builddir)/extensions/include
 @PACKAGE@_network_SOURCES 	= uninet.cc
@@ -24,7 +24,7 @@ devel_include_HEADERS = *.h
 devel_includedir = $(pkgincludedir)/extensions
 pkgconfigdir 	= $(libdir)/pkgconfig
-pkgconfig_DATA 	= libUniSetNetwork.pc
+pkgconfig_DATA 	= libUniSet2Network.pc
 all-local:
 	ln -sf ../UniNetwork/$(devel_include_HEADERS) ../include
--- a/extensions/UniNetwork/libUniSet2Network.pc.in
+++ b/extensions/UniNetwork/libUniSet2Network.pc.in
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+Name: libUniSet2Network
+Description: Support library for UniSet2 net exchange
+Requires: libUniSet2Extensions libUniSet2SharedMemory
+Version: @VERSION@
+Libs: -L${libdir} -lUniSet2Network
+Cflags: -I${includedir}/@PACKAGE@
--- a/extensions/lib/Makefile.am
+++ b/extensions/lib/Makefile.am
-# не забывайте править версию в pc-файле
+# не забывайте править версию в2.pc-файле
 UEXT_VER=@LIBVER@
-lib_LTLIBRARIES 			= libUniSetExtensions.la
+lib_LTLIBRARIES 			= libUniSet2Extensions.la
-libUniSetExtensions_la_LDFLAGS  = -version-info $(UEXT_VER)
+libUniSet2Extensions.la_LDFLAGS  = -version-info $(UEXT_VER)
-libUniSetExtensions_la_CPPFLAGS	= $(SIGC_CFLAGS) -I$(top_builddir)/extensions/include
+libUniSet2Extensions.la_CPPFLAGS	= $(SIGC_CFLAGS) -I$(top_builddir)/extensions/include
-libUniSetExtensions_la_LIBADD 	= $(SIGC_LIBS) $(top_builddir)/lib/libUniSet.la
+libUniSet2Extensions.la_LIBADD 	= $(SIGC_LIBS) $(top_builddir)/lib/libUniSet2.la
-libUniSetExtensions_la_SOURCES 	= Extensions.cc SMInterface.cc Calibration.cc SingleProcess.cc \
+libUniSet2Extensions.la_SOURCES 	= Extensions.cc SMInterface.cc Calibration.cc SingleProcess.cc \
 	IOBase.cc DigitalFilter.cc PID.cc MTR.cc VTypes.cc UObject_SK.cc
--- a/extensions/libUniSet2Extensions.pc.in
+++ b/extensions/libUniSet2Extensions.pc.in
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+Name: libUniSet2Extensions
+Description: Support library for UniSet2 Extensions
+Requires: libUniSet2 comedilib
+Version: @VERSION@
+Libs: -L${libdir} -lUniSet2Extensions
+Cflags: -I${includedir}/@PACKAGE@
--- a/extensions/tests/Makefile.am
+++ b/extensions/tests/Makefile.am
@@ -3,6 +3,6 @@ SUBDIR=SMemoryTest
 noinst_PROGRAMS = calibration
 calibration_SOURCES 	= calibration.cc
-calibration_LDADD 		= $(top_builddir)/lib/libUniSet.la $(top_builddir)/extensions/lib/libUniSetExtensions.la
+calibration_LDADD 		= $(top_builddir)/lib/libUniSet2.la $(top_builddir)/extensions/lib/libUniSet2Extensions.la
 calibration_CPPFLAGS	= -I$(top_builddir)/include -I$(top_builddir)/extensions/include
--- a/extensions/tests/SMemoryTest/Makefile.am
+++ b/extensions/tests/SMemoryTest/Makefile.am
 noinst_PROGRAMS = smemory-test         
-smemory_test_LDADD = $(top_builddir)/lib/libUniSet.la \
+smemory_test_LDADD = $(top_builddir)/lib/libUniSet2.la \
-	$(top_builddir)/extensions/lib/libUniSetExtensions.la \
+	$(top_builddir)/extensions/lib/libUniSet2Extensions.la \
-	$(top_builddir)/extensions/SharedMemory/libUniSetSharedMemory.la \
+	$(top_builddir)/extensions/SharedMemory/libUniSet2SharedMemory.la \
 	$(SIGC_LIBS) $(COMCPP_LIBS)
 smemory_test_CPPFLAGS = -I$(top_builddir)/include \
 	-I$(top_builddir)/extensions/include \
@@ -10,7 +10,7 @@ smemory_test_CPPFLAGS = -I$(top_builddir)/include \
 smemory_test_SOURCES = TestProc_SK.cc TestProc.cc smemory-test.cc
 TestProc_SK.cc: testproc.src.xml
-#	./uniset-codegen --ask -n TestProc --local-include --topdir $(top_builddir)/ --no-main testproc.src.xml
+#	./uniset2-codegen --ask -n TestProc --local-include --topdir $(top_builddir)/ --no-main testproc.src.xml
 	$(top_builddir)/Utilities/codegen/@PACKAGE@-codegen -l $(top_builddir)/Utilities/codegen --ask -n TestProc --local-include --topdir $(top_builddir)/ --no-main testproc.src.xml
 clean-local:

--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -5,14 +5,14 @@
 #LT_REVISION=0
 #LT_AGE=0
 #LT_RELEASE=0.99
-#libUniSet_la_LDFLAGS	= -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
+#libUniSet2_la_LDFLAGS	= -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
 # `0:0:0' (CURRENT=0, REVISION-0, AGE=0). Формат версии C:R:A.
 # -release 1
-lib_LTLIBRARIES 		= libUniSet.la
+lib_LTLIBRARIES 		= libUniSet2.la
-libUniSet_la_SOURCES	=
+libUniSet2_la_SOURCES	=
-libUniSet_la_LDFLAGS	= -version-info @LIBVER@
+libUniSet2_la_LDFLAGS	= -version-info @LIBVER@
-libUniSet_la_LIBADD		= \
+libUniSet2_la_LIBADD		= \
 $(top_builddir)/src/Communications/libCommunications.la \
 $(top_builddir)/src/Communications/Modbus/libModbus.la \
 $(top_builddir)/src/Interfaces/libInterfaces.la \

--- a/libUniSet.include
+++ b/libUniSet.include
@@ -2,7 +2,7 @@
 # Copyright (c) 2009 Free Software Foundation, Inc.
 # Copyright (c) 2009 Vitaly Lipatov <lav@etersoft.ru>
-# exports flags and libs from pc file for build with library for source tree
+# exports flags and libs from2.pc file for build with library for source tree
 # EXPORTPATH contains path to the project dir (../uniset f.i.)
 # Usage example:
@@ -15,7 +15,7 @@
 # TryExport ../uniset libUniSet.include
-PCFILE=$EXPORTPATH/libUniSet.pc
+PCFILE=$EXPORTPATH/libUniSet2.pc
 test -r "$PCFILE" || exit 1
 # guess prefix in the first line of pkgconfig file
@@ -53,43 +53,43 @@ ext_libs()
 	libs $1/$2
 }
-EXFILE="$EXPORTPATH/extensions libUniSetExtensions.pc"
+EXFILE="$EXPORTPATH/extensions libUniSetExtensions2.pc"
 export UNISET_EXT_CFLAGS="$( ext_cflags $EXFILE )"
 export UNISET_EXT_LIBS="-L$EXPORTPATH/extensions/lib $( ext_libs $EXFILE )"
-EXFILE="$EXPORTPATH/extensions/IOControl libUniSetIOControl.pc"
+EXFILE="$EXPORTPATH/extensions/IOControl libUniSetIOControl2.pc"
 export UNISET_EXT_IO_CFLAGS="$( ext_cflags $EXFILE )"
 export UNISET_EXT_IO_LIBS="$( ext_libs $EXFILE )"
-EXFILE="$EXPORTPATH/extensions/SharedMemory libUniSetSharedMemory.pc"
+EXFILE="$EXPORTPATH/extensions/SharedMemory libUniSetSharedMemory2.pc"
 export UNISET_EXT_SM_CFLAGS="$( ext_cflags $EXFILE )"
 export UNISET_EXT_SM_LIBS="$( ext_libs $EXFILE )"
-EXFILE="$EXPORTPATH/extensions/ModbusSlave libUniSetMBSlave.pc"
+EXFILE="$EXPORTPATH/extensions/ModbusSlave libUniSetMBSlave2.pc"
 export UNISET_EXT_MBS_CFLAGS="$( ext_cflags $EXFILE )"
 export UNISET_EXT_MBS_LIBS="$( ext_libs $EXFILE )"
-EXFILE="$EXPORTPATH/extensions/ModbusMaster libUniSetMBTCPMaster.pc"
+EXFILE="$EXPORTPATH/extensions/ModbusMaster libUniSetMBTCPMaster2.pc"
 export UNISET_EXT_MBM_CFLAGS="$( ext_cflags $EXFILE )"
 export UNISET_EXT_MBM_LIBS="$( ext_libs $EXFILE )"
-EXFILE="$EXPORTPATH/extensions/UniNetwork libUniSetNetwork.pc"
+EXFILE="$EXPORTPATH/extensions/UniNetwork libUniSetNetwork2.pc"
 export UNISET_EXT_NET_CFLAGS="$( ext_cflags $EXFILE )"
 export UNISET_EXT_NET_LIBS="$( ext_libs $EXFILE )"
-EXFILE="$EXPORTPATH/extensions/UNetUDP libUniSetUNetUDP.pc"
+EXFILE="$EXPORTPATH/extensions/UNetUDP libUniSetUNetUDP2.pc"
 export UNISET_EXT_UNETUDP_CFLAGS="$( ext_cflags $EXFILE )"
 export UNISET_EXT_UNETUDP_LIBS="$( ext_libs $EXFILE )"
-EXFILE="$EXPORTPATH/extensions/ModbusMaster libUniSetRTU.pc"
+EXFILE="$EXPORTPATH/extensions/ModbusMaster libUniSetRTU2.pc"
 export UNISET_EXT_RTU_CFLAGS="$( ext_cflags $EXFILE )"
 export UNISET_EXT_RTU_LIBS="$( ext_libs $EXFILE )"
-EXFILE="$EXPORTPATH/extensions/DBServer-MySQL libUniSetMySQL.pc"
+EXFILE="$EXPORTPATH/extensions/DBServer-MySQL libUniSetMySQL2.pc"
 export UNISET_EXT_MYSQL_CFLAGS="$( ext_cflags $EXFILE )"
 export UNISET_EXT_MYSQL_LIBS="$( ext_libs $EXFILE )"
-EXFILE="$EXPORTPATH/extensions/LogicProcessor libUniSetLogicProcessor.pc"
+EXFILE="$EXPORTPATH/extensions/LogicProcessor libUniSetLogicProcessor2.pc"
 export UNISET_EXT_LP_CFLAGS="$( ext_cflags $EXFILE )"
 export UNISET_EXT_LP_LIBS="$( ext_libs $EXFILE )"

--- a/libUniSet.pc.in
+++ b/libUniSet.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
-Name: libUniSet
+Name: libUniSet2
 Description: Support library for UniSet
 Requires: libxml-2.0 sigc++-2.0 omniORB4 libccgnu2
 Version: @VERSION@
-Libs: -L${libdir} -lUniSet
+Libs: -L${libdir} -lUniSet2
-Cflags: -I${includedir}/uniset -D__OMNIORB4
+Cflags: -I${includedir}/@PACKAGE@ -D__OMNIORB4
--- a/python/lib/Makefile.am
+++ b/python/lib/Makefile.am
@@ -2,9 +2,9 @@ if DISABLE_PYTHON
 else
 SUBDIRS=pyUniSet
-#lib_LTLIBRARIES = libUniSetPython.la
+#lib_LTLIBRARIES = libUniSet2Python.la
-#libUniSetPython_la_SOURCES	=
+#libUniSet2Python_la_SOURCES	=
-#libUniSetPython_la_LIBADD	= pyUniSet/_pyUniSet.la
+#libUniSet2Python_la_LIBADD	= pyUniSet/_pyUniSet.la
 python_SCRIPTS = *.py
 endif
--- a/python/lib/__init__.py
+++ b/python/lib/__init__.py
@@ -5,6 +5,6 @@ from UGlobal import *
 from UniXML import *
 from UInterface import *
-from pyUniSet import *
+from pyUniSet2 import *
 from pyUModbus import *
 from pyUConnector import *
--- a/python/lib/pyUniSet/Makefile.am
+++ b/python/lib/pyUniSet/Makefile.am
 if DISABLE_PYTHON
 else
-python_SCRIPTS = pyUniSet.py pyUConnector.py pyUModbus.py pyUExceptions.py
+python_SCRIPTS = pyUniSet2.py pyUConnector.py pyUModbus.py pyUExceptions.py
-pyexec_LTLIBRARIES = _pyUConnector.la _pyUModbus.la _pyUExceptions.la _pyUniSet.la 
+pyexec_LTLIBRARIES = _pyUConnector.la _pyUModbus.la _pyUExceptions.la _pyUniSet2.la
-_pyUniSet_la_SOURCES 	= PyUInterface.cc UInterface_wrap.cxx
+_pyUniSet2_la_SOURCES 	= PyUInterface.cc UInterface_wrap.cxx
-_pyUniSet_la_CXXFLAGS	= $(UNISET_CFLAGS) $(PYTHON_CFLAGS) 
+_pyUniSet2_la_CXXFLAGS	= $(UNISET_CFLAGS) $(PYTHON_CFLAGS)
-_pyUniSet_la_LDFLAGS 	= -module -avoid-version
+_pyUniSet2_la_LDFLAGS 	= -module -avoid-version
-_pyUniSet_la_LIBADD 	= $(UNISET_LIBS) $(PYTHON_LIBS)
+_pyUniSet2_la_LIBADD 	= $(UNISET_LIBS) $(PYTHON_LIBS)
 UInterface_wrap.cxx: UInterface.i PyUInterface.h
 	swig -python -c++ -classic UInterface.i

--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,48 +5,48 @@
 noinst_PROGRAMS 		= passivetimer hourglass delaytimer unixml ui umutex conftest iterator_test sscanf_hex calibration threadtst dlog
 passivetimer_SOURCES 	= passivetimer.cc
-passivetimer_LDADD 		= $(top_builddir)/lib/libUniSet.la
+passivetimer_LDADD 		= $(top_builddir)/lib/libUniSet2.la
 passivetimer_CPPFLAGS	= -I$(top_builddir)/include
 hourglass_SOURCES 	= hourglass.cc
-hourglass_LDADD 	= $(top_builddir)/lib/libUniSet.la
+hourglass_LDADD 	= $(top_builddir)/lib/libUniSet2.la
 hourglass_CPPFLAGS	= -I$(top_builddir)/include
 delaytimer_SOURCES 	= delaytimer.cc
-delaytimer_LDADD 	= $(top_builddir)/lib/libUniSet.la
+delaytimer_LDADD 	= $(top_builddir)/lib/libUniSet2.la
 delaytimer_CPPFLAGS	= -I$(top_builddir)/include
 unixml_SOURCES 	= unixml.cc
-unixml_LDADD 	= $(top_builddir)/lib/libUniSet.la ${SIGC_LIBS}
+unixml_LDADD 	= $(top_builddir)/lib/libUniSet2.la ${SIGC_LIBS}
 unixml_CPPFLAGS	= -I$(top_builddir)/include ${SIGC_CFLAGS}
 iterator_test_SOURCES 	= iterator_test.cc
-iterator_test_LDADD 	= $(top_builddir)/lib/libUniSet.la
+iterator_test_LDADD 	= $(top_builddir)/lib/libUniSet2.la
 iterator_test_CPPFLAGS	= -I$(top_builddir)/include
 ui_SOURCES 	= ui.cc
-ui_LDADD 	= $(top_builddir)/lib/libUniSet.la
+ui_LDADD 	= $(top_builddir)/lib/libUniSet2.la
 ui_CPPFLAGS	= -I$(top_builddir)/include
 umutex_SOURCES 	= umutex.cc
-umutex_LDADD 	= $(top_builddir)/lib/libUniSet.la $(COMCPP_LIBS)
+umutex_LDADD 	= $(top_builddir)/lib/libUniSet2.la $(COMCPP_LIBS)
 umutex_CPPFLAGS	= -I$(top_builddir)/include $(COMCPP_CFLAGS)
 conftest_SOURCES 	= conftest.cc
-conftest_LDADD 	= $(top_builddir)/lib/libUniSet.la
+conftest_LDADD 	= $(top_builddir)/lib/libUniSet2.la
 conftest_CPPFLAGS	= -I$(top_builddir)/include
 sscanf_hex_SOURCES 	= sscanf_hex.cc
 calibration_SOURCES = calibration.cc
-calibration_LDADD 	= $(top_builddir)/lib/libUniSet.la ${SIGC_LIBS}
+calibration_LDADD 	= $(top_builddir)/lib/libUniSet2.la ${SIGC_LIBS}
 calibration_CPPFLAGS	= -I$(top_builddir)/include ${SIGC_CFLAGS}
 threadtst_SOURCES = threadtst.cc
-threadtst_LDADD 	= $(top_builddir)/lib/libUniSet.la ${SIGC_LIBS} $(COMCPP_LIBS)
+threadtst_LDADD 	= $(top_builddir)/lib/libUniSet2.la ${SIGC_LIBS} $(COMCPP_LIBS)
 threadtst_CPPFLAGS	= -I$(top_builddir)/include ${SIGC_CFLAGS} $(COMCPP_CFLAGS)
 dlog_SOURCES = dlog.cc
-dlog_LDADD 	= $(top_builddir)/lib/libUniSet.la ${SIGC_LIBS} $(COMCPP_LIBS)
+dlog_LDADD 	= $(top_builddir)/lib/libUniSet2.la ${SIGC_LIBS} $(COMCPP_LIBS)
 dlog_CPPFLAGS = -I$(top_builddir)/include ${SIGC_CFLAGS} $(COMCPP_CFLAGS)
--- a/tests/UniXmlTest/Makefile.am
+++ b/tests/UniXmlTest/Makefile.am
@@ -4,6 +4,6 @@
 bin_PROGRAMS 			= xmltest
 xmltest_SOURCES 	= XmlTest.cc
-xmltest_LDADD 		= $(top_builddir)/lib/libUniSet.la
+xmltest_LDADD 		= $(top_builddir)/lib/libUniSet2.la
 xmltest_CPPFLAGS	= -I$(top_builddir)/include
--- a/tests/stop.sh
+++ b/tests/stop.sh
-../Utilities/scripts/uniset-stop.sh
+../Utilities/scripts/uniset2-stop.sh
\ No newline at end of file