Merge branch 'master' of git+ssh://openadk.org/git/openadk

25 files changed, 17130 insertions, 51 deletions

diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index 964c417df..051ad3ea3 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		asterisk
 PKG_VERSION:=		1.8.20.1
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		99204257de80a42c4e287fc93dfe714a
 PKG_DESCR:=		Open Source PBX
 PKG_SECTION:=		phone
@@ -101,7 +101,7 @@ endif
 
 INSTALL_STYLE:=		manual
 
-TARGET_LDFLAGS+=	-lm -ltinfo
+TARGET_LDFLAGS+=	-lm -ltinfo -ldl -lpthread
 MAKE_ENV=		ASTCFLAGS="${TARGET_CPPFLAGS} -DHAVE_STRTOQ" \
 			ASTLDFLAGS="${TARGET_LDFLAGS}"
 MAKE_FLAGS+=		DESTDIR="$(WRKINST)" \
diff --git a/package/avahi/Makefile b/package/avahi/Makefile
index fa8c56fe1..bd203e79e 100644
--- a/package/avahi/Makefile
+++ b/package/avahi/Makefile
@@ -5,11 +5,11 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		avahi
 PKG_VERSION:=		0.6.31
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		2f22745b8f7368ad5a0a3fddac343f2d
 PKG_DESCR:=		mDNS daemon
 PKG_SECTION:=		dhcp
-PKG_BUILDDEP:=		libdaemon expat gdbm glib gettext-tiny gtk+ dbus
+PKG_BUILDDEP:=		autotool libdaemon expat gdbm glib gettext-tiny gtk+ dbus
 PKG_URL:=		http://avahi.org/
 PKG_SITES:=		http://avahi.org/download/
 PKG_NEED_CXX:=		1
@@ -33,6 +33,7 @@ $(eval $(call PKG_template,AVAHI_DAEMON,avahi-daemon,${PKG_VERSION}-${PKG_RELEAS
 $(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_AVAHI_DNSCONFD},${PKGSD_AVAHI_DNSCONFD},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBAVAHI},${PKGSC_LIBAVAHI},${PKG_OPTS}))
 
+AUTOTOOL_STYLE:=	autoreconf
 CONFIGURE_ARGS+=	--enable-glib \
 			--enable-gtk2 \
 			--enable-libdaemon \
