# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1210689260 0
# Node ID d6b2fcbc77d6260ee4d5b549b9733f79c62a04a8
# Parent  c8364a02b6fc0221d313aba69dd118467a3587c1
Up syslinux syslinux-extra 3.63, build *.kbd

diff -r c8364a02b6fc -r d6b2fcbc77d6 syslinux-extra/receipt
--- a/syslinux-extra/receipt	Tue May 13 10:09:32 2008 +0000
+++ b/syslinux-extra/receipt	Tue May 13 14:34:20 2008 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="syslinux-extra"
-VERSION="3.62"
+VERSION="3.63"
 CATEGORY="system-tools"
 SHORT_DESC="MBR/FAT/EXT3/PXE bootloader files"
 MAINTAINER="pankso@slitaz.org"
diff -r c8364a02b6fc -r d6b2fcbc77d6 syslinux-kbd/receipt
--- a/syslinux-kbd/receipt	Tue May 13 10:09:32 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="syslinux-kbd"
-VERSION="3.62"
-CATEGORY="system-tools"
-SHORT_DESC="Keyboard maping definitions for boot loader."
-MAINTAINER="pascal.bellard@slitaz.org"
-WANTED="syslinux"
-WEB_SITE="http://syslinux.zytor.com/"
-BUILD_DEPENDS="kbd-base perl"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share/boot/ /tmp/$PACKAGE-$$
-	zcat /usr/share/kbd/keymaps/i386/qwerty/us.map.gz > /tmp/us.map
-	sed "s|\\\$DEFAULT_PATH = .*|\$DEFAULT_PATH = \"/tmp/$PACKAGE-$$\";|" \
-		> /tmp/$PACKAGE-$$/mkkbd < $src/keytab-lilo.pl
-	chmod +x /tmp/$PACKAGE-$$/mkkbd
-	for i in $(cd /usr/share/kbd/keymaps/i386 ; ls */*.map.gz); do
-		[ "$(dirname $i)" = "include" ] && continue
-		j=$(basename $i)
-		j=${j%.map.gz}
-		zcat /usr/share/kbd/keymaps/i386/$i > /tmp/$PACKAGE-$$/$j.map
-	done
-	for i in $(cd /tmp/$PACKAGE-$$ ; ls *.map); do
-		i=$(basename $i)
-		i=${i%.map}
-		/tmp/$PACKAGE-$$/mkkbd $i > $fs/usr/share/boot/$i.kbd
-	done
-	rm -rf /tmp/$PACKAGE-$$
-}
-
diff -r c8364a02b6fc -r d6b2fcbc77d6 syslinux/receipt
--- a/syslinux/receipt	Tue May 13 10:09:32 2008 +0000
+++ b/syslinux/receipt	Tue May 13 14:34:20 2008 +0000
@@ -1,20 +1,45 @@
 # SliTaz package receipt.
 
 PACKAGE="syslinux"
-VERSION="3.62"
+VERSION="3.63"
 CATEGORY="base-system"
 SHORT_DESC="LiveCD ISO bootloader (isolinux)"
 MAINTAINER="pankso@slitaz.org"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://syslinux.zytor.com/"
 WGET_URL="ftp://ftp.kernel.org/pub/linux/boot/syslinux/$TARBALL"
+BUILD_DEPENDS="kbd-base perl"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+compile_rules()
+{
+	cd $src
+	sed "s|\\\$DEFAULT_PATH = .*|\$DEFAULT_PATH = \"$PWD\";|" \
+		> mkkbd < keytab-lilo.pl
+	chmod +x mkkbd
+	for i in $(cd /usr/share/kbd/keymaps/i386 ; ls */*.map.gz); do
+		[ "$(dirname $i)" = "include" ] && continue
+		j=$(basename $i)
+		zcat /usr/share/kbd/keymaps/i386/$i > ${j%.gz}
+	done
+	for i in $(ls *.map); do
+		i=$(basename $i)
+		i=${i%.map}
+		./mkkbd $i > $i.kbd
+	done
+}
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
     mkdir -p $fs/boot/isolinux
