* Use keymapchars from gfxboot (>= 3.2.23-1) rather than our own.

Makefile

@@ -1,6 +1,11 @@
-BINDIR      := $(shell [ -x ../../mkbootmsg ] && echo ../../ )
+ifneq ($(BINDIR),)
+BINDIR      := $(BINDIR)/
+else
+BINDIR      := $(dir $(firstword $(wildcard /usr/share/gfxboot/bin/mkbootmsg) $(wildcard ../../mkbootmsg)))
+endif
 
-MKBOOTMSG    = $(BINDIR)mkbootmsg
+MKBOOTMSG    = $(BINDIR)/mkbootmsg
+KEYMAPCHARS  = $(BINDIR)/keymapchars
 BFLAGS       = -O -v -L ../..
 INCLUDES     = $(wildcard *.inc)
 TRANSLATIONS = $(addsuffix .tr,en $(notdir $(basename $(wildcard po/*.po))))
@@ -63,7 +68,7 @@ font:
 	cat po/*.po >tmp.txt
 	getx11font -v -l 18 -p 2,4 \
 	-c ISO-8859-15 -c ISO-8859-2 -c koi8-r \
-	`./keymapchars keytables.inc` \
+	`$(KEYMAPCHARS) keytables.inc` \
 	-t tmp.txt \
 	-t install/log -t boot/log \
 	-t langlist -t langnames.inc \

debian/changelog

@@ -1,3 +1,9 @@
+gfxboot-theme-ubuntu (0.2.0) UNRELEASED; urgency=low
+
+  * Use keymapchars from gfxboot (>= 3.2.23-1) rather than our own.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 12 Jul 2006 13:13:53 +0100
+
 gfxboot-theme-ubuntu (0.1.25) dapper; urgency=low
 
   * "Install to first hard disk" -> "Install to the hard disk". Whoops.

debian/control

@@ -7,7 +7,7 @@ Standards-Version: 3.6.2
 
 Package: gfxboot-theme-ubuntu
 Architecture: amd64 i386
-Depends: gfxboot
+Depends: gfxboot (>= 3.2.23-1)
 Description: Ubuntu theme for gfxboot-compliant boot loaders
  This is an Ubuntu theme for the gfxboot graphical boot loader extension. It
  should be suitable for Ubuntu derivatives as well as Ubuntu itself.

keymapchars

@@ -1,37 +0,0 @@
-#! /usr/bin/perl
-
-while(<>) {
-  if(/^\s*\[\s*\S+\s*(\S+)\s*(\S+)\s*(\S+)\s*\]/) {
-    $k{hex $1} = 1;
-    $k{hex $2} = 1;
-    $k{hex $3} = 1;
-  }
-}
-
-delete $k{0};
-
-@f = sort { $a <=> $b } (keys %k);
-
-print "-a ";
-
-for (@f) {
-  if(!defined($i)) {
-    printf "0x%02x", $_;
-    $sep = ',';
-  }
-  elsif($_ == $i + 1) {
-    $sep = '-';
-  }
-  else {
-    printf "-0x%02x", $i if $sep eq '-';
-    printf ",0x%02x", $_;
-    $sep = ',';
-  }
-
-  $i = $_;
-}
-
-printf "-0x%02x", $i if $sep eq '-';
-
-print "\n";
-