[or-cvs] r13565: Fixed some small issues with the new locale script (e.g. mad (in incognito/trunk: arch/x86 arch/x86/overlay/isolinux portage.config root_overlay/etc/init.d)

[anonym at seul.org]

Author: anonym
Date: 2008-02-18 22:06:29 -0500 (Mon, 18 Feb 2008)
New Revision: 13565

Modified:
   incognito/trunk/arch/x86/livecd-stage1.spec
   incognito/trunk/arch/x86/livecd-stage2.spec
   incognito/trunk/arch/x86/overlay/isolinux/isolinux.cfg
   incognito/trunk/portage.config/package.use
   incognito/trunk/root_overlay/etc/init.d/external-locale
Log:
Fixed some small issues with the new locale script (e.g. made it executable....)
After all, we don't want ntp. Removed.
Gadu sopport in pidgin forces removal of ssl? Then we don't want it as that would damage kopete.
Increased syslinux menu height so all options are visible.


Modified: incognito/trunk/arch/x86/livecd-stage1.spec
===================================================================
--- incognito/trunk/arch/x86/livecd-stage1.spec	2008-02-18 21:12:22 UTC (rev 13564)
+++ incognito/trunk/arch/x86/livecd-stage1.spec	2008-02-19 03:06:29 UTC (rev 13565)
@@ -35,8 +35,7 @@
 	autoreplace
 	contactnotes
 	crypt
-	highlight
-	gadu 
+	highlight 
 	irc
 	sms
 	texteffect
@@ -89,7 +88,6 @@
 	net-dialup/penggy
 	net-misc/dhcp
 	net-misc/iputils
-	net-misc/ntp
 	net-misc/rdate
 	net-misc/whois
 	net-proxy/dante

Modified: incognito/trunk/arch/x86/livecd-stage2.spec
===================================================================
--- incognito/trunk/arch/x86/livecd-stage2.spec	2008-02-18 21:12:22 UTC (rev 13564)
+++ incognito/trunk/arch/x86/livecd-stage2.spec	2008-02-19 03:06:29 UTC (rev 13565)
@@ -40,8 +40,6 @@
 	gpm|boot
 	NetworkManager|default
 	hidden-service|default
-	ntpd|default
-	ntp-client|default
 	keymaps|boot
 
 # unionfs (genkernel 2.4.7) causes problems such as:

Modified: incognito/trunk/arch/x86/overlay/isolinux/isolinux.cfg
===================================================================
--- incognito/trunk/arch/x86/overlay/isolinux/isolinux.cfg	2008-02-18 21:12:22 UTC (rev 13564)
+++ incognito/trunk/arch/x86/overlay/isolinux/isolinux.cfg	2008-02-19 03:06:29 UTC (rev 13565)
@@ -5,6 +5,7 @@
 menu background splash.png
 menu color title 1;36;44    #c0ffffff #00000000 std
 menu color sel   7;37;40    #e0000000 #20ECEAC7 all
+menu rows 14
 
 timeout 150
 F1 kernels.msg

Modified: incognito/trunk/portage.config/package.use
===================================================================
--- incognito/trunk/portage.config/package.use	2008-02-18 21:12:22 UTC (rev 13564)
+++ incognito/trunk/portage.config/package.use	2008-02-19 03:06:29 UTC (rev 13565)
@@ -8,8 +8,9 @@
 net-www/mplayerplug-in divx gmedia realmedia wmp
 www-servers/lighttpd minimal
 
-net-im/pidgin groupwise meanwhile msn ncurses qq zephyr
-
+net-im/pidgin -gadu groupwise meanwhile msn ncurses qq zephyr
+kde-base/kopete gadu
+ 
 # 'build' causes some required files to be removed
 dev-lang/perl -build
 

Modified: incognito/trunk/root_overlay/etc/init.d/external-locale
===================================================================
--- incognito/trunk/root_overlay/etc/init.d/external-locale	2008-02-18 21:12:22 UTC (rev 13564)
+++ incognito/trunk/root_overlay/etc/init.d/external-locale	2008-02-19 03:06:29 UTC (rev 13565)
@@ -37,6 +37,7 @@
 		"ar") XKB_LANG="ara";;
 		"fa") XKB_LANG="ir";;
 		"he") XKB_LANG="il";;
+                "ja") XKB_LANG="jp";;
 		*) XKB_LANG="${LANGUAGE}";;
 	    esac