-    cp -a $PACKAGE-$VERSION/isolinux.bin $fs/boot/isolinux
-    cp -a $PACKAGE-$VERSION/com32/modules/reboot.c32 $fs/boot/isolinux
+    cp -a $src/isolinux.bin $fs/boot/isolinux
+    cp -a $src/com32/modules/reboot.c32 $fs/boot/isolinux
     cp stuff/* $fs/boot/isolinux
+    rm -r $fs/boot/isolinux/slitaz.* $fs/boot/isolinux/*.kbd 2> /dev/null
+    for i in $(grep kbd$ $fs/boot/isolinux/*.cfg | cut -d' ' -f2); do
+        cp $src/$i $fs/boot/isolinux
+    done
     chown root.root $fs/boot/isolinux/*
 }
+
diff -r c8364a02b6fc -r d6b2fcbc77d6 syslinux/stuff/be.cfg
--- a/syslinux/stuff/be.cfg	Tue May 13 10:09:32 2008 +0000
+++ b/syslinux/stuff/be.cfg	Tue May 13 14:34:20 2008 +0000
@@ -1,5 +1,5 @@
 display isolinux.msg
-KBDMAP be.kbd
+KBDMAP be-latin1.kbd
 default slitaz
 label slitaz
 	kernel /boot/bzImage
diff -r c8364a02b6fc -r d6b2fcbc77d6 syslinux/stuff/be.kbd
Binary file syslinux/stuff/be.kbd has changed
diff -r c8364a02b6fc -r d6b2fcbc77d6 syslinux/stuff/ca.cfg
--- a/syslinux/stuff/ca.cfg	Tue May 13 10:09:32 2008 +0000
+++ b/syslinux/stuff/ca.cfg	Tue May 13 14:34:20 2008 +0000
@@ -1,5 +1,5 @@
 display isolinux.msg
-KBDMAP ca.kbd
+KBDMAP cf.kbd
 default slitaz
 label slitaz
 	kernel /boot/bzImage
diff -r c8364a02b6fc -r d6b2fcbc77d6 syslinux/stuff/ca.kbd
Binary file syslinux/stuff/ca.kbd has changed
diff -r c8364a02b6fc -r d6b2fcbc77d6 syslinux/stuff/de_CH.cfg
--- a/syslinux/stuff/de_CH.cfg	Tue May 13 10:09:32 2008 +0000
+++ b/syslinux/stuff/de_CH.cfg	Tue May 13 14:34:20 2008 +0000
@@ -1,5 +1,5 @@
 display isolinux.msg
-KBDMAP de_CH.kbd
+KBDMAP de_CH-latin1.kbd
 default slitaz
 label slitaz
 	kernel /boot/bzImage
diff -r c8364a02b6fc -r d6b2fcbc77d6 syslinux/stuff/de_CH.kbd
Binary file syslinux/stuff/de_CH.kbd has changed
diff -r c8364a02b6fc -r d6b2fcbc77d6 syslinux/stuff/en.cfg
--- a/syslinux/stuff/en.cfg	Tue May 13 10:09:32 2008 +0000
+++ b/syslinux/stuff/en.cfg	Tue May 13 14:34:20 2008 +0000
@@ -1,5 +1,5 @@
 display isolinux.msg
-KBDMAP en.kbd
+KBDMAP uk.kbd
 default slitaz
 label slitaz
 	kernel /boot/bzImage
diff -r c8364a02b6fc -r d6b2fcbc77d6 syslinux/stuff/en.kbd
Binary file syslinux/stuff/en.kbd has changed
diff -r c8364a02b6fc -r d6b2fcbc77d6 syslinux/stuff/es.kbd
Binary file syslinux/stuff/es.kbd has changed
diff -r c8364a02b6fc -r d6b2fcbc77d6 syslinux/stuff/fr.cfg
--- a/syslinux/stuff/fr.cfg	Tue May 13 10:09:32 2008 +0000
+++ b/syslinux/stuff/fr.cfg	Tue May 13 14:34:20 2008 +0000
@@ -1,5 +1,5 @@
 display isolinux.msg
-KBDMAP fr.kbd
+KBDMAP fr-latin1.kbd
 default slitaz
 label slitaz
 	kernel /boot/bzImage
diff -r c8364a02b6fc -r d6b2fcbc77d6 syslinux/stuff/fr.kbd
Binary file syslinux/stuff/fr.kbd has changed
diff -r c8364a02b6fc -r d6b2fcbc77d6 syslinux/stuff/fr_CH.cfg
--- a/syslinux/stuff/fr_CH.cfg	Tue May 13 10:09:32 2008 +0000
+++ b/syslinux/stuff/fr_CH.cfg	Tue May 13 14:34:20 2008 +0000
@@ -1,5 +1,5 @@
 display isolinux.msg
-KBDMAP fr_CH.kbd
+KBDMAP fr_CH-latin1.kbd
 default slitaz
 label slitaz
 	kernel /boot/bzImage
diff -r c8364a02b6fc -r d6b2fcbc77d6 syslinux/stuff/fr_CH.kbd
Binary file syslinux/stuff/fr_CH.kbd has changed
diff -r c8364a02b6fc -r d6b2fcbc77d6 syslinux/stuff/it.kbd
Binary file syslinux/stuff/it.kbd has changed
diff -r c8364a02b6fc -r d6b2fcbc77d6 syslinux/stuff/slitaz.html
--- a/syslinux/stuff/slitaz.html	Tue May 13 10:09:32 2008 +0000
+++ b/syslinux/stuff/slitaz.html	Tue May 13 14:34:20 2008 +0000
@@ -22,7 +22,7 @@
 <div id="header">
     <a name="top"></a>
 <!-- Access -->
-    <a href="http://www.slitaz.org/"><img id="logo"
+    <a href="javascript:void(0);" onClick="window.open('slitaz.html','popup','width=640,height=350')"><img id="logo"
     src="http://www.slitaz.org/pics/website/logo.png" title="www.slitaz.org" alt="www.slitaz.org"
     style="border: 0px solid ; width: 200px; height: 74px;" /></a>
     <p id="titre">#!/LiveCD/boot</p>