packages: tzdata/timezone.init, tzdata/tzdata.spec - upstart: add upstart_c...

[glen]

Author: glen                         Date: Sat Jul 30 13:46:41 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- upstart: add upstart_controlled

---- Files affected:
packages/tzdata:
   timezone.init (1.20 -> 1.21) , tzdata.spec (1.105 -> 1.106) 

---- Diffs:

================================================================
Index: packages/tzdata/timezone.init
diff -u packages/tzdata/timezone.init:1.20 packages/tzdata/timezone.init:1.21
--- packages/tzdata/timezone.init:1.20	Sun Jul  3 20:02:11 2011
+++ packages/tzdata/timezone.init	Sat Jul 30 15:46:36 2011
@@ -11,6 +11,8 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
+upstart_controlled --except status disable
+
 . /etc/sysconfig/timezone
 
 ZONE_FILE="$ZONE_INFO_DIR"
@@ -79,7 +81,7 @@
 	disable
 	;;
   status)
-	nls 'Time zone is configured to %s' "$TIMEZONE"
+	nls 'Timezone is configured to %s' "$TIMEZONE"
 	if [ ! -f "$ZONE_FILE" ]; then
 		nls "Missing %s file" "$ZONE_FILE"
 	elif ! identical "$ZONE_FILE" /etc/localtime; then

================================================================
Index: packages/tzdata/tzdata.spec
diff -u packages/tzdata/tzdata.spec:1.105 packages/tzdata/tzdata.spec:1.106
--- packages/tzdata/tzdata.spec:1.105	Sun Jul  3 14:18:00 2011
+++ packages/tzdata/tzdata.spec	Sat Jul 30 15:46:36 2011
@@ -16,7 +16,7 @@
 Summary(pl.UTF-8):	Dane o strefach czasowych
 Name:		tzdata
 Version:	%{tzdata_ver}
-Release:	1
+Release:	2
 License:	Public Domain (database), BSD/LGPL v2.1+ (code/test suite)
 Group:		Base
 # The tzdata-base-0.tar.bz2 is a simple building infrastructure and
@@ -259,6 +259,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.106  2011/07/30 13:46:36  glen
+- upstart: add upstart_controlled
+
 Revision 1.105  2011/07/03 12:18:00  adamg
 - updated to 2011h (tzdata)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tzdata/timezone.init?r1=1.20&r2=1.21&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tzdata/tzdata.spec?r1=1.105&r2=1.106&f=u