Temporary commit by gear.

conf/release_helper.sh

@@ -8,9 +8,9 @@ REL=eter
 DEFAULTARCH=i586
 RPMDIR=~/RPM/RPMS/$DEFAULTARCH
 RPMSOURCEDIR=~/RPM/SOURCES
-FTPDIR=/var/ftp/pub/Ourside/RPMS.uniset
+FTPDIR=/var/ftp/pub/Ourside/i586/RPMS.uniset
 PROJECT=uniset
-GEN=/var/ftp/pub/Ourside/genbase.sh
+GEN=/var/ftp/pub/Ourside/i586/genb.sh
 BACKUPDIR=$FTPDIR/backup
 RPMBUILD=/usr/bin/rpmbuild
 
@@ -36,7 +36,7 @@ prepare_tarball()
 	cp -r $WDPROJECT/* $DESTDIR/
 	cd 	$DESTDIR/
 		make distclean
-#		[ -a ./autogen.sh ] && ./autogen.sh
+		[ -a ./autogen.sh ] && ./autogen.sh
 		rm -rf autom4te.cache/
 	
 		echo "Make tarball $TARNAME ... from $DESTDIR"
@@ -78,7 +78,7 @@ function send_notify()
 	CURDATE=`date`
 	MAILTO="devel@server"
 # FIXME:  
-mutt $MAILTO -s "[19910B] New build: $BUILDNAME" <<EOF
+mutt $MAILTO -s "[uniset] New build: $BUILDNAME" <<EOF
   : $BUILDNAME
 -- 
 your $0
@@ -102,11 +102,11 @@ export BUILDNAME=$BASENAME-$VERSION-$RELEASE
 
 add_changelog_helper "- new build" $SPECNAME
 
-prepare_tarball
+prepare_tarball || fatal "Can't prpare"
 
 rpmbb $SPECNAME || fatal "Can't build"
 
-#cp2ftp
+cp2ftp
 
 rpmbs $SPECNAME
 #send_notify

conf/uniset.spec

@@ -2,11 +2,7 @@
 
 Name: uniset
 Version: 0.96
-<<<<<<< HEAD:conf/uniset.spec
-Release: eter6
-=======
-Release: eter9
->>>>>>> 6eb79ccca4b348cddaa393aae9cb34b9fcf2a001:conf/uniset.spec
+Release: eter18
 Summary: UniSet
 License: GPL
 Group: Development/C++
@@ -184,14 +180,28 @@ Libraries needed to develop for uniset extentions
 %_bindir/%name-smviewer
 
 %changelog
-<<<<<<< HEAD:conf/uniset.spec
-* Wed May 20 2009 Pavel Vainerman <pv@altlinux.ru> 0.96-eter5
-=======
+* Thu Jun 04 2009 Pavel Vainerman <pv@etersoft.ru> 0.96-eter18
+- new build
+
+* Thu Jun 04 2009 Pavel Vainerman <pv@etersoft.ru> 0.96-eter17
+- new build
+
+* Thu Jun 04 2009 Pavel Vainerman <pv@etersoft.ru> 0.96-eter16
+- new build
+
+* Thu Jun 04 2009 Pavel Vainerman <pv@etersoft.ru> 0.96-eter15
+- new build
+
+* Thu Jun 04 2009 Pavel Vainerman <pv@etersoft.ru> 0.96-eter14
+- new build
+
+* Thu Jun 04 2009 Pavel Vainerman <pv@etersoft.ru> 0.96-eter13
+- new build
+
 * Tue Apr 21 2009 Pavel Vainerman <pv@etersoft.ru> 0.96-eter6
 - new build
 
 * Tue Apr 21 2009 Pavel Vainerman <pv@etersoft.ru> 0.96-eter5
->>>>>>> 6eb79ccca4b348cddaa393aae9cb34b9fcf2a001:conf/uniset.spec
 - new build
 
 * Mon Apr 06 2009 Pavel Vainerman <pv@altlinux.ru> 0.96-eter4

extentions/IOControl/IOControl.cc

@@ -56,7 +56,7 @@ IOControl::IOControl( UniSetTypes::ObjectId id, UniSetTypes::ObjectId icID,
 	UniXML_iterator it(cnode);
 
 	noCards = true;
-	for( unsigned int i=0; i=<cards.size(); i++ )
+	for( unsigned int i=1; i=<cards.size(); i++ )
 	{
 		stringstream s1;
 		s1 << "--iodev" << i;