[SCM] TANGO distributed control system. branch, master, updated. debian/6.1.1c-1-131-g0558703

[Frédéric-Emmanuel PICCA]

The following commit has been merged in the master branch:
commit eb8d14357bdc15735f9ad087928934ac7484b88a
Author: Frédéric-Emmanuel PICCA <picca at synchrotron-soleil.fr>
Date:   Tue Mar 22 14:57:44 2011 +0100

    * upgrade the debian files for the 7.2.6 version

diff --git a/debian/changelog b/debian/changelog
index 8aa4df5..292e10b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-tango (7.2.5+dfsg-1) unstable; urgency=low
+tango (7.2.6+dfsg-1) unstable; urgency=low
 
   * Initial release (Closes: #400201)
 
- -- Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>  Wed, 16 Feb 2010 08:49:43 +0200
+ -- Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>  Tue, 22 Mar 2011 09:24:31 +0100
diff --git a/debian/rules b/debian/rules
index ab15103..9d45529 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 
 BUILDROOT=build
 PACKAGE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
-VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)~.*/\1/p')
+VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)+.*/\1/p')
 LDFLAGS=$(shell echo $$LDFLAGS | sed -e 's/-Wl,-Bsymbolic-functions//')
 
 get-orig-source:
@@ -23,6 +23,7 @@ override_dh_auto_install:
 	install -p -m 644 $(CURDIR)/$(BUILDROOT)/cppserver/database/create_db.sql debian/tmp/usr/share/dbconfig-common/data/tango-db/install/mysql
 	install -d debian/tmp/usr/share/dbconfig-common/data/tango-db/upgrade/mysql
 	install -p -m 644 $(CURDIR)/debian/sql/upgrade-7.2.0~rc1+dfsg-1 debian/tmp/usr/share/dbconfig-common/data/tango-db/upgrade/mysql/7.2.0~rc1+dfsg-1
+	install -p -m 644 $(CURDIR)/debian/sql/upgrade-7.2.6+dfsg-1 debian/tmp/usr/share/dbconfig-common/data/tango-db/upgrade/mysql/7.2.6+dfsg-1
 
 	# install scripts used during the configuration
 	install -d debian/tmp/usr/share/tango-db
@@ -42,7 +43,9 @@ override_dh_strip:
 override_dh_installinit:
 	# the tango-accesscontrol device must be started after the tango-db.
 	dh_installinit -ptango-accesscontrol --update-rcd-params="defaults 25"
-	dh_installinit -a -Ntango-accesscontrol
+	# the tango-starter device must be started after the tango-db and the tango-accesscontrol.
+	dh_installinit -ptango-starter --update-rcd-params="defaults 30"
+	dh_installinit -a -Ntango-accesscontrol -Ntango-starter
 
 %:
 	dh $@ --builddirectory=$(BUILDROOT)
diff --git a/debian/sql/upgrade-7.2.0~rc1+dfsg-1 b/debian/sql/upgrade-7.2.6+dfsg-1
similarity index 99%
copy from debian/sql/upgrade-7.2.0~rc1+dfsg-1
copy to debian/sql/upgrade-7.2.6+dfsg-1
index e06a326..3f28462 100644
--- a/debian/sql/upgrade-7.2.0~rc1+dfsg-1
+++ b/debian/sql/upgrade-7.2.6+dfsg-1
@@ -33,7 +33,7 @@ DELIMITER |
 CREATE PROCEDURE tango.ds_start 
 (IN ds_name VARCHAR(255),
  IN host VARCHAR(255),
- OUT res_str BLOB) READS SQL DATA COMMENT 'release 1.3'
+ OUT res_str BLOB) READS SQL DATA COMMENT 'release 1.4'
 proc: BEGIN
 
 	DECLARE notifd_event_name VARCHAR(255) DEFAULT 'notifd/factory/';
@@ -71,6 +71,7 @@ proc: BEGIN
 
 	SET notifd_event_name = CONCAT(notifd_event_name,host);
 	CALL tango.import_event(notifd_event_name,res_str);
+	SET done = 0;
 	
 	IF LOCATE('MySQL Error',res_str) != 0 THEN
 		SET res_str = 'MySQL ERROR during import_event procedure for event factory';
@@ -82,6 +83,7 @@ proc: BEGIN
 #
 	
 	CALL tango.import_event(adm_dev_name,res_str);
+	SET done = 0;
 	
 	IF LOCATE('MySQL Error',res_str) != 0 THEN
 		SET res_str = 'MySQL ERROR during import_event procedure for DS event channel';
@@ -93,6 +95,7 @@ proc: BEGIN
 #
 
 	CALL tango.class_prop('DServer',res_str);
+	SET done = 0;
 	
 	IF LOCATE('MySQL Error',res_str) != 0 THEN
 		SET res_str = 'MySQL ERROR while getting DServer class property(ies)';
@@ -104,6 +107,7 @@ proc: BEGIN
 #
 
 	CALL tango.class_prop('Default',res_str);
+	SET done = 0;
 	
 	IF LOCATE('MySQL Error',res_str) != 0 THEN
 		SET res_str = 'MySQL ERROR while getting Default class property(ies)';
@@ -115,6 +119,8 @@ proc: BEGIN
 #
 
 	CALL tango.dev_prop(adm_dev_name,res_str);
+	SET done = 0;
+	
 #
 #
 #
diff --git a/debian/tango-accesscontrol.init.d b/debian/tango-accesscontrol.init.d
index 5dac46f..d36ea7c 100644
--- a/debian/tango-accesscontrol.init.d
+++ b/debian/tango-accesscontrol.init.d
@@ -49,6 +49,7 @@ do_start()
 	then
 		tango_admin --ping-network 4 || return 2
 	fi
+	export SUPER_TANGO=true
 	tango_admin --ping-database 6 || return 2
 	start-stop-daemon --start --quiet --chuid tango:tango --background \
 	    --make-pidfile --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
diff --git a/debian/tango-starter.init.d b/debian/tango-starter.init.d
index 964b492..4e6223b 100644
--- a/debian/tango-starter.init.d
+++ b/debian/tango-starter.init.d
@@ -23,6 +23,7 @@ CANON_HOST=`grep TANGO_HOST $CONFFILE | awk -F ":" '{print $1}' | awk -F "=" '{p
 DAEMON=/usr/lib/tango/$NAME_REAL
 DAEMON_ARGS=`hostname`
 PIDFILE=/var/run/$NAME.pid
+TAC_DEVICE=sys/access_control/1
 
 # Exit if the package is not installed
 [ -x "$DAEMON" ] || exit 0
@@ -52,6 +53,8 @@ do_start()
 		tango_admin --ping-network 40 || return 2
 	fi
 	tango_admin --ping-database 6 || return 2
+	# check if tac is enabled
+	tango_admin --tac-enabled || tango_admin --ping-device $TAC_DEVICE 3 || return 2
 	# register the tango-starter if necessary
 	tango_admin --check-device tango/admin/`hostname` || tango_admin --add-server Starter/`hostname` Starter tango/admin/`hostname` || return 2
 

-- 
TANGO distributed control system.