Hello community, here is the log from the commit of package kiwi-image-livecd-kde checked in at Thu May 22 01:32:59 CEST 2008. -------- --- arch/i686/kiwi-image-livecd-kde/kiwi-image-livecd-gnome.changes 2008-05-19 00:00:06.000000000 +0200 +++ kiwi-image-livecd-kde/kiwi-image-livecd-gnome.changes 2008-05-22 01:27:10.598123000 +0200 @@ -1,0 +2,10 @@ +Wed May 21 21:18:22 CEST 2008 - coolo@suse.de + +- if autologin is set to linux, remove it (bnc#391798) + +------------------------------------------------------------------- +Tue May 20 11:39:33 CEST 2008 - coolo@suse.de + +- set the keyboard layout correctly (bnc#345135) + +------------------------------------------------------------------- kiwi-image-livecd-kde.changes: same change New: ---- boot.langset ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi-image-livecd-gnome.spec ++++++ --- /var/tmp/diff_new_pack.Y14917/_old 2008-05-22 01:30:42.000000000 +0200 +++ /var/tmp/diff_new_pack.Y14917/_new 2008-05-22 01:30:42.000000000 +0200 @@ -28,7 +28,7 @@ BuildRequires: ghostscript-fonts-std ghostscript-library Summary: GNOME Live CD Version: 11.0 -Release: 96 +Release: 99 Group: Productivity/Other License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -47,6 +47,7 @@ Source13: SoftLocks Source14: config.oempartition Source15: openSUSE-release.prod +Source16: boot.langset ExcludeArch: ia64 ppc64 s390x s390 ppc # do not compress the ISO - takes ages %define _binary_payload w.ufdio @@ -114,6 +115,7 @@ install -D -m 644 %{SOURCE8} etc/sysconfig/network/ifcfg-eth0 tar xvf %{SOURCE9} install -D -m 755 %{SOURCE10} etc/init.d/create_xconf +install -D -m 755 %{SOURCE16} etc/init.d/boot.langset install -D -m 755 %{SOURCE11} usr/sbin/configure-x.sh install -D -m 755 %{SOURCE12} usr/bin/correct_live_install install -D -m 644 %{SOURCE2} etc/YaST2/policy.patch @@ -161,6 +163,10 @@ /usr/share/openSUSE %changelog +* Wed May 21 2008 coolo@suse.de +- if autologin is set to linux, remove it (bnc#391798) +* Tue May 20 2008 coolo@suse.de +- set the keyboard layout correctly (bnc#345135) * Sun May 18 2008 coolo@suse.de - do not try building on older kernels * Thu May 15 2008 coolo@suse.de ++++++ kiwi-image-livecd-kde.spec ++++++ --- /var/tmp/diff_new_pack.Y14917/_old 2008-05-22 01:30:42.000000000 +0200 +++ /var/tmp/diff_new_pack.Y14917/_new 2008-05-22 01:30:42.000000000 +0200 @@ -28,7 +28,7 @@ BuildRequires: ghostscript-fonts-std ghostscript-library Summary: KDE live CD Version: 11.0 -Release: 96 +Release: 99 Group: System/Boot License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -47,6 +47,7 @@ Source13: SoftLocks Source14: config.oempartition Source15: openSUSE-release.prod +Source16: boot.langset ExcludeArch: ia64 ppc64 s390x s390 ppc # do not compress the ISO - takes ages %define _binary_payload w.ufdio @@ -114,6 +115,7 @@ install -D -m 644 %{SOURCE8} etc/sysconfig/network/ifcfg-eth0 tar xvf %{SOURCE9} install -D -m 755 %{SOURCE10} etc/init.d/create_xconf +install -D -m 755 %{SOURCE16} etc/init.d/boot.langset install -D -m 755 %{SOURCE11} usr/sbin/configure-x.sh install -D -m 755 %{SOURCE12} usr/bin/correct_live_install install -D -m 644 %{SOURCE2} etc/YaST2/policy.patch @@ -161,6 +163,10 @@ /usr/share/openSUSE %changelog +* Wed May 21 2008 coolo@suse.de +- if autologin is set to linux, remove it (bnc#391798) +* Tue May 20 2008 coolo@suse.de +- set the keyboard layout correctly (bnc#345135) * Sun May 18 2008 coolo@suse.de - do not try building on older kernels * Thu May 15 2008 coolo@suse.de ++++++ config.patch ++++++ --- /var/tmp/diff_new_pack.Y14917/_old 2008-05-22 01:30:42.000000000 +0200 +++ /var/tmp/diff_new_pack.Y14917/_new 2008-05-22 01:30:42.000000000 +0200 @@ -61,11 +61,6 @@ # Required-Stop: # Default-Start: 5 # Default-Stop: ---- /etc/init.d/boot.local 2007-09-29 10:42:39.000000000 +0200 -+++ /etc/init.d/boot.local 2007-10-06 17:22:18.000000000 +0200 -@@ -15 +15,2 @@ - -+perl -pi /etc/langset.pl /etc/sysconfig/{language,keyboard} --- etc/hosts.orig 2007-11-12 15:24:30.000000000 +0100 +++ etc/hosts 2007-11-12 15:24:51.000000000 +0100 @@ -21,3 +21,4 @@ ++++++ config.sh ++++++ --- arch/i686/kiwi-image-livecd-kde/config.sh 2008-05-13 10:17:08.000000000 +0200 +++ kiwi-image-livecd-kde/config.sh 2008-05-19 16:38:03.081588000 +0200 @@ -39,6 +39,7 @@ # enable create_xconf chkconfig create_xconf on +chkconfig boot.langset on cd / patch -p0 < /tmp/config.patch ++++++ config.xml.in ++++++ --- arch/i686/kiwi-image-livecd-kde/config.xml.in 2008-05-15 16:12:10.000000000 +0200 +++ kiwi-image-livecd-kde/config.xml.in 2008-05-20 13:06:27.175648000 +0200 @@ -10,12 +10,14 @@ <type boot="vmxboot/suse-11.0" filesystem="ext3" format="vmdk">vmx</type> <type boot="xenboot/suse-11.0" filesystem="ext3">xen</type> <type boot="@OEM@" filesystem="squashfs" flags="unified">oem</type> - <version>2.6.1</version> + <version>2.7.0</version> <size unit="M">780</size> <packagemanager>zypper</packagemanager> <rpm-check-signatures>False</rpm-check-signatures> <rpm-force>False</rpm-force> <locale>en_US.UTF-8</locale> + <oem-swap>no</oem-swap> + <oem-boot-title>USB</oem-boot-title> </preferences> <users group="users"> <user name="root" pwd="" home="/root"/> ++++++ correct_live_install ++++++ --- arch/i686/kiwi-image-livecd-kde/correct_live_install 2008-05-13 10:17:23.000000000 +0200 +++ kiwi-image-livecd-kde/correct_live_install 2008-05-21 21:18:02.780187000 +0200 @@ -7,6 +7,7 @@ chkconfig sshd on chkconfig cron on chkconfig create_xconf off +chkconfig boot.langset off #====================================== # /etc/sudoers hack to fix #297695 @@ -30,10 +31,20 @@ grep -v ^perl /etc/init.d/boot.local > /etc/init.d/boot.local.1 && mv /etc/init.d/boot.local.1 /etc/init.d/boot.local chmod 0755 /etc/init.d/boot.local + cd / # patch -R -p0 < /etc/YaST2/policy.patch rm /etc/YaST2/policy.patch rm /etc/init.d/create_xconf +rm -r /etc/langset* +rm /etc/init.d/boot.langset rm /usr/sbin/configure-x.sh +zypper mr -e -p 120 factory-oss +zypper mr -e -p 120 factory-non-oss +zypper mr -e -p 20 updates + +# bug 391798 +sed -i -e 's,DISPLAYMANAGER_AUTOLOGIN="linux",DISPLAYMANAGER_AUTOLOGIN="",' /etc/sysconfig/displaymanager + ++++++ create_xconf ++++++ --- arch/i686/kiwi-image-livecd-kde/create_xconf 2008-05-13 23:30:45.000000000 +0200 +++ kiwi-image-livecd-kde/create_xconf 2008-05-19 16:44:05.413896000 +0200 @@ -41,6 +41,8 @@ /usr/sbin/sax2 -c 0 -a -i &>/dev/null test -e /proc/splash && echo silent > /proc/splash fi + /usr/bin/perl /etc/langset-xkb.pl + fi rc_status -v ;; ++++++ langset.tgz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/af_ZA new/etc/langset/af_ZA --- old/etc/langset/af_ZA 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/af_ZA 2008-05-19 14:38:03.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=af_ZA.UTF-8 +XKBLAYOUT=english-us diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/ar_EG new/etc/langset/ar_EG --- old/etc/langset/ar_EG 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/ar_EG 2008-05-19 14:38:03.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=ar_EG.UTF-8 +XKBLAYOUT=english-us diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/bg new/etc/langset/bg --- old/etc/langset/bg 2007-10-02 13:33:13.000000000 +0200 +++ new/etc/langset/bg 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -RC_LANG=bg_BG.UTF-8 -KEYTABLE=bg_bds-utf8 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/bg_BG new/etc/langset/bg_BG --- old/etc/langset/bg_BG 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/bg_BG 2008-05-19 14:38:03.000000000 +0200 @@ -0,0 +1,3 @@ +KEYTABLE=bg_bds-utf8.map.gz +RC_LANG=bg_BG.UTF-8 +XKBLAYOUT=english-us diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/bn_BD new/etc/langset/bn_BD --- old/etc/langset/bn_BD 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/bn_BD 2008-05-19 14:38:03.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=bn_BD.UTF-8 +XKBLAYOUT=english-us diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/bs_BA new/etc/langset/bs_BA --- old/etc/langset/bs_BA 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/bs_BA 2008-05-19 14:38:03.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=bs_BA.UTF-8 +XKBLAYOUT=english-us diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/ca_ES new/etc/langset/ca_ES --- old/etc/langset/ca_ES 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/ca_ES 2008-05-19 14:38:03.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=ca_ES.UTF-8 +XKBLAYOUT=spanish diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/cs new/etc/langset/cs --- old/etc/langset/cs 2007-10-02 13:33:13.000000000 +0200 +++ new/etc/langset/cs 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -RC_LANG=cs_CZ.UTF-8 -KEYTABLE=cz-lat2 -OOo_Country=Česko diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/cs_CZ new/etc/langset/cs_CZ --- old/etc/langset/cs_CZ 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/cs_CZ 2008-05-19 14:38:03.000000000 +0200 @@ -0,0 +1,3 @@ +KEYTABLE=cz-lat2.map.gz +RC_LANG=cs_CZ.UTF-8 +XKBLAYOUT=czech diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/cy_GB new/etc/langset/cy_GB --- old/etc/langset/cy_GB 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/cy_GB 2008-05-19 14:38:03.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=cy_GB.UTF-8 +XKBLAYOUT=english-us diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/da new/etc/langset/da --- old/etc/langset/da 2007-10-02 13:33:13.000000000 +0200 +++ new/etc/langset/da 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -RC_LANG=da_DK.UTF-8 -KEYTABLE=dk-latin1 -OOo_Country=Danmark diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/da_DA new/etc/langset/da_DA --- old/etc/langset/da_DA 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/da_DA 2008-05-19 14:38:03.000000000 +0200 @@ -0,0 +1,2 @@ +KEYTABLE=dk-latin1.map.gz +RC_LANG=da_DK.UTF-8 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/da_DK new/etc/langset/da_DK --- old/etc/langset/da_DK 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/da_DK 2008-05-19 14:38:03.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=da_DK.UTF-8 +XKBLAYOUT=danish diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/de new/etc/langset/de --- old/etc/langset/de 2007-10-02 13:33:13.000000000 +0200 +++ new/etc/langset/de 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -RC_LANG=de_DE.UTF-8 -KEYTABLE=de-latin1-nodeadkeys -OOo_Country=Deutschland diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/de_DE new/etc/langset/de_DE --- old/etc/langset/de_DE 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/de_DE 2008-05-19 14:38:03.000000000 +0200 @@ -0,0 +1,3 @@ +KEYTABLE=de-latin1-nodeadkeys.map.gz +RC_LANG=de_DE.UTF-8 +XKBLAYOUT=german diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/el new/etc/langset/el --- old/etc/langset/el 2007-10-02 13:33:13.000000000 +0200 +++ new/etc/langset/el 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -RC_LANG=el_GR.UTF-8 -KEYTABLE=gr -OOo_Country=Ελλάδα diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/el_GR new/etc/langset/el_GR --- old/etc/langset/el_GR 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/el_GR 2008-05-19 14:38:03.000000000 +0200 @@ -0,0 +1,3 @@ +KEYTABLE=gr.map.gz +RC_LANG=el_GR.UTF-8 +XKBLAYOUT=greek diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/en_GB new/etc/langset/en_GB --- old/etc/langset/en_GB 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/en_GB 2008-05-19 14:38:03.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=en_GB.UTF-8 +XKBLAYOUT=english-uk diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/en_US new/etc/langset/en_US --- old/etc/langset/en_US 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/en_US 2008-05-19 14:38:03.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=en_US.UTF-8 +XKBLAYOUT=english-us diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/es new/etc/langset/es --- old/etc/langset/es 2007-10-02 13:33:13.000000000 +0200 +++ new/etc/langset/es 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -RC_LANG=es_ES.UTF-8 -KEYTABLE=es -OOo_Country=España diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/es_ES new/etc/langset/es_ES --- old/etc/langset/es_ES 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/es_ES 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,3 @@ +KEYTABLE=es.map.gz +RC_LANG=es_ES.UTF-8 +XKBLAYOUT=spanish diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/et_EE new/etc/langset/et_EE --- old/etc/langset/et_EE 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/et_EE 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=et_EE.UTF-8 +XKBLAYOUT=estonian diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/fi_FI new/etc/langset/fi_FI --- old/etc/langset/fi_FI 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/fi_FI 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=fi_FI.UTF-8 +XKBLAYOUT=finnish diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/fr new/etc/langset/fr --- old/etc/langset/fr 2007-10-02 13:33:13.000000000 +0200 +++ new/etc/langset/fr 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -RC_LANG=fr_FR.UTF-8 -KEYTABLE=fr -OOo_Country=France diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/fr_FR new/etc/langset/fr_FR --- old/etc/langset/fr_FR 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/fr_FR 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,3 @@ +KEYTABLE=fr.map.gz +RC_LANG=fr_FR.UTF-8 +XKBLAYOUT=french diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/gu_IN new/etc/langset/gu_IN --- old/etc/langset/gu_IN 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/gu_IN 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=gu_IN.UTF-8 +XKBLAYOUT=english-us diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/he_IL new/etc/langset/he_IL --- old/etc/langset/he_IL 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/he_IL 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=he_IL.UTF-8 +XKBLAYOUT=english-us diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/hi_IN new/etc/langset/hi_IN --- old/etc/langset/hi_IN 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/hi_IN 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=hi_IN.UTF-8 +XKBLAYOUT=english-us diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/hr_HR new/etc/langset/hr_HR --- old/etc/langset/hr_HR 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/hr_HR 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=hr_HR.UTF-8 +XKBLAYOUT=croatian diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/hu new/etc/langset/hu --- old/etc/langset/hu 2007-10-02 13:33:13.000000000 +0200 +++ new/etc/langset/hu 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -RC_LANG=hu_HU.UTF-8 -KEYTABLE=hu -OOo_Country=Magyarország diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/hu_HU new/etc/langset/hu_HU --- old/etc/langset/hu_HU 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/hu_HU 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,3 @@ +KEYTABLE=hu.map.gz +RC_LANG=hu_HU.UTF-8 +XKBLAYOUT=hungarian diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/id_ID new/etc/langset/id_ID --- old/etc/langset/id_ID 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/id_ID 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=id_ID.UTF-8 +XKBLAYOUT=english-us diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/it new/etc/langset/it --- old/etc/langset/it 2007-10-02 13:33:13.000000000 +0200 +++ new/etc/langset/it 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -RC_LANG=it_IT.UTF-8 -KEYTABLE=it -OOo_Country=Italia diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/it_IT new/etc/langset/it_IT --- old/etc/langset/it_IT 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/it_IT 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,3 @@ +KEYTABLE=it.map.gz +RC_LANG=it_IT.UTF-8 +XKBLAYOUT=italian diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/ja new/etc/langset/ja --- old/etc/langset/ja 2007-10-02 13:33:13.000000000 +0200 +++ new/etc/langset/ja 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -RC_LANG=ja_JP.UTF-8 -KEYTABLE=jp106 -OOo_Country=日本 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/ja_JA new/etc/langset/ja_JA --- old/etc/langset/ja_JA 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/ja_JA 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,2 @@ +KEYTABLE=jp106.map.gz +RC_LANG=ja_JP.UTF-8 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/ja_JP new/etc/langset/ja_JP --- old/etc/langset/ja_JP 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/ja_JP 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=ja_JP.UTF-8 +XKBLAYOUT=japanese diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/km_KH new/etc/langset/km_KH --- old/etc/langset/km_KH 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/km_KH 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=km_KH.UTF-8 +XKBLAYOUT=khmer diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/ko_KR new/etc/langset/ko_KR --- old/etc/langset/ko_KR 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/ko_KR 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=ko_KR.UTF-8 +XKBLAYOUT=korean diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/lt_LT new/etc/langset/lt_LT --- old/etc/langset/lt_LT 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/lt_LT 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=lt_LT.UTF-8 +XKBLAYOUT=lithuanian diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/mk_MK new/etc/langset/mk_MK --- old/etc/langset/mk_MK 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/mk_MK 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=mk_MK.UTF-8 +XKBLAYOUT=english-us diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/mr_IN new/etc/langset/mr_IN --- old/etc/langset/mr_IN 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/mr_IN 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=mr_IN.UTF-8 +XKBLAYOUT=english-us diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/nb new/etc/langset/nb --- old/etc/langset/nb 2007-10-02 13:33:13.000000000 +0200 +++ new/etc/langset/nb 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -RC_LANG=nb_NO.UTF-8 -KEYTABLE=no-latin1 -OOo_Country=Norway diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/nb_NO new/etc/langset/nb_NO --- old/etc/langset/nb_NO 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/nb_NO 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,3 @@ +KEYTABLE=no-latin1.map.gz +RC_LANG=nb_NO.UTF-8 +XKBLAYOUT=norwegian diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/nl new/etc/langset/nl --- old/etc/langset/nl 2007-10-02 13:33:13.000000000 +0200 +++ new/etc/langset/nl 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -RC_LANG=nl_NL.UTF-8 -KEYTABLE=nl -OOo_Country=Nederland diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/nl_NL new/etc/langset/nl_NL --- old/etc/langset/nl_NL 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/nl_NL 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,3 @@ +KEYTABLE=nl.map.gz +RC_LANG=nl_NL.UTF-8 +XKBLAYOUT=english-us diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/pa_IN new/etc/langset/pa_IN --- old/etc/langset/pa_IN 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/pa_IN 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=pa_IN.UTF-8 +XKBLAYOUT=english-us diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/pl_PL new/etc/langset/pl_PL --- old/etc/langset/pl_PL 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/pl_PL 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=pl_PL.UTF-8 +XKBLAYOUT=polish diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/pt new/etc/langset/pt --- old/etc/langset/pt 2007-10-02 13:33:13.000000000 +0200 +++ new/etc/langset/pt 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -RC_LANG=pt_BR.UTF-8 -KEYTABLE=br-latin1-abnt2 -OOo_Country=Brazil diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/pt_BR new/etc/langset/pt_BR --- old/etc/langset/pt_BR 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/pt_BR 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,3 @@ +KEYTABLE=br-latin1-abnt2.map.gz +RC_LANG=pt_BR.UTF-8 +XKBLAYOUT=portugese-br diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/pt_PT new/etc/langset/pt_PT --- old/etc/langset/pt_PT 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/pt_PT 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=pt_PT.UTF-8 +XKBLAYOUT=portugese diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/ro new/etc/langset/ro --- old/etc/langset/ro 2007-10-02 13:33:13.000000000 +0200 +++ new/etc/langset/ro 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -RC_LANG=ro_RO.UTF-8 -KEYTABLE=ro-latin2 -OOo_Country=Romania diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/ro_RO new/etc/langset/ro_RO --- old/etc/langset/ro_RO 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/ro_RO 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,3 @@ +KEYTABLE=ro-latin2.map.gz +RC_LANG=ro_RO.UTF-8 +XKBLAYOUT=english-us diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/ru new/etc/langset/ru --- old/etc/langset/ru 2007-10-02 13:33:13.000000000 +0200 +++ new/etc/langset/ru 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -RC_LANG=ru_RU.UTF-8 -KEYTABLE=ru -OOo_Country=Российская Федерация diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/ru_RU new/etc/langset/ru_RU --- old/etc/langset/ru_RU 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/ru_RU 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,3 @@ +KEYTABLE=ru.map.gz +RC_LANG=ru_RU.UTF-8 +XKBLAYOUT=russian diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/si_LK new/etc/langset/si_LK --- old/etc/langset/si_LK 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/si_LK 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=si_LK.UTF-8 +XKBLAYOUT=english-us diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/sk new/etc/langset/sk --- old/etc/langset/sk 2007-10-02 13:33:13.000000000 +0200 +++ new/etc/langset/sk 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -RC_LANG=sk_SK.UTF-8 -KEYTABLE=sk-qwerty -OOo_Country=Slovensko diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/sk_SK new/etc/langset/sk_SK --- old/etc/langset/sk_SK 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/sk_SK 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,3 @@ +KEYTABLE=sk-qwerty.map.gz +RC_LANG=sk_SK.UTF-8 +XKBLAYOUT=slovak diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/sl new/etc/langset/sl --- old/etc/langset/sl 2007-10-02 13:33:13.000000000 +0200 +++ new/etc/langset/sl 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -RC_LANG=sl_SI.UTF-8 -KEYTABLE=slovene -OOo_Country=Slovenija diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/sl_SI new/etc/langset/sl_SI --- old/etc/langset/sl_SI 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/sl_SI 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=sl_SI.UTF-8 +XKBLAYOUT=slovene diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/sl_SL new/etc/langset/sl_SL --- old/etc/langset/sl_SL 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/sl_SL 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,2 @@ +KEYTABLE=slovene.map.gz +RC_LANG=sl_SI.UTF-8 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/sr_CS new/etc/langset/sr_CS --- old/etc/langset/sr_CS 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/sr_CS 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=sr_CS.UTF-8 +XKBLAYOUT=serbian diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/sv new/etc/langset/sv --- old/etc/langset/sv 2007-10-02 13:33:13.000000000 +0200 +++ new/etc/langset/sv 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -RC_LANG=sv_SE.UTF-8 -KEYTABLE=se-latin1 -OOo_Country=Sverige diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/sv_SE new/etc/langset/sv_SE --- old/etc/langset/sv_SE 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/sv_SE 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=sv_SE.UTF-8 +XKBLAYOUT=swedish diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/sv_SV new/etc/langset/sv_SV --- old/etc/langset/sv_SV 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/sv_SV 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,2 @@ +KEYTABLE=se-latin1.map.gz +RC_LANG=sv_SE.UTF-8 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/ta_IN new/etc/langset/ta_IN --- old/etc/langset/ta_IN 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/ta_IN 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=ta_IN.UTF-8 +XKBLAYOUT=english-us diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/th_TH new/etc/langset/th_TH --- old/etc/langset/th_TH 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/th_TH 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=th_TH.UTF-8 +XKBLAYOUT=english-us diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/tr new/etc/langset/tr --- old/etc/langset/tr 2007-10-02 13:33:13.000000000 +0200 +++ new/etc/langset/tr 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -RC_LANG=tr_TR.UTF-8 -KEYTABLE=tr_q-latin5 -OOo_Country=Türkiye diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/tr_TR new/etc/langset/tr_TR --- old/etc/langset/tr_TR 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/tr_TR 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,3 @@ +KEYTABLE=tr_q-latin5.map.gz +RC_LANG=tr_TR.UTF-8 +XKBLAYOUT=turkish diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/uk_UA new/etc/langset/uk_UA --- old/etc/langset/uk_UA 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/uk_UA 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=uk_UA.UTF-8 +XKBLAYOUT=english-us diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/vi_VN new/etc/langset/vi_VN --- old/etc/langset/vi_VN 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/vi_VN 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=vi_VN.UTF-8 +XKBLAYOUT=english-us diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/wa_BE new/etc/langset/wa_BE --- old/etc/langset/wa_BE 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/wa_BE 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=wa_BE.UTF-8 +XKBLAYOUT=belgian diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/xh_ZA new/etc/langset/xh_ZA --- old/etc/langset/xh_ZA 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/xh_ZA 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=xh_ZA.UTF-8 +XKBLAYOUT=english-us diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/zh_CN new/etc/langset/zh_CN --- old/etc/langset/zh_CN 2007-10-02 13:33:13.000000000 +0200 +++ new/etc/langset/zh_CN 2008-05-19 14:38:04.000000000 +0200 @@ -1,3 +1,3 @@ +KEYTABLE=us.map.gz RC_LANG=zh_CN.UTF-8 -KEYTABLE=us -OOo_Country= +XKBLAYOUT=english-us diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/zh_TW new/etc/langset/zh_TW --- old/etc/langset/zh_TW 2007-10-02 13:33:13.000000000 +0200 +++ new/etc/langset/zh_TW 2008-05-19 14:38:04.000000000 +0200 @@ -1,3 +1,3 @@ +KEYTABLE=us.map.gz RC_LANG=zh_TW.UTF-8 -KEYTABLE=us -OOo_Country= +XKBLAYOUT=english-us diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset/zu_ZA new/etc/langset/zu_ZA --- old/etc/langset/zu_ZA 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset/zu_ZA 2008-05-19 14:38:04.000000000 +0200 @@ -0,0 +1,2 @@ +RC_LANG=zu_ZA.UTF-8 +XKBLAYOUT=english-us diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset.pl new/etc/langset.pl --- old/etc/langset.pl 2007-10-02 13:33:13.000000000 +0200 +++ new/etc/langset.pl 2008-05-20 10:45:48.000000000 +0200 @@ -1,34 +1,30 @@ #!/usr/bin/perl -INIT { - $Lang=""; $Terr=""; - open(CMDL, "/etc/langset.xkb"); +print FH "$XKBLAYOUT\n"; +close(FH); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/langset-xkb.pl new/etc/langset-xkb.pl --- old/etc/langset-xkb.pl 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/langset-xkb.pl 2008-05-19 16:43:07.000000000 +0200 @@ -0,0 +1,36 @@ +use SaX; + +open(FH, "/etc/langset.xkb"); +my $XKBLayout=<FH>; +close(FH); +chomp $XKBLayout; + +$exc = new SaX::SaXException; +$exc -> setDebug (1); + +$init = new SaX::SaXInit; +if ( $init -> needInit() ) { + print ("initialize cache...\n"); + $init -> doInit(); +} +$status = $init -> errorString(); + +$config = new SaX::SaXConfig; +$kbd = new SaX::SaXImport ( $SaX::SAX_KEYBOARD ); +$kbd -> setSource( $SaX::SAX_SYSTEM_CONFIG ); +$kbd -> doImport(); +$config->addImport($kbd); + +$manip2 = new SaX::SaXManipulateKeyboard ($kbd); +$manip2 -> selectKeyboard( $SaX::SAX_CORE_KBD); +$manip2 -> setXKBLayout ("$XKBLayout"); + +$config->setMode ( $SaX::SAX_MERGE ); +if ( ! $config->createConfiguration() ) { + print "--- " . $config->errorString() . "\n"; + print "--- " . $config->getParseErrorValue() . "\n"; + exit(1); +} +$config->commitConfiguration(); + +exit (0); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org