[Debian-hebrew-package] [svn] r544 - pkg/user-he/trunk/scripts

[Lior Kaplan]

Author: kaplan
Date: Fri Apr 13 22:10:12 2007
New Revision: 544

Modified:
   pkg/user-he/trunk/scripts/hebrew-settings
Log:
update preseed name from xfree86 to xorg
remove the grp_led:scroll xkb option
the --enable option was understood wrong in the locale section


Modified: pkg/user-he/trunk/scripts/hebrew-settings
==============================================================================
--- pkg/user-he/trunk/scripts/hebrew-settings	(original)
+++ pkg/user-he/trunk/scripts/hebrew-settings	Fri Apr 13 22:10:12 2007
@@ -69,16 +69,16 @@
 	if [[ $enabled == 0 ]]; then
 		debconf-set-selections << __END__
 
-		# locales preseed for enabled system
-		locales locales/default_environment_locale string en_US.UTF-8
+		# locales preseed
+		locales locales/default_environment_locale string he_IL.UTF-8
 		locales locales/locales_to_be_generated multiselect he_IL.UTF-8 UTF-8, en_US.UTF-8 UTF-8, ru_RU.UTF-8 UTF-8, ar_JO.UTF-8 UTF-8
 
 __END__
 	else
 		debconf-set-selections << __END__
 
-		# locales preseed
-		locales locales/default_environment_locale string he_IL.UTF-8
+		# locales preseed for enabled system
+		locales locales/default_environment_locale string en_US.UTF-8
 		locales locales/locales_to_be_generated multiselect he_IL.UTF-8 UTF-8, en_US.UTF-8 UTF-8, ru_RU.UTF-8 UTF-8, ar_JO.UTF-8 UTF-8
 
 __END__
@@ -111,14 +111,14 @@
 	echo "Not installed."
 fi
 
-# reconfigure lxserver-xfree86
+# reconfigure xserver-xorg
 echo "Reconfigure xorg X server..."
 if [ -e /var/lib/dpkg/info/xserver-xorg.postinst ]; then
 	debconf-set-selections << __END__
 
-	# xserver-xfree86 preseed
-	xserver-xfree86 xserver-xorg/config/inputdevice/keyboard/layout string us,il
-	xserver-xfree86 xserver-xorg/config/inputdevice/keyboard/options string grp:switch,grp:alt_shift_toggle,grp_led:scroll
+	# xserver-xorg preseed
+	xserver-xorg xserver-xorg/config/inputdevice/keyboard/layout string us,il
+	xserver-xorg xserver-xorg/config/inputdevice/keyboard/options string grp:switch,grp:alt_shift_toggle
 
 __END__
 
@@ -129,7 +129,7 @@
 	rm ./xserver-xorg.postinst.$$
 
 	# Set keyboard for current session
-	setxkbmap -option grp:switch,grp:alt_shift_toggle,grp_led:scroll -layout us,il
+	setxkbmap -option grp:switch,grp:alt_shift_toggle -layout us,il
 	echo "Done."
 else
 	echo "Not installed."