[Debian-hebrew-package] [svn] r356 - in pkg/user-he/trunk: . debian
scripts
Lior Kaplan
kaplan-guest at costa.debian.org
Thu Feb 2 19:51:45 UTC 2006
Author: kaplan-guest
Date: Thu Feb 2 19:51:44 2006
New Revision: 356
Modified:
pkg/user-he/trunk/debian/changelog
pkg/user-he/trunk/hebrew-settings.1
pkg/user-he/trunk/scripts/hebrew-settings
Log:
add support for "--notimezone" option for preventing the script from changing the time zone.
Modified: pkg/user-he/trunk/debian/changelog
==============================================================================
--- pkg/user-he/trunk/debian/changelog (original)
+++ pkg/user-he/trunk/debian/changelog Thu Feb 2 19:51:44 2006
@@ -1,9 +1,11 @@
user-he (1.0.6) unstable; urgency=low
- * Remove the dependencies on the Mozilla packages, since they aren't
+ * Remove the dependencies on the Mozilla packages, since they aren't
installable in SID.
+ * Add --notimezone to prevent hebrew-settings script from changing the
+ timezone of the system.
- -- Lior Kaplan <webmaster at guides.co.il> Wed, 1 Feb 2006 23:06:20 +0200
+ -- Lior Kaplan <webmaster at guides.co.il> Thu, 2 Feb 2006 21:38:47 +0200
user-he (1.0.5) unstable; urgency=low
Modified: pkg/user-he/trunk/hebrew-settings.1
==============================================================================
--- pkg/user-he/trunk/hebrew-settings.1 (original)
+++ pkg/user-he/trunk/hebrew-settings.1 Thu Feb 2 19:51:44 2006
@@ -2,7 +2,7 @@
\.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
-.TH HEBREW-SETTINGS 1 "January 19, 2006"
+.TH HEBREW-SETTINGS 1 "February 02, 2006"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
@@ -19,7 +19,8 @@
hebrew-settings \- reconfigure the system with hebrew settings
.SH SYNOPSIS
.B hebrew-settings
-.RI [ --enabled ]
+.RI
+[ \-\-enabled ] [ \-\-notimezone ]
.br
.SH DESCRIPTION
.B hebrew-settings
@@ -34,6 +35,9 @@
.TP
.B \-\-enabled
Keep the user interface to English. Don't change it to Hebrew.
+.TP
+.B \-\-notimezone
+Keep the user timezone settings. Don't change it to Asia / Jerusalem.
.br
.SH AUTHOR
hebrew-settings was written by The Debian Hebrew Team <debian-hebrew-common at lists.alioth.debian.org>
Modified: pkg/user-he/trunk/scripts/hebrew-settings
==============================================================================
--- pkg/user-he/trunk/scripts/hebrew-settings (original)
+++ pkg/user-he/trunk/scripts/hebrew-settings Thu Feb 2 19:51:44 2006
@@ -27,18 +27,22 @@
# reconfigure time zone
echo "Reconfigure the systems time zone..."
if [ -f /usr/share/zoneinfo/Asia/Jerusalem ]; then
- debconf-set-selections << __END__
-
- # tzconfig preseed
- base-config tzconfig/gmt boolean false
- base-config tzconfig/geographic_area select Asia
- base-config tzconfig/select_zone/Asia select Jerusalem
+ if [[ "$1" != "--notimezone" && "$2" != "--notimezone" ]]; then
+ debconf-set-selections << __END__
+
+ # tzconfig preseed
+ base-config tzconfig/gmt boolean false
+ base-config tzconfig/geographic_area select Asia
+ base-config tzconfig/select_zone/Asia select Jerusalem
__END__
- rm -f /etc/localtime
- ln -s /usr/share/zoneinfo/Asia/Jerusalem /etc/localtime
- echo "Done."
+ rm -f /etc/localtime
+ ln -s /usr/share/zoneinfo/Asia/Jerusalem /etc/localtime
+ echo "Done."
+ else
+ echo "Unchanged."
+ fi
else
echo "Not installed."
fi
@@ -46,7 +50,7 @@
# reconfigure locales
echo "Reconfigure the locales package..."
if [ -e /var/lib/dpkg/info/locales.postinst ]; then
- if [ "$1" == "--enabled" ]; then
+ if [[ "$1" == "--enabled" || "$2" == "--enabled" ]]; then
debconf-set-selections << __END__
# locales preseed for enabled system
@@ -238,7 +242,7 @@
# On a Hebrew desktop set panel to rtl view
# If enabled flag is on make sure desktop is set for english !
# FIXME: this only work if the user did not set up his desktop, and he use the defaults.
- if [ "$1" == "--enabled" ]; then
+ if [[ "$1" == "--enabled" || "$2" == "--enabled" ]]; then
# this is for latin interface
# we _need_ this to set an enabled system after hebrew install
gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \
More information about the Debian-hebrew-package
mailing list