diff --git a/package/avahi/patches/patch-Makefile_am b/package/avahi/patches/patch-Makefile_am
new file mode 100644
index 000000000..ff5160336
--- /dev/null
+++ b/package/avahi/patches/patch-Makefile_am
@@ -0,0 +1,12 @@
+--- avahi-0.6.31.orig/Makefile.am	2011-12-30 22:26:44.000000000 +0100
++++ avahi-0.6.31/Makefile.am	2014-03-04 09:57:29.000000000 +0100
+@@ -75,8 +75,7 @@ SUBDIRS = \
+ 	avahi-compat-howl \
+ 	avahi-autoipd \
+ 	avahi-ui \
+-	avahi-ui-sharp \
+-	po
++	avahi-ui-sharp
+ 
+ DX_INPUT = \
+ 	$(srcdir)/avahi-common/address.h \
diff --git a/package/avahi/patches/patch-avahi-ui_Makefile_am b/package/avahi/patches/patch-avahi-ui_Makefile_am
new file mode 100644
index 000000000..c1744d9d0
--- /dev/null
+++ b/package/avahi/patches/patch-avahi-ui_Makefile_am
@@ -0,0 +1,19 @@
+--- avahi-0.6.31.orig/avahi-ui/Makefile.am	2012-02-14 23:22:16.000000000 +0100
++++ avahi-0.6.31/avahi-ui/Makefile.am	2014-03-04 09:45:16.000000000 +0100
+@@ -79,9 +79,6 @@ libavahi_ui_gtk3_la_CFLAGS += -DDATABASE
+ endif
+ 
+ bin_PROGRAMS = bssh
+-desktop_DATA += bssh.desktop bvnc.desktop
+-@INTLTOOL_DESKTOP_RULE@
+-
+ bssh_SOURCES = bssh.c
+ 
+ if HAVE_GTK3
+@@ -108,6 +105,4 @@ endif # HAVE_GLIB
+ endif
+ endif
+ 
+-@INTLTOOL_DESKTOP_RULE@
+-
+ CLEANFILES = $(desktop_DATA) $(desktop_DATA_in)
diff --git a/package/avahi/patches/patch-configure_ac b/package/avahi/patches/patch-configure_ac
new file mode 100644
index 000000000..c610da2cd
--- /dev/null
+++ b/package/avahi/patches/patch-configure_ac
@@ -0,0 +1,10 @@
+--- avahi-0.6.31.orig/configure.ac	2012-02-14 22:44:25.000000000 +0100
++++ avahi-0.6.31/configure.ac	2014-03-04 08:05:14.000000000 +0100
+@@ -412,7 +412,6 @@ if test "x$have_kqueue" = "xyes" ; then
+     AC_DEFINE([HAVE_KQUEUE], 1, [Enable BSD kqueue() usage])
+ fi
+ 
+-IT_PROG_INTLTOOL([0.35.0])
+ GETTEXT_PACKAGE=avahi
+ AC_SUBST([GETTEXT_PACKAGE])
+ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
diff --git a/package/avahi/patches/patch-ltmain_sh b/package/avahi/patches/patch-ltmain_sh
index c83acd926..e3bcd4083 100644
--- a/package/avahi/patches/patch-ltmain_sh
+++ b/package/avahi/patches/patch-ltmain_sh
@@ -1,6 +1,6 @@
---- avahi-0.6.30.orig/ltmain.sh	2011-04-04 00:10:35.000000000 +0200
-+++ avahi-0.6.30/ltmain.sh	2011-05-12 12:30:44.000000000 +0200
-@@ -5840,7 +5840,7 @@ func_mode_link ()
+--- avahi-0.6.31.orig/ltmain.sh	2012-02-14 23:36:26.000000000 +0100
++++ avahi-0.6.31/ltmain.sh	2014-03-04 07:44:03.000000000 +0100
+@@ -5853,7 +5853,7 @@ func_mode_link ()
        # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
        -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
        -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index ad09f8d3d..9323b25ad 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -75,6 +75,12 @@ endif
 ifeq ($(ADK_TARGET_SYSTEM_QEMU_PPC64),y)
 	$(SED) 's#ttyS#hvc#g' $(IDIR_BASE_FILES)/etc/inittab
 endif
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_SH4),y)
+	$(SED) 's#ttyS0#ttySC1#g' $(IDIR_BASE_FILES)/etc/inittab
+endif
+ifeq ($(ADK_TARGET_SYSTEM_QEMU_SH4EB),y)
+	$(SED) 's#ttyS0#ttySC1#g' $(IDIR_BASE_FILES)/etc/inittab
+endif
 ifeq ($(ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800),y)
 	$(SED) 's#ttyS#ttyUL#g' $(IDIR_BASE_FILES)/etc/inittab
 endif
diff --git a/package/binutils/Makefile b/package/binutils/Makefile
index 19b945f41..b6e6fb616 100644
--- a/package/binutils/Makefile
+++ b/package/binutils/Makefile
@@ -35,8 +35,8 @@ TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 TARGET_CFLAGS+=		-fPIC
 ifeq ($(ADK_NATIVE),)
 CONFIGURE_ARGS+=	--disable-werror \
-			--host=$(REAL_GNU_TARGET_NAME) \
-			--target=$(REAL_GNU_TARGET_NAME)
+			--host=$(GNU_TARGET_NAME) \
+			--target=$(GNU_TARGET_NAME)
 else
 CONFIGURE_ARGS+=	--disable-werror
 endif
diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile
index e3ca9f404..0852d8e4f 100644
--- a/package/bitlbee/Makefile
+++ b/package/bitlbee/Makefile
@@ -20,7 +20,7 @@ $(eval $(call PKG_template,BITLBEE,bitlbee,${PKG_VERSION}-${PKG_RELEASE},${PKG_D
 
 CONFIG_STYLE:=		minimal
 TARGET_CFLAGS+=		-fPIC
-CONFIGURE_ARGS:=	--target=${REAL_GNU_TARGET_NAME} \
+CONFIGURE_ARGS:=	--target=${GNU_TARGET_NAME} \
 			--prefix=/usr \
 			--bindir=/usr/sbin \
 			--etcdir=/etc/bitlbee \
diff --git a/package/fbset/Makefile b/package/fbset/Makefile
index bd8186ceb..d9b51e299 100644
--- a/package/fbset/Makefile
+++ b/package/fbset/Makefile
@@ -5,9 +5,10 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		fbset
 PKG_VERSION:=		2.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		e547cfcbb8c1a4f2a6b8ba4acb8b7164
 PKG_DESCR:=		framebuffer utility
+PKG_DEPENDS:=		bison-host flex-host
 PKG_SECTION:=		utils
 PKG_SITES:=		http://users.telenet.be/geertu/Linux/fbdev/
 
@@ -22,8 +23,8 @@ BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 do-build:
-	(cd ${WRKSRC} && bison -d modes.y)
-	(cd ${WRKSRC} && flex modes.l)
+	(cd ${WRKSRC} && PATH='${HOST_PATH}' bison -d modes.y)
+	(cd ${WRKSRC} && PATH='${HOST_PATH}' flex modes.l)
 	${TARGET_CC} ${TARGET_CFLAGS} -I${WRKBUILD} -c -o \
 		${WRKBUILD}/modes.tab.o ${WRKSRC}/modes.tab.c
 	${TARGET_CC} ${TARGET_CFLAGS} -I${WRKBUILD} -c -o \
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index 99984ac20..6d8ee9620 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -55,8 +55,8 @@ endif
 
 
 CONFIGURE_ENV+=		have_sys_sdt_h=no
-CONFIGURE_ARGS+=	--host=$(REAL_GNU_TARGET_NAME) \
-			--target=$(REAL_GNU_TARGET_NAME) \
+CONFIGURE_ARGS+=	--host=$(GNU_TARGET_NAME) \
+			--target=$(GNU_TARGET_NAME) \
 			--build=$(GNU_HOST_NAME) \
 			--disable-__cxa_atexit \
 			--without-headers \
diff --git a/package/intltool/Makefile b/package/intltool/Makefile
deleted file mode 100644
index 120658360..000000000
--- a/package/intltool/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=		intltool
-PKG_VERSION:=		0.50.2
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		23fbd879118253cb99aeac067da5f591
-PKG_DESCR:=		Internationalization Tool Collection
-PKG_SECTION:=		misc
-PKG_SITES:=		https://launchpad.net/intltool/trunk/0.50.2/+download/
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,INTLTOOL,intltool,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-XAKE_FLAGS+=		PERL="/usr/bin/perl"
-
-intltool-install:
-	$(INSTALL_DIR) $(IDIR_INTLTOOL)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/intltool* \
-		$(IDIR_INTLTOOL)/usr/bin
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/kmod/Makefile b/package/kmod/Makefile
index 944f47599..e02addded 100644
--- a/package/kmod/Makefile
+++ b/package/kmod/Makefile
@@ -20,7 +20,7 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,KMOD,kmod,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIG_STYLE:=		minimal
-CONFIGURE_ARGS+=	--host=${REAL_GNU_TARGET_NAME}
+CONFIGURE_ARGS+=	--host=${GNU_TARGET_NAME}
 
 kmod-install:
 	$(INSTALL_DIR) $(IDIR_KMOD)/usr/bin
diff --git a/package/libx264/Makefile b/package/libx264/Makefile
index 0a82c5f62..96f6de14d 100644
--- a/package/libx264/Makefile
+++ b/package/libx264/Makefile
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+=	--disable-cli \
 			--disable-opencl \
 			--enable-shared \
 			--prefix=/usr \
-			--host=${REAL_GNU_TARGET_NAME} \
+			--host=${GNU_TARGET_NAME} \
 			--sysroot=${STAGING_TARGET_DIR} \
 			--cross-prefix=$(TARGET_CROSS)
 
diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile
index ea998be6b..b86680a7b 100644
--- a/package/openjdk7/Makefile
+++ b/package/openjdk7/Makefile
@@ -88,7 +88,7 @@ CONFIGURE_ARGS+=	$(CONFIGURE_COMMON)
 CONFIGURE_ARGS+=	--disable-bootstrap
 
 CONFIGURE_ENV+=		LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib
-MAKE_ENV+=		ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/bin \
+MAKE_ENV+=		ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/bin \
 			ALT_OPENWIN_HOME=$(STAGING_DIR)/usr/ \
 			ALT_CUPS_HEADERS_PATH=$(STAGING_DIR)/usr/include/ \
 			ALT_FREETYPE_HEADERS_PATH=$(STAGING_DIR)/usr/include/ \
diff --git a/package/pcc-libs/Makefile b/package/pcc-libs/Makefile
index 9860b6805..16b05879e 100644
--- a/package/pcc-libs/Makefile
+++ b/package/pcc-libs/Makefile
@@ -20,8 +20,8 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,PCC_LIBS,pcc-libs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 # we cross-compile a native compiler for the target system
-CONFIGURE_ARGS+=	--host=${REAL_GNU_TARGET_NAME}
-CONFIGURE_ARGS+=	--target=${REAL_GNU_TARGET_NAME}
+CONFIGURE_ARGS+=	--host=${GNU_TARGET_NAME}
+CONFIGURE_ARGS+=	--target=${GNU_TARGET_NAME}
 
 pcc-libs-install:
 	$(INSTALL_DIR) $(IDIR_PCC_LIBS)/usr/bin
diff --git a/package/pcc/Makefile b/package/pcc/Makefile
index b3c0cbd88..891651d3a 100644
--- a/package/pcc/Makefile
+++ b/package/pcc/Makefile
@@ -22,8 +22,8 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,PCC,pcc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 # we cross-compile a native compiler for the target system
-CONFIGURE_ARGS+=	--host=${REAL_GNU_TARGET_NAME}
-CONFIGURE_ARGS+=	--target=${REAL_GNU_TARGET_NAME}
+CONFIGURE_ARGS+=	--host=${GNU_TARGET_NAME}
+CONFIGURE_ARGS+=	--target=${GNU_TARGET_NAME}
 CONFIGURE_ARGS+=	--with-assembler=/usr/bin/as
 CONFIGURE_ARGS+=	--with-linker=/usr/bin/ld
 
diff --git a/package/xkeyboard-config/Makefile b/package/xkeyboard-config/Makefile
index 68a89e31e..df46bc896 100644
--- a/package/xkeyboard-config/Makefile
+++ b/package/xkeyboard-config/Makefile
@@ -4,18 +4,22 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xkeyboard-config
-PKG_VERSION:=		2.6
+PKG_VERSION:=		2.11
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		9a77cb477aec1123720332a091255f25
+PKG_MD5SUM:=		e3defd29cc464cc1a1dfa0eebaca53b1
 PKG_DESCR:=		X keyboard config
 PKG_SECTION:=		x11/libs
-PKG_BUILDDEP:=		xkbcomp
-PKG_SITES:=		${MASTER_SITE_XORG}
+PKG_BUILDDEP:=		autotool util-macros xkbcomp
+PKG_SITES:=		http://www.x.org/releases/individual/data/xkeyboard-config/
+
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XKEYBOARD_CONFIG,xkeyboard-config,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+AUTOTOOL_STYLE:=	autoreconf
+
 xkeyboard-config-install:
 	${INSTALL_DIR} ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb
 	${CP} ${WRKINST}/usr/share/X11/xkb/* \
diff --git a/package/xkeyboard-config/patches/patch-Makefile_am b/package/xkeyboard-config/patches/patch-Makefile_am
new file mode 100644
index 000000000..91f90f91b
--- /dev/null
+++ b/package/xkeyboard-config/patches/patch-Makefile_am
@@ -0,0 +1,10 @@
+--- xkeyboard-config-2.11.orig/Makefile.am	2013-10-19 18:02:53.000000000 +0200
++++ xkeyboard-config-2.11/Makefile.am	2014-03-04 14:43:40.000000000 +0100
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS = foreign
+ 
+-SUBDIRS = compat geometry keycodes po rules symbols types docs man
++SUBDIRS = compat geometry keycodes rules symbols types
+ 
+ pkgconfigdir = $(datadir)/pkgconfig
+ pkgconfig_DATA = xkeyboard-config.pc
diff --git a/package/xkeyboard-config/patches/patch-configure_ac b/package/xkeyboard-config/patches/patch-configure_ac
new file mode 100644
index 000000000..2cb7cc7db
--- /dev/null
+++ b/package/xkeyboard-config/patches/patch-configure_ac
@@ -0,0 +1,13 @@
+--- xkeyboard-config-2.11.orig/configure.ac	2014-01-29 21:08:27.000000000 +0100
++++ xkeyboard-config-2.11/configure.ac	2014-03-04 14:43:26.000000000 +0100
+@@ -63,10 +63,6 @@ AM_CONDITIONAL(USE_COMPAT_RULES, test "x
+ # ****
+ # i18n
+ # ****
+-AC_PROG_INTLTOOL(0.30)
+-
+-AM_GNU_GETTEXT_VERSION([0.18.1])
+-AM_GNU_GETTEXT([external])
+ 
+ GETTEXT_PACKAGE=xkeyboard-config
+ AC_SUBST(GETTEXT_PACKAGE)
diff --git a/package/xkeyboard-config/patches/patch-rules_Makefile_am b/package/xkeyboard-config/patches/patch-rules_Makefile_am
new file mode 100644
index 000000000..ac07e510b
--- /dev/null
+++ b/package/xkeyboard-config/patches/patch-rules_Makefile_am
@@ -0,0 +1,10 @@
+--- xkeyboard-config-2.11.orig/rules/Makefile.am	2013-12-17 23:59:06.000000000 +0100
++++ xkeyboard-config-2.11/rules/Makefile.am	2014-03-04 14:30:44.000000000 +0100
+@@ -244,4 +244,6 @@ MAINTAINERCLEANFILES = $(srcdir)/evdev.x
+ rulesdir = $(xkb_base)/rules
+ xmldir = $(rulesdir)
+ 
+-@INTLTOOL_XML_NOMERGE_RULE@
++# remove intltool-merge dependency
++%.xml: %.xml.in
++	cp $< $@
diff --git a/package/xkeyboard-config/patches/patch-rules_base_extras_xml_in b/package/xkeyboard-config/patches/patch-rules_base_extras_xml_in
new file mode 100644
index 000000000..beb2b7a9d
--- /dev/null
+++ b/package/xkeyboard-config/patches/patch-rules_base_extras_xml_in
@@ -0,0 +1,855 @@
+--- xkeyboard-config-2.11.orig/rules/base.extras.xml.in	2013-12-24 00:48:45.000000000 +0100
++++ xkeyboard-config-2.11/rules/base.extras.xml.in	2014-03-04 14:31:19.000000000 +0100
+@@ -1,4 +1,4 @@
+-<?xml version="1.0" encoding="utf-8"?>
++<?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE xkbConfigRegistry SYSTEM "xkb.dtd">
+ <xkbConfigRegistry>
+   <modelList/>
+@@ -6,8 +6,8 @@
+     <layout>
+       <configItem>
+         <name>apl</name>
+-        <_shortDescription>apl</_shortDescription>
+-        <_description>APL keyboard symbols</_description>
++        <shortDescription>apl</shortDescription>
++        <description>APL keyboard symbols</description>
+         <languageList><iso639Id>eng</iso639Id></languageList>
+       </configItem>
+       <variantList>
+@@ -58,29 +58,29 @@
+     <layout>
+       <configItem>
+         <name>ca</name>
+-        <_shortDescription>fr</_shortDescription>
+-        <_description>French (Canada)</_description>
++        <shortDescription>fr</shortDescription>
++        <description>French (Canada)</description>
+         <languageList><iso639Id>fra</iso639Id></languageList>
+       </configItem>
+       <variantList>
+         <variant>
+           <configItem>
+             <name>kut</name>
+-            <_shortDescription>kut</_shortDescription>
+-            <_description>Kutenai</_description>
++            <shortDescription>kut</shortDescription>
++            <description>Kutenai</description>
+           </configItem>
+         </variant>
+         <variant>
+           <configItem>
+             <name>shs</name>
+-            <_shortDescription>shs</_shortDescription>
+-            <_description>Secwepemctsin</_description>
++            <shortDescription>shs</shortDescription>
++            <description>Secwepemctsin</description>
+           </configItem>
+         </variant>
+         <variant>
+           <configItem>
+             <name>sun_type6</name>
+-            <_description>Multilingual (Canada, Sun Type 6/7)</_description>
++            <description>Multilingual (Canada, Sun Type 6/7)</description>
+           </configItem>
+         </variant>
+       </variantList>
+@@ -88,8 +88,8 @@
+     <layout>
+       <configItem>
+         <name>de</name>
+-        <_shortDescription>de</_shortDescription>
+-        <_description>German</_description>
++        <shortDescription>de</shortDescription>
++        <description>German</description>
+         <languageList>
+           <iso639Id>ger</iso639Id>
+         </languageList>
+@@ -98,7 +98,7 @@
+         <variant>
+           <configItem>
+             <name>us</name>
+-            <_description>German (US keyboard with German letters)</_description>
++            <description>German (US keyboard with German letters)</description>
+             <languageList>
+               <iso639Id>eng</iso639Id>
+             </languageList>
+@@ -107,7 +107,7 @@
+         <variant>
+           <configItem>
+             <name>hu</name>
+-            <_description>German (with Hungarian letters and no dead keys)</_description>
++            <description>German (with Hungarian letters and no dead keys)</description>
+             <languageList>
+               <iso639Id>ger</iso639Id>
+               <iso639Id>hun</iso639Id>
+@@ -117,7 +117,7 @@
+         <variant>
+           <configItem>
+             <name>sun_type6</name>
+-            <_description>German (Sun Type 6/7)</_description>
++            <description>German (Sun Type 6/7)</description>
+           </configItem>
+         </variant>
+       </variantList>
+@@ -125,15 +125,15 @@
+     <layout>
+       <configItem>
+         <name>ir</name>
+-        <_shortDescription>fa</_shortDescription>
+-        <_description>Persian</_description>
++        <shortDescription>fa</shortDescription>
++        <description>Persian</description>
+         <languageList><iso639Id>per</iso639Id></languageList>
+       </configItem>
+       <variantList>
+         <variant>
+           <configItem>
+             <name>ave</name>
+-            <_description>Avestan</_description>
++            <description>Avestan</description>
+             <languageList><iso639Id>ave</iso639Id></languageList>
+           </configItem>
+         </variant>
+@@ -142,21 +142,21 @@
+     <layout>
+       <configItem>
+         <name>lt</name>
+-        <_shortDescription>lt</_shortDescription>
+-        <_description>Lithuanian</_description>
++        <shortDescription>lt</shortDescription>
++        <description>Lithuanian</description>
+         <languageList><iso639Id>lit</iso639Id></languageList>
+       </configItem>
+       <variantList>
+         <variant>
+           <configItem>
+             <name>us_dvorak</name>
+-            <_description>Lithuanian (US Dvorak with Lithuanian letters)</_description>
++            <description>Lithuanian (US Dvorak with Lithuanian letters)</description>
+           </configItem>
+         </variant>
+         <variant>
+           <configItem>
+             <name>sun_type6</name>
+-            <_description>Lithuanian (Sun Type 6/7)</_description>
++            <description>Lithuanian (Sun Type 6/7)</description>
+           </configItem>
+         </variant>
+       </variantList>
+@@ -164,8 +164,8 @@
+     <layout>
+       <configItem>
+         <name>lv</name>
+-        <_shortDescription>lv</_shortDescription>
+-        <_description>Latvian</_description>
++        <shortDescription>lv</shortDescription>
++        <description>Latvian</description>
+         <languageList>
+           <iso639Id>lav</iso639Id>
+         </languageList>
+@@ -174,55 +174,55 @@
+         <variant>
+           <configItem>
+             <name>dvorak</name>
+-            <_description>Latvian (US Dvorak)</_description>
++            <description>Latvian (US Dvorak)</description>
+           </configItem>
+         </variant>
+         <variant>
+           <configItem>
+             <name>ykeydvorak</name>
+-            <_description>Latvian (US Dvorak, Y variant)</_description>
++            <description>Latvian (US Dvorak, Y variant)</description>
+           </configItem>
+         </variant>
+         <variant>
+           <configItem>
+             <name>minuskeydvorak</name>
+-            <_description>Latvian (US Dvorak, minus variant)</_description>
++            <description>Latvian (US Dvorak, minus variant)</description>
+           </configItem>
+         </variant>
+         <variant>
+           <configItem>
+             <name>dvorakprogr</name>
+-            <_description>Latvian (programmer US Dvorak)</_description>
++            <description>Latvian (programmer US Dvorak)</description>
+           </configItem>
+         </variant>
+         <variant>
+           <configItem>
+             <name>ykeydvorakprogr</name>
+-            <_description>Latvian (programmer US Dvorak, Y variant)</_description>
++            <description>Latvian (programmer US Dvorak, Y variant)</description>
+           </configItem>
+         </variant>
+         <variant>
+           <configItem>
+             <name>minuskeydvorakprogr</name>
+-	    <_description>Latvian (programmer US Dvorak, minus variant)</_description>
++	    <description>Latvian (programmer US Dvorak, minus variant)</description>
+           </configItem>
+         </variant>
+         <variant>
+           <configItem>
+             <name>colemak</name>
+-            <_description>Latvian (US Colemak)</_description>
++            <description>Latvian (US Colemak)</description>
+           </configItem>
+         </variant>
+         <variant>
+           <configItem>
+             <name>apostrophecolemak</name>
+-            <_description>Latvian (US Colemak, apostrophe variant)</_description>
++            <description>Latvian (US Colemak, apostrophe variant)</description>
+           </configItem>
+         </variant>
+         <variant>
+           <configItem>
+             <name>sun_type6</name>
+-            <_description>Latvian (Sun Type 6/7)</_description>
++            <description>Latvian (Sun Type 6/7)</description>
+           </configItem>
+         </variant>
+       </variantList>
+@@ -230,34 +230,34 @@
+     <layout>
+       <configItem>
+         <name>us</name>
+-        <_shortDescription>en</_shortDescription>
+-        <_description>English (US)</_description>
++        <shortDescription>en</shortDescription>
++        <description>English (US)</description>
+         <languageList><iso639Id>eng</iso639Id></languageList>
+       </configItem>
+       <variantList>
+         <variant>
+           <configItem>
+             <name>intl-unicode</name>
+-            <_description>English (US, international AltGr Unicode combining)</_description>
++            <description>English (US, international AltGr Unicode combining)</description>
+           </configItem>
+         </variant>
+         <variant>
+           <configItem>
+             <name>alt-intl-unicode</name>
+-            <_description>English (US, international AltGr Unicode combining, alternative)</_description>
++            <description>English (US, international AltGr Unicode combining, alternative)</description>
+           </configItem>
+         </variant>
+         <variant>
+           <configItem>
+             <name>ats</name>
+-            <_description>Atsina</_description>
+-            <!-- No ISO code in ISO639-2, only draft ISO693-3 -->
++            <description>Atsina</description>
++            
+           </configItem>
+         </variant>
+         <variant>
+           <configItem>
+             <name>crd</name>
+-            <_description>Coeur d'Alene Salish</_description>
++            <description>Coeur d'Alene Salish</description>
+             <languageList><iso639Id>crd</iso639Id></languageList>
+           </configItem>
+         </variant>
+@@ -274,13 +274,13 @@
+         <variant>
+           <configItem>
+             <name>sun_type6</name>
+-            <_description>English (US, Sun Type 6/7)</_description>
++            <description>English (US, Sun Type 6/7)</description>
+           </configItem>
+         </variant>
+         <variant>
+           <configItem>
+             <name>norman</name>
+-            <_description>English (Norman)</_description>
++            <description>English (Norman)</description>
+           </configItem>
+         </variant>
+       </variantList>
+@@ -288,27 +288,27 @@
+     <layout>
+       <configItem>
+         <name>pl</name>
+-        <_shortDescription>pl</_shortDescription>
+-        <_description>Polish</_description>
++        <shortDescription>pl</shortDescription>
++        <description>Polish</description>
+         <languageList><iso639Id>pol</iso639Id></languageList>
+       </configItem>
+       <variantList>
+         <variant>
+           <configItem>
+             <name>intl</name>
+-            <_description>Polish (international with dead keys)</_description>
++            <description>Polish (international with dead keys)</description>
+           </configItem>
+         </variant>
+         <variant>
+           <configItem>
+             <name>colemak</name>
+-            <_description>Polish (Colemak)</_description>
++            <description>Polish (Colemak)</description>
+           </configItem>
+         </variant>
+         <variant>
+           <configItem>
+             <name>sun_type6</name>
+-            <_description>Polish (Sun Type 6/7)</_description>
++            <description>Polish (Sun Type 6/7)</description>
+           </configItem>
+         </variant>
+       </variantList>
+@@ -316,16 +316,16 @@
+     <layout>
+       <configItem>
+         <name>ro</name>
+-        <_shortDescription>ro</_shortDescription>
+-        <_description>Romanian</_description>
++        <shortDescription>ro</shortDescription>
++        <description>Romanian</description>
+         <languageList><iso639Id>rum</iso639Id></languageList>
+       </configItem>
+       <variantList>
+         <variant>
+           <configItem>
+             <name>crh_dobruja</name>
+-            <_shortDescription>crh</_shortDescription>
+-            <_description>Crimean Tatar (Do