[Pkg-kbd-commit] r195 - in people/zinoviev/console-setup: .
Keyboard debian
Anton Zinoviev
zinoviev at costa.debian.org
Sat Jul 22 11:25:52 UTC 2006
Author: zinoviev
Date: 2006-07-22 11:25:06 +0000 (Sat, 22 Jul 2006)
New Revision: 195
Added:
people/zinoviev/console-setup/Keyboard/ckbcomp-mini
people/zinoviev/console-setup/debian/compat
people/zinoviev/console-setup/debian/console-setup-mini.console-setup.init
people/zinoviev/console-setup/debian/console-setup-mini.postinst
people/zinoviev/console-setup/debian/console-setup-mini.postrm
people/zinoviev/console-setup/debian/console-setup-mini.templates
people/zinoviev/console-setup/debian/console-setup.console-setup.init
people/zinoviev/console-setup/debian/console-setup.postinst
people/zinoviev/console-setup/debian/console-setup.postrm
people/zinoviev/console-setup/debian/console-setup.templates
Removed:
people/zinoviev/console-setup/Keyboard/config.inc
people/zinoviev/console-setup/copyright.X
people/zinoviev/console-setup/debian/console-setup-mini.init
people/zinoviev/console-setup/debian/console-setup.init
people/zinoviev/console-setup/debian/postinst
people/zinoviev/console-setup/debian/postrm
people/zinoviev/console-setup/debian/templates
Modified:
people/zinoviev/console-setup/Keyboard/Makefile
people/zinoviev/console-setup/Keyboard/ckbcomp
people/zinoviev/console-setup/Keyboard/kbdcompiler
people/zinoviev/console-setup/Makefile
people/zinoviev/console-setup/copyright
people/zinoviev/console-setup/debian/changelog
people/zinoviev/console-setup/debian/config.proto
people/zinoviev/console-setup/debian/console-setup.copyright
people/zinoviev/console-setup/debian/control
people/zinoviev/console-setup/debian/rules
people/zinoviev/console-setup/setupcon
Log:
console-setup: New package console-setup-mini
Modified: people/zinoviev/console-setup/Keyboard/Makefile
===================================================================
--- people/zinoviev/console-setup/Keyboard/Makefile 2006-07-20 21:25:38 UTC (rev 194)
+++ people/zinoviev/console-setup/Keyboard/Makefile 2006-07-22 11:25:06 UTC (rev 195)
@@ -1,10 +1,19 @@
SHELL = /bin/sh
-build : compose_files gziped_acmfiles KeyboardNames.pl
+build : compose_files gziped_acmfiles KeyboardNames.pl MyKeyboardNames.pl
+models = amiga ataritt macintosh_old pc105 sun4 sun5
+
+gziped_ekmaps = $(addsuffix .ekmap.gz, $(models))
+
+build-mini : $(gziped_ekmaps)
+
%.gz : %
gzip -9 <$< >$@
+%.ekmap :
+ ./kbdcompiler $(@:%.ekmap=%) MyKeyboardNames.pl $(xkbdir) >$@
+
acmfiles = $(wildcard acm/*.acm)
gziped_acmfiles = $(addsuffix .gz, $(acmfiles))
@@ -45,7 +54,15 @@
-rm -rf compose $(compose_files)
-rm -rf keymaps
-rm -f keymaps.dir names.list
+ -rm -f $(gziped_ekmaps)
+ -rm -f MyKeyboardNames.pl
.PHONY: maintainer-clean
maintainer-clean: clean
./xmlreader >KeyboardNames.pl
+
+KeyboardNames.pl:
+ ./xmlreader >KeyboardNames.pl
+
+MyKeyboardNames.pl:
+ ./xmlreader $(xkbdir)/rules/xorg.xml >MyKeyboardNames.pl
Modified: people/zinoviev/console-setup/Keyboard/ckbcomp
===================================================================
--- people/zinoviev/console-setup/Keyboard/ckbcomp 2006-07-20 21:25:38 UTC (rev 194)
+++ people/zinoviev/console-setup/Keyboard/ckbcomp 2006-07-22 11:25:06 UTC (rev 195)
@@ -1,7 +1,7 @@
#!/usr/bin/perl
# ckbcomp -- compile XKB keyboard definitions to loadkeys format
-# Copyright © 2005 Anton Zinoviev <anton at lml.bas.bg>
+# Copyright © 2005,2006 Anton Zinoviev <anton at lml.bas.bg>
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -257,6 +257,14 @@
'shiftr shiftl alt control altgr shift',
);
+# Some Unicodes cause the kernel/loadkeys to issue "Segmentation fault"
+my %forbidden;
+{
+ for my $i (0xfd00..0xfdff) {
+ $forbidden{$i} = 1;
+ }
+}
+
my %xkbsym_table = (
# Control symbols
'BackSpace' => 'Delete', # 0008
@@ -1492,6 +1500,8 @@
'XF86_Next_VMode' => 'VoidSymbol',
'XF86_Prev_VMode' => 'VoidSymbol',
# I do not know the Unicodes of these
+ 'leftcaret' => 'VoidSymbol', # Is this recognised by X ?
+ '0x13a4' => 'VoidSymbol', # Spelling error ?
'guj_rra' => 'VoidSymbol', # Is this recognised by X ?
'guj_nnna' => 'VoidSymbol', # Is this recognised by X ?
'guj_llla' => 'VoidSymbol', # Is this recognised by X ?
@@ -1507,6 +1517,10 @@
'SunAudioRaiseVolume' => 'VoidSymbol',
'SunCopy' => 'VoidSymbol',
'SunCut' => 'VoidSymbol',
+ 'SunAgain' => 'VoidSymbol',
+ 'SunUndo' => 'VoidSymbol',
+ 'SunFind' => 'VoidSymbol',
+ 'SunStop' => 'VoidSymbol',
'SunF36' => 'VoidSymbol',
'SunF37' => 'VoidSymbol',
'SunFront' => 'VoidSymbol',
@@ -2236,6 +2250,47 @@
$stream =~ s/^[^\}\{]*(\}|$)//;
}
+sub xkb_block_list {
+ my $file_type = $_[0];
+ my $block = $_[1];
+ my $first = 1;
+ my $ok = 0;
+ my $mystream = $stream;
+ while ($stream) {
+ my $default = xkb_flags();
+ xkb_identifier() eq "xkb_". $file_type
+ or syntax_error "xkb_". $file_type;
+ my $name = xkb_string();
+ my $structured;
+ if ($stream =~ s/^\{//) {
+ $structured = 1;
+ } else {
+ $structured = 0;
+ }
+ if ($name eq $block || ($first && ! $block)) {
+ xkb_definitions ($file_type);
+ if ($structured) {
+ $stream =~ s/^\};.*// or syntax_error "};";
+ } else {
+ $stream = '';
+ }
+ $ok = 1;
+ } else {
+ if ($structured) {
+ skip_to_brace;
+ $stream =~ s/^;// or syntax_error ";";
+ } else {
+ last;
+ }
+ }
+ $first = 0;
+ }
+ if (! $ok) {
+ $stream = $mystream;
+ }
+ return $ok;
+}
+
sub include_xkb_file {
my $file_type = $_[0];
my $include_list = '^'. $_[1];
@@ -2293,41 +2348,11 @@
}
my $oldfilename = $filename;
$filename = $file;
- my $first = 1;
- my $ok = 0;
- while ($stream) {
- my $asdf = (substr ($stream, 0, 50));
- my $default = xkb_flags();
- xkb_identifier() eq "xkb_". $file_type
- or syntax_error "xkb_". $file_type;
- my $name = xkb_string();
- my $structured;
- if ($stream =~ s/^\{//) {
- $structured = 1;
- } else {
- $structured = 0;
- }
- if ($name eq $block || ($first && ! $block)) {
- xkb_definitions ($file_type);
- if ($structured) {
- $stream =~ s/^\};.*// or syntax_error "};";
- } else {
- $stream = '';
- }
- $ok = 1;
- } else {
- if ($structured) {
- skip_to_brace;
- $stream =~ s/^;// or syntax_error ";";
- } else {
- die "$0: can not found $block in $file\n";
- }
- }
- $first = 0;
+ if (!xkb_block_list ($file_type, $block)) {
+ warning "Can not found \"$block\" in \"$file\".\n";
+ xkb_block_list ($file_type, '');
}
- die "$0: can not found $block in $file\n" unless ($ok);
$stream = $oldstream;
- my $asdf = (substr ($stream, 0, 50));
$filename = $oldfilename;
$method = $oldmethod;
$base_group = $oldbase_group;
@@ -2410,17 +2435,22 @@
}
if (defined $kernelkeysym) {
my $uni = hex ($kernelkeysym);
- if (chr($uni) =~ /\p{IsAlpha}/) {
- my $legacy = uni_to_legacy ($uni);
- if ($legacy ne 'VoidSymbol') {
- return '+'. $legacy;
+ if (defined $forbidden{$uni}) {
+# warning "Forbidden Unicode \"U+$kernelkeysym\"\n";
+ return 'VoidSymbol';
+ } else {
+ if (chr($uni) =~ /\p{IsAlpha}/) {
+ my $legacy = uni_to_legacy ($uni);
+ if ($legacy ne 'VoidSymbol') {
+ return '+'. $legacy;
+ } else {
+ return $legacy;
+ }
+ } elsif ($uni <= 0x1f) {
+ return $controlsyms[$uni + 1];
} else {
- return $legacy;
+ return uni_to_legacy ($uni);
}
- } elsif ($uni <= 0x1f) {
- return $controlsyms[$uni + 1];
- } else {
- return uni_to_legacy ($uni);
}
} else {
warning "Unknown X keysym \"$xkeysym\"\n";
@@ -2722,7 +2752,7 @@
}
}
if ($compact) {
- my $line = ($vector[0] ne $vector[16] or $vector[1] ne $vector[17]
+ my $line = ($symbols =~ /:2/ # true if the keymap is non-latin
? "@vector[0, 1, 16, 17, 4, 20, 8, 24, 12, 28]"
: "@vector[0, 1, 2, 3, 4, 6, 8, 10, 12, 14]");
$line =~ s/NoSymbol/VoidSymbol/g;
Added: people/zinoviev/console-setup/Keyboard/ckbcomp-mini
===================================================================
--- people/zinoviev/console-setup/Keyboard/ckbcomp-mini 2006-07-20 21:25:38 UTC (rev 194)
+++ people/zinoviev/console-setup/Keyboard/ckbcomp-mini 2006-07-22 11:25:06 UTC (rev 195)
@@ -0,0 +1,150 @@
+#!/bin/sh
+
+# ckbcomp-mini -- convert XKB specification to keymap for loadkeys
+# Copyright © 2006 Anton Zinoviev
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# If you have not received a copy of the GNU General Public License
+# along with this program, write to the Free Software Foundation, Inc.,
+# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+# Default values:
+ekmapdir=/usr/share/console-setup-mini
+model=pc105
+layout=''
+variant=''
+options=''
+verbose_option=no
+
+# The same as /usr/bin/which - in order to make "which" available in
+# environments where "which" does not exist
+which () {
+ local IFS
+ IFS=:
+ for i in $PATH; do
+ if [ -x "$i/$1" ]; then
+ echo "$i/$1"
+ return 0
+ fi
+ done
+ return 1
+}
+
+while [ "$1" ]; do
+ case "$1" in
+ -I*)
+ ekmapdir=${1#-I}
+ ;;
+ -model)
+ shift
+ model="$1"
+ ;;
+ -layout)
+ shift
+ layout="$1"
+ ;;
+ -variant)
+ shift
+ variant="$1"
+ ;;
+ -option)
+ shift
+ options=$(echo $options $1 | sed 's/,/ /g')
+ ;;
+ -\?|-help)
+ cat >&2 <<EOF
+Usage: ckbcomp-mini [args] [<layout> [<variant> [<option> ... ]]]
+Where legal args are:
+-?,-help Print this message
+-I<dir> Search for ekmaps in <dir>
+-model <name> Specifies model used to choose component names
+-layout <name> Specifies layout used to choose component names
+-variant <name> Specifies layout variant used to choose component names
+-option <name> Adds an option used to choose component names
+EOF
+ exit 0
+ ;;
+ -*)
+ echo "setupcon: Unrecognised option $1" >&2
+ exit 1
+ ;;
+ *)
+ if [ -z "$layout" ]; then
+ layout="$1"
+ elif [ -z "$variant" ]; then
+ variant="$1"
+ else
+ options=$(echo $options $1 | sed 's/,/ /g')
+ fi
+ esac
+ shift
+done
+
+case "$model" in
+ amiga|ataritt|macintosh_old|pc105|sun4|sun5)
+ ;;
+ *)
+ model=pc105
+ ;;
+esac
+
+if [ -z "$layout" ]; then
+ layout=us
+fi
+
+ekmap=$ekmapdir/$model.ekmap.gz
+
+if [ ! -f $ekmap ]; then
+ echo "ckbcomp-mini: $ekmap does not exist" >&2
+ exit 1
+fi
+
+layout=${layout#*,}
+variant=${variant#*,}
+
+if [ "$variant" ]; then
+ kmap="$layout:$variant"
+else
+ kmap="$layout"
+fi
+
+ckbcomp_rec () {
+ local kmap
+ kmap="$1"
+ zcat $ekmap \
+ | grep "^$kmap::" \
+ | sed "s/^$kmap:://" \
+ | {
+ while read line; do
+ case "$line" in
+ ?include*)
+ ckbcomp_rec "${line##* }"
+ ;;
+ keycode*)
+ echo "$line"
+ ;;
+ *)
+ ;;
+ esac
+ done
+ }
+}
+
+echo 'keymaps 0-4,6,8,10,12,14'
+ckbcomp_rec "$kmap"
+for option in $options; do
+ zcat $ekmap \
+ | grep "^$option::" \
+ | sed "s/^$option:://"
+done
+echo 'strings as usual'
+
Property changes on: people/zinoviev/console-setup/Keyboard/ckbcomp-mini
___________________________________________________________________
Name: svn:executable
+ *
Deleted: people/zinoviev/console-setup/Keyboard/config.inc
===================================================================
--- people/zinoviev/console-setup/Keyboard/config.inc 2006-07-20 21:25:38 UTC (rev 194)
+++ people/zinoviev/console-setup/Keyboard/config.inc 2006-07-22 11:25:06 UTC (rev 195)
@@ -1,125 +0,0 @@
-## Uncomment the include lines to match your preferences
-
-####################################################
-## THE COMPOSE KEY
-####################################################
-
-## The CapsLock key acts as "Compose"
-# include "compose-caps.inc"
-
-## The Menu key acts as "Compose"
-# include "compose-menu.inc"
-
-## The right Alt key acts as "Compose"
-# include "compose-ralt.inc"
-
-## The right Win key acts as "Compose"
-# include "compose-rwin.inc"
-
-## The CapsLock key acts as "Control"
-# include "ctrl-nocaps.inc"
-
-## Swap the CapsLock and the left Control keys
-# include "ctrl-swapcaps.inc"
-
-###########################################################
-## CHANGING THE GROUP
-###########################################################
-
-## The following options control how the keyboard changes its layout.
-## They are useful mostly for the non-Latin layouts and control how
-## to toggle the keyboard between "Latin" and "non-Latin" mode. They
-## can be useful in other circumstances also (e.g. toggling between
-## "QWERTY" and "Dvorak" layouts).
-
-## The left Alt key changes the keyboard layout
-# include "grp-toggle.inc"
-
-## The CapsLock key changes the keyboard layout
-## Use the Shift+CapsLock combination for the usual behaviour of CapsLock
-# include "grp-caps_toggle.inc"
-
-## Any of the Win keys changes the keyboard layout
-# include "grp-win_switch.inc"
-
-## The Menu key changes the keyboard layout
-# include "grp-menu_toggle.inc"
-
-## The right Control changes the keyboard layout
-# include "grp-rctrl_toggle.inc"
-
-## The right Shift changes the keyboard layout
-# include "grp-rshift_toggle.inc"
-
-## The right Win key changes the keyboard layout
-# include "grp-rwin_toggle.inc"
-
-## The ScrollLock key changes the keyboard layout
-# include "grp-sclk_toggle.inc"
-
-## The left Alt key changes the keyboard layout
-# include "grp-lalt_toggle.inc"
-
-## The left Control key changes the keyboard layout
-# include "grp-lctrl_toggle.inc"
-
-## The left Shift key changes the keyboard layout
-# include "grp-lshift_toggle.inc"
-
-## The left Win key changes the keyboard layout
-# include "grp-lwin_toggle.inc"
-
-## Alt+Shift combination changes the keyboard layout
-# include "grp-alt_shift_toggle.inc"
-
-## Control+Alt combination changes the keyboard layout
-# include "grp-ctrl_alt_toggle.inc"
-
-## Control+Shift combination changes the keyboard layout
-# include "grp-ctrl_shift_toggle.inc"
-
-## The right Alt key switches the keyboard layout only while pressed
-# include "grp-switch.inc"
-
-## The left Alt key switches the keyboard layout only while pressed
-# include "grp-lswitch.inc"
-
-## The left Win key switches the keyboard layout only while pressed
-# include "grp-lwin_switch.inc"
-
-## The right Win key switches the keyboard layout only while pressed
-# include "grp-rwin_switch.inc"
-
-## The followint three options does not work on the console
-# include "grp-alts_toggle.inc"
-# include "grp-ctrls_toggle.inc"
-# include "grp-shift_toggle.inc"
-
-###########################################################
-## CHANGING THE LEVEL
-###########################################################
-
-## The following options control how to activate the additional
-## symbols that the keyboard can generate. In many of the Latin
-## layouts most of these symbols are accented letters or dead keys.
-
-## The right Control selects the additional symbols
-# include "lv3-switch.inc"
-
-## The right Alt selects the additional symbols. Shift+Alt is Compose.
-# include "lv3-ralt_switch_multikey.inc"
-
-## The right Alt selects the additional symbols
-# include "lv3-ralt_switch.inc"
-
-## The Menu key selects the additional symbols
-# include "lv3-menu_switch.inc"
-
-## Any of the Win keys selects the additional symbols
-# include "lv3-win_switch.inc"
-## The rigth Win selects the additional symbols
-# include "lv3-rwin_switch.inc"
-
-## The left Win key selects the additional symbols
-# include "lv3-lwin_switch.inc"
-
Modified: people/zinoviev/console-setup/Keyboard/kbdcompiler
===================================================================
--- people/zinoviev/console-setup/Keyboard/kbdcompiler 2006-07-20 21:25:38 UTC (rev 194)
+++ people/zinoviev/console-setup/Keyboard/kbdcompiler 2006-07-22 11:25:06 UTC (rev 195)
@@ -4,15 +4,30 @@
use strict;
BEGIN {
- do "KeyboardNames.pl";
+ my $file;
+ if ($ARGV[1]) {
+ $file = $ARGV[1];
+ } else {
+ $file = 'KeyboardNames.pl';
+ }
+ do "$file";
}
my $model = $ARGV[0];
my $dir = 'keymaps';
-my $nonlatin = ' am ara ben bg by deva ge gr guj guru il ir iku kan
- lao mk mm mal ori ru scc syr tel th tj tam ua ';
+my $xkbdir;
+if ($ARGV[2]) {
+ $xkbdir = $ARGV[2];
+} else {
+ $xkbdir = "`pwd`/ckb";
+}
+# Don't forget to update also the list in config.proto
+my $nonlatin = ' am ara ben bd bg bt by cs deva ge gh gr guj guru \
+ il in ir iku jp kan kh la lao lk mk mm mn mv mal \
+ ori pk ru scc sy syr tel th tj tam ua uz ';
+
my %keymaps;
sub warning {
@@ -45,20 +60,21 @@
ensuredir $dir;
-printf STDERR "Compiling keymaps for %s...\n", $model;
+printf STDERR "Compiling compact keymaps for %s...\n", $model;
for my $layout (values %KeyboardNames::layouts) {
next if ($layout eq 'nec/jp');
next if ($layout eq 'nec_vndr/jp');
- my $actual_layout = (($layout eq 'sr')
- ? 'yu,sr'
+ my $actual_layout = (($layout eq 'cs')
+ ? 'cs,cs'
: (($nonlatin =~ / $layout /)
- ? "en_US,$layout"
+ ? "us,$layout"
: $layout));
if (! -f "$dir/$model-$layout") {
- execute ("./ckbcomp -compact -I. -Ickb -rules xorg -model $model"
- ." -layout $actual_layout >$dir/$model-$layout")
- and warning "$0: ckbcomp failed\n" if (! -f "$dir/$model-$layout");
+ execute ("./ckbcomp -compact -I. -I${xkbdir} -rules xorg"
+ ." -model $model -layout $actual_layout"
+ ." >$dir/$model-$layout")
+ and die "$0: ckbcomp failed\n" if (! -f "$dir/$model-$layout");
}
if (-f "$dir/$model-$layout") {
read_temp_kmap $layout;
@@ -68,10 +84,11 @@
? ",$variant"
: $variant);
if (! -f "$dir/$model-$layout:$variant") {
- execute ("./ckbcomp -compact -I. -Ickb -rules xorg -model $model"
+ execute ("./ckbcomp -compact -I. -I${xkbdir} -rules xorg"
+ ." -model $model"
." -layout $actual_layout -variant $actual_variant"
." >$dir/$model-$layout:$variant")
- and warning "$0: ckbcomp failed\n" if (! -f "$dir/$model-$layout:$variant");
+ and die "$0: ckbcomp failed\n" if (! -f "$dir/$model-$layout:$variant");
}
if (-f "$dir/$model-$layout:$variant") {
read_temp_kmap "$layout:$variant";
@@ -160,3 +177,86 @@
}
}
}
+
+my %options = (
+ 'grp:switch' => [ 'ralt' ],
+ 'grp:lswitch' => [ 'lalt' ],
+ 'grp:win_switch' => [ 'rwin', 'lwin' ],
+ 'grp:lwin_switch' => [ 'rwin' ],
+ 'grp:rwin_switch' => [ 'lwin' ],
+ 'grp:toggle' => [ 'ralt' ],
+ 'grp:shifts_toggle' => [ 'lshift', 'rshift' ],
+ 'grp:ctrls_toggle' => [ 'lctrl', 'rctrl' ],
+ 'grp:alts_toggle' => [ 'ralt', 'lalt' ],
+ 'grp:ctrl_shift_toggle' => [ 'lshift', 'rshift', 'lctrl', 'rctrl' ],
+ 'grp:caps_toggle' => [ 'caps' ],
+ 'grp:shift_caps_toggle' => [ 'caps' ],
+ 'grp:ctrl_alt_toggle' => [ 'lalt', 'ralt', 'lctrl', 'rctrl' ],
+ 'grp:alt_shift_toggle' => [ 'lalt', 'ralt', 'lshift', 'rshift' ],
+ 'grp:menu_toggle' => [ 'menu' ],
+ 'grp:lwin_toggle' => [ 'lwin' ],
+ 'grp:rwin_toggle' => [ 'rwin' ],
+ 'grp:lshift_toggle' => [ 'lshift' ],
+ 'grp:rshift_toggle' => [ 'rshift' ],
+ 'grp:lctrl_toggle' => [ 'lctrl' ],
+ 'grp:rctrl_toggle' => [ 'rctrl' ],
+ 'grp:lalt_toggle' => [ 'lalt' ],
+ 'lv3:switch' => [ 'rctrl' ],
+ 'lv3:menu_switch' => [ 'menu' ],
+ 'lv3:win_switch' => [ 'lwin', 'rwin' ],
+ 'lv3:lwin_switch' => [ 'lwin' ],
+ 'lv3:rwin_switch' => [ 'rwin' ],
+ 'lv3:ralt_switch' => [ 'ralt' ],
+ 'lv3:alt_switch' => [ 'lalt', 'ralt' ],
+ 'ctrl:nocaps' => [ 'caps', 'lctrl' ],
+ 'ctrl:swapcaps' => [ 'caps', 'lctrl' ],
+ 'compose:ralt' => [ 'ralt' ],
+ 'compose:rwin' => [ 'rwin' ],
+ 'compose:menu' => [ 'menu' ],
+ 'compose:caps' => [ 'caps' ],
+ 'compose:rctrl' => [ 'rctrl' ],
+ 'eurosign:e' => [ 'empty' ],
+ 'eurosign:5' => [ 'empty' ],
+ 'eurosign:2' => [ 'empty' ],
+ );
+
+my %keycodes = (
+ 'amiga' => 'amiga(de)',
+ 'ataritt' => 'ataritt(de)',
+ 'macintosh' => 'xfree86',
+ 'macintosh_old' => 'macintosh',
+ 'pc105' => 'xfree86',
+ 'sun4' => 'sun(type4_euro)',
+ 'sun5' => 'sun(type5_euro)',
+ 'abnt2' => 'xfree86(abnt2)',
+);
+
+my $keycodes = (defined $keycodes {$model}
+ ? $keycodes {$model}
+ : 'xfree86');
+for my $option (keys %options) {
+ my $layout = '';
+ for my $mod (@{$options{$option}}) {
+ $layout = $layout . "+stdmodifiers($mod)";
+ }
+ $layout =~ s/^\+//;
+ if ($option =~ /grp:(.*)/) {
+ $layout = $layout . "+group($1)";
+ } elsif ($option =~ /ctrl:(.*)/) {
+ $layout = $layout . "+ctrl($1)";
+ } elsif ($option =~ /lv3:(.*)/) {
+ $layout = $layout . "+level3($1)";
+ } elsif ($option =~ /compose:(.*)/) {
+ $layout = $layout . "+compose($1)";
+ } elsif ($option =~ /eurosign:(.*)/) {
+ $layout = $layout . "+eurosign($1)";
+ }
+ execute ("./ckbcomp -compact -I. -I${xkbdir}"
+ ." -keycodes '$keycodes' -symbols '$layout' >temp.kmap");
+ if (! -f 'temp.kmap') {
+ die "$0: ckbcomp failed\n" if (! -f 'temp.kmap');
+ } else {
+ execute ("grep '^keycode' temp.kmap | sed 's/^/". $option ."::/'");
+ unlink('temp.kmap');
+ }
+}
Modified: people/zinoviev/console-setup/Makefile
===================================================================
--- people/zinoviev/console-setup/Makefile 2006-07-20 21:25:38 UTC (rev 194)
+++ people/zinoviev/console-setup/Makefile 2006-07-22 11:25:06 UTC (rev 195)
@@ -1,5 +1,7 @@
etcdir = /etc
prefix = /usr/local
+xkbdir = $(shell pwd)/Keyboard/ckb
+export xkbdir
bootprefix = $(patsubst %/usr,%/,$(prefix:%/=%))
@@ -8,8 +10,8 @@
all: build
build:
- cd Fonts; $(MAKE) build
- cd Keyboard; $(MAKE) build
+ cd Fonts && $(MAKE) build
+ cd Keyboard && $(MAKE) build
touch build
.PHONY: install
@@ -44,12 +46,12 @@
.PHONY: clean
clean:
- cd Fonts; $(MAKE) clean
- cd Keyboard; $(MAKE) clean
+ cd Fonts && $(MAKE) clean
+ cd Keyboard && $(MAKE) clean
-rm -f *~
-rm -f build
.PHONY: maintainer-clean
maintainer-clean: clean
- cd Fonts; $(MAKE) maintainer-clean
- cd Keyboard; $(MAKE) maintainer-clean
+ cd Fonts && $(MAKE) maintainer-clean
+ cd Keyboard && $(MAKE) maintainer-clean
Modified: people/zinoviev/console-setup/copyright
===================================================================
--- people/zinoviev/console-setup/copyright 2006-07-20 21:25:38 UTC (rev 194)
+++ people/zinoviev/console-setup/copyright 2006-07-22 11:25:06 UTC (rev 195)
@@ -5,15 +5,38 @@
in the directory Fonts/bdf are distributed under many different
licenses, see in the file copyright.fonts for details.
-The keyboard files are borrowed from the CVS of the XKeyboardConfig
-project and the Keyboard/locale directory is borrowed from the X
-Window System distribution of X.org Foundation. As a result the files
-in the directories Keyboard/ckb and Keyboard/locale have many
-different license terms, look at the file copyright.X for details.
+The keyboard files are borrowed from the XKeyboardConfig package
+Upstream authors: Denis Barbier <barbier at linuxfr.org>, Frank Murphy
+<murphyf+xfree86 at f-m.fm>, Ivan Pascal <pascal at info.tsu.ru>, Andriy
+Rysin <arysin at myrealbox.com>, Sergey V. Udaltsov
+<svu at users.sourceforge.net>, Данило Шеган <dsegan at gmx.net>.
+The XKeyboardConfig package is distributed under the following license:
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of the copyright holder(s) not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. The copyright holder(s) makes no
+representations about the suitability of this software for any purpose. It
+is provided "as is" without express or implied warranty.
+
+THE COPYRIGHT HOLDER(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+The XKeyboardConfig package was downloaded from
+http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-0.8.tar.gz
+
Everything else in this package is
-Copyright (c) 2005, 2006 Anton Zinoviev, zinoviev at debian.org
+Copyright (c) 1999,2000,2001,2002,2003,2006 Anton Zinoviev, zinoviev at debian.org
It is distributed under terms of the GNU General Public License
version 2.0 or (at your choice) any later version.
Deleted: people/zinoviev/console-setup/copyright.X
===================================================================
--- people/zinoviev/console-setup/copyright.X 2006-07-20 21:25:38 UTC (rev 194)
+++ people/zinoviev/console-setup/copyright.X 2006-07-22 11:25:06 UTC (rev 195)
@@ -1,1076 +0,0 @@
- The X.Org Foundation
-
- March 2004
-
-1. Introduction
-
-The X.org Foundation X Window System distribution is a compilation of code
-and documentation from many sources. This document is intended primarily as
-a guide to the licenses used in the distribution: you must check each file
-and/or package for precise redistribution terms. None-the-less, this summary
-may be useful to many users. No software incorporating the XFree86 1.1
-license has been incorporated.
-
-This document is based on the compilation from XFree86.
-
-2. XFree86 License
-
-XFree86 code without an explicit copyright is covered by the following copy-
-right/license:
-
-Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is fur-
-nished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
-NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the XFree86 Project shall not
-be used in advertising or otherwise to promote the sale, use or other deal-
-ings in this Software without prior written authorization from the XFree86
-Project.
-
-3. Other Licenses
-
-Portions of code are covered by the following licenses/copyrights. See indi-
-vidual files for the copyright dates.
-
-3.1 X/MIT Copyrights
-
-3.1.1 X Consortium
-
-Copyright (C) <date> X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is fur-
-nished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE X
-CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-X Window System is a trademark of X Consortium, Inc.
-
-3.1.2 The Open Group
-
-Copyright <date> The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-3.2 Berkeley-based copyrights:
-
-o
-
-3.2.1 General
-
-Redistribution and use in source and binary forms, with or without modifica-
-tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- 3. The name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
-CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
-CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
-ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
-3.2.2 UCB/LBL
-
-Copyright (c) 1993 The Regents of the University of California. All rights
-reserved.
-
-This software was developed by the Computer Systems Engineering group at
-Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and contributed to
-Berkeley.
-
-All advertising materials mentioning features or use of this software must
-display the following acknowledgement: This product includes software devel-
-oped by the University of California, Lawrence Berkeley Laboratory.
-
-Redistribution and use in source and binary forms, with or without modifica-
-tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- 3. All advertising materials mentioning features or use of this software
- must display the following acknowledgement: This product includes soft-
- ware developed by the University of California, Berkeley and its con-
- tributors.
-
- 4. Neither the name of the University nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DIS-
-CLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-3.2.3 The NetBSD Foundation, Inc.
-
-Copyright (c) 2003 The NetBSD Foundation, Inc. All rights reserved.
-
-This code is derived from software contributed to The NetBSD Foundation by
-Ben Collver <collver1 at attbi.com>
-
-Redistribution and use in source and binary forms, with or without modifica-
-tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- 3. All advertising materials mentioning features or use of this software
- must display the following acknowledgement: This product includes soft-
- ware developed by the NetBSD Foundation, Inc. and its contributors.
-
- 4. Neither the name of The NetBSD Foundation nor the names of its con-
- tributors may be used to endorse or promote products derived from this
- software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSE-
-QUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAM-
-AGE.
-
-3.2.4 Theodore Ts'o.
-
-Copyright Theodore Ts'o, 1994, 1995, 1996, 1997, 1998, 1999. All rights
-reserved.
-
-Redistribution and use in source and binary forms, with or without modifica-
-tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- and the entire permission notice in its entirety, including the dis-
- claimer of warranties.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- 3. he name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE, ALL OF WHICH ARE HEREBY DISCLAIMED. IN NO
-EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
-CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
-ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF NOT
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-3.2.5 Theo de Raadt and Damien Miller
-
-Copyright (c) 1995,1999 Theo de Raadt. All rights reserved. Copyright (c)
-2001-2002 Damien Miller. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modifica-
-tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
-CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
-CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
-ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
-3.2.6 Todd C. Miller
-
-Copyright (c) 1998 Todd C. Miller <Todd.Miller at courtesan.com>
-
-Permission to use, copy, modify, and distribute this software for any purpose
-with or without fee is hereby granted, provided that the above copyright
-notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MER-
-CHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE FOR ANY
-SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CON-
-TRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-3.2.7 Thomas Winischhofer
-
-Copyright (C) 2001-2004 Thomas Winischhofer
-
-Redistribution and use in source and binary forms, with or without modifica-
-tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- 3. The name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESSED OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
-CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
-ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
-3.3 NVIDIA Corp
-
-Copyright (c) 1996 NVIDIA, Corp. All rights reserved.
-
-NOTICE TO USER: The source code is copyrighted under U.S. and international
-laws. NVIDIA, Corp. of Sunnyvale, California owns the copyright and as
-design patents pending on the design and interface of the NV chips. Users
-and possessors of this source code are hereby granted a nonexclusive, roy-
-alty-free copyright and design patent license to use this code in individual
-and commercial software.
-
-Any use of this source code must include, in the user documentation and
-internal comments to the code, notices to the end user as follows:
-
-Copyright (c) 1996 NVIDIA, Corp. NVIDIA design patents pending in the U.S.
-and foreign countries.
-
-NVIDIA, CORP. MAKES NO REPRESENTATION ABOUT THE SUITABILITY OF THIS SOURCE
-CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WAR-
-RANTY OF ANY KIND. NVIDIA, CORP. DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOURCE CODE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL NVIDIA, CORP. BE LIABLE
-FOR ANY SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, OR ANY DAM-
-AGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOURCE CODE.
-
-3.4 GLX Public License
-
-GLX PUBLIC LICENSE (Version 1.0 (2/11/99)) ("License")
-
-Subject to any third party claims, Silicon Graphics, Inc. ("SGI") hereby
-grants permission to Recipient (defined below), under Recipient's copyrights
-in the Original Software (defined below), to use, copy, modify, merge, pub-
-lish, distribute, sublicense and/or sell copies of Subject Software (defined
-below), and to permit persons to whom the Subject Software is furnished in
-accordance with this License to do the same, subject to all of the following
-terms and conditions, which Recipient accepts by engaging in any such use,
-copying, modifying, merging, publishing, distributing, sublicensing or sell-
-ing:
-
-1. Definitions.
-
- (a) "Original Software" means source code of computer software code
- which is described in Exhibit A as Original Software.
-
- (b) "Modifications" means any addition to or deletion from the sub-
- stance or structure of either the Original Software or any previous
- Modifications. When Subject Software is released as a series of
- files, a Modification means (i) any addition to or deletion from
- the contents of a file containing Original Software or previous
- Modifications and (ii) any new file that contains any part of the
- Original Code or previous Modifications.
-
- (c) "Subject Software" means the Original Software or Modifications
- or the combination of the Original Software and Modifications, or
- portions of any of the foregoing.
-
- (d) "Recipient" means an individual or a legal entity exercising
- rights under, and complying with all of the terms of, this License.
- For legal entities, "Recipient" includes any entity which controls,
- is controlled by, or is under common control with Recipient. For
- purposes of this definition, "control" of an entity means (a) the
- power, direct or indirect, to direct or manage such entity, or (b)
- ownership of fifty percent (50%) or more of the outstanding shares
- or beneficial ownership of such entity.
-
-2. Redistribution of Source Code Subject to These Terms. Redistributions of
-Subject Software in source code form must retain the notice set forth in
-Exhibit A, below, in every file. A copy of this License must be included in
-any documentation for such Subject Software where the recipients' rights
-relating to Subject Software are described. Recipient may distribute the
-source code version of Subject Software under a license of Recipient's
-choice, which may contain terms different from this License, provided that
-(i) Recipient is in compliance with the terms of this License, and (ii) the
-license terms include this Section 2 and Sections 3, 4, 7, 8, 10, 12 and 13
-of this License, which terms may not be modified or superseded by any other
-terms of such license. If Recipient distributes the source code version under
-a different license Recipient must make it absolutely clear that any terms
-which differ from this License are offered by Recipient alone, not by SGI.
-Recipient hereby agrees to indemnify SGI for any liability incurred by SGI as
-a result of any such terms Recipient offers.
-
-3. Redistribution in Executable Form. The notice set forth in Exhibit A must
-be conspicuously included in any notice in an executable version of Subject
-Software, related documentation or collateral in which Recipient describes
-the user's rights relating to the Subject Software. Recipient may distribute
-the executable version of Subject Software under a license of Recipient's
-choice, which may contain terms different from this License, provided that
-(i) Recipient is in compliance with the terms of this License, and (ii) the
-license terms include this Section 3 and Sections 4, 7, 8, 10, 12 and 13 of
-this License, which terms may not be modified or superseded by any other
-terms of such license. If Recipient distributes the executable version under
-a different license Recipient must make it absolutely clear that any terms
-which differ from this License are offered by Recipient alone, not by SGI.
-Recipient hereby agrees to indemnify SGI for any liability incurred by SGI as
-a result of any such terms Recipient offers.
-
-4. Termination. This License and the rights granted hereunder will terminate
-automatically if Recipient fails to comply with terms herein and fails to
-cure such breach within 30 days of the breach. Any sublicense to the Subject
-Software which is properly granted shall survive any termination of this
-License absent termination by the terms of such sublicense. Provisions which,
-by their nature, must remain in effect beyond the termination of this License
-shall survive.
-
-5. No Trademark Rights. This License does not grant any rights to use any
-trade name, trademark or service mark whatsoever. No trade name, trademark or
-service mark of SGI may be used to endorse or promote products derived from
-the Subject Software without prior written permission of SGI.
-
-6. No Other Rights. This License does not grant any rights with respect to
-the OpenGL API or to any software or hardware implementation thereof or to
-any other software whatsoever, nor shall any other rights or licenses not
-expressly granted hereunder arise by implication, estoppel or otherwise with
-respect to the Subject Software. Title to and ownership of the Original Soft-
-ware at all times remains with SGI. All rights in the Original Software not
-expressly granted under this License are reserved.
-
-7. Compliance with Laws; Non-Infringement. Recipient shall comply with all
-applicable laws and regulations in connection with use and distribution of
-the Subject Software, including but not limited to, all export and import
-control laws and regulations of the U.S. government and other countries.
-Recipient may not distribute Subject Software that (i) in any way infringes
-(directly or contributorily) the rights (including patent, copyright, trade
-secret, trademark or other intellectual property rights of any kind) of any
-other person or entity or (ii) breaches any representation or warranty,
-express, implied or statutory, which under any applicable law it might be
-deemed to have been distributed.
-
-8. Claims of Infringement. If Recipient at any time has knowledge of any one
-or more third party claims that reproduction, modification, use, distribu-
-tion, import or sale of Subject Software (including particular functionality
-or code incorporated in Subject Software) infringes the third party's intel-
-lectual property rights, Recipient must place in a well-identified web page
-bearing the title "LEGAL" a description of each such claim and a description
-of the party making each such claim in sufficient detail that a user of the
-Subject Software will know whom to contact regarding the claim. Also, upon
-gaining such knowledge of any such claim, Recipient must conspicuously
-include the URL for such web page in the Exhibit A notice required under Sec-
-tions 2 and 3, above, and in the text of any related documentation, license
-agreement or collateral in which Recipient describes end user's rights relat-
-ing to the Subject Software. If Recipient obtains such knowledge after it
-makes Subject Software available to any other person or entity, Recipient
-shall take other steps (such as notifying appropriate mailing lists or news-
-groups) reasonably calculated to inform those who received the Subject Soft-
-ware that new knowledge has been obtained.
-
-9. DISCLAIMER OF WARRANTY. SUBJECT SOFTWARE IS PROVIDED ON AN "AS IS" BASIS,
-WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
-LIMITATION, WARRANTIES THAT THE SUBJECT SOFTWARE IS FREE OF DEFECTS, MER-
-CHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON- INFRINGING. SGI ASSUMES NO
-RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. SHOULD ANY SOFTWARE
-PROVE DEFECTIVE IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR ANY SER-
-VICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
-ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY SUBJECT SOFTWARE IS AUTHORIZED
-HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-10. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THE-
-ORY, WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT LIA-
-BILITY), CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR BE LIABLE FOR
-ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK
-STOPPAGE, LOSS OF DATA, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF
-THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY
-TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SGI's NEGLIGENCE TO
-THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
-NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES,
-SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO RECIPIENT.
-
-11. Indemnity. Recipient shall be solely responsible for damages arising,
-directly or indirectly, out of its utilization of rights under this License.
-Recipient will defend, indemnify and hold harmless Silicon Graphics, Inc.
-from and against any loss, liability, damages, costs or expenses (including
-the payment of reasonable attorneys fees) arising out of Recipient's use,
-modification, reproduction and distribution of the Subject Software or out of
-any representation or warranty made by Recipient.
-
-12. U.S. Government End Users. The Subject Software is a "commercial item"
-consisting of "commercial computer software" as such terms are defined in
-title 48 of the Code of Federal Regulations and all U.S. Government End
-Users acquire only the rights set forth in this License and are subject to
-the terms of this License.
-
-13. Miscellaneous. This License represents the complete agreement concerning
-subject matter hereof. If any provision of this License is held to be unen-
-forceable, such provision shall be reformed so as to achieve as nearly as
-possible the same economic effect as the original provision and the remainder
-of this License will remain in effect. This License shall be governed by and
-construed in accordance with the laws of the United States and the State of
-California as applied to agreements entered into and to be performed entirely
-within California between California residents. Any litigation relating to
-this License shall be subject to the exclusive jurisdiction of the Federal
-Courts of the Northern District of California (or, absent subject matter
-jurisdiction in such courts, the courts of the State of California), with
-venue lying exclusively in Santa Clara County, California, with the losing
-party responsible for costs, including without limitation, court costs and
-reasonable attorneys fees and expenses. The application of the United Nations
-Convention on Contracts for the International Sale of Goods is expressly
-excluded. Any law or regulation which provides that the language of a con-
-tract shall be construed against the drafter shall not apply to this License.
-
-Exhibit A
-
-The contents of this file are subject to Sections 2, 3, 4, 7, 8, 10, 12 and
-13 of the GLX Public License Version 1.0 (the "License"). You may not use
-this file except in compliance with those sections of the License. You may
-obtain a copy of the License at Silicon Graphics, Inc., attn: Legal Services,
-2011 N. Shoreline Blvd., Mountain View, CA 94043 or at
-http://www.sgi.com/software/opensource/glx/license.html.
-
-Software distributed under the License is distributed on an "AS IS" basis.
-ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED
-WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR PURPOSE OR OF NON-
-INFRINGEMENT. See the License for the specific language governing rights and
-limitations under the License.
-
-The Original Software is GLX version 1.2 source code, released February,
-1999. The developer of the Original Software is Silicon Graphics, Inc. Those
-portions of the Subject Software created by Silicon Graphics, Inc. are Copy-
-right (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-
-3.5 CID Font Code Public License
-
-CID FONT CODE PUBLIC LICENSE (Version 1.0 (3/31/99))("License")
-
-Subject to any applicable third party claims, Silicon Graphics, Inc. ("SGI")
-hereby grants permission to Recipient (defined below), under SGI's copyrights
-in the Original Software (defined below), to use, copy, modify, merge, pub-
-lish, distribute, sublicense and/or sell copies of Subject Software (defined
-below) in both source code and executable form, and to permit persons to whom
-the Subject Software is furnished in accordance with this License to do the
-same, subject to all of the following terms and conditions, which Recipient
-accepts by engaging in any such use, copying, modifying, merging, publica-
-tion, distributing, sublicensing or selling:
-
-1. Definitions.
-
- a. "Original Software" means source code of computer software code
- that is described in Exhibit A as Original Software.
-
- b. "Modifications" means any addition to or deletion from the sub-
- stance or structure of either the Original Software or any previous
- Modifications. When Subject Software is released as a series of
- files, a Modification means (i) any addition to or deletion from
- the contents of a file containing Original Software or previous
- Modifications and (ii) any new file that contains any part of the
- Original Code or previous Modifications.
-
- c. "Subject Software" means the Original Software or Modifications
- or the combination of the Original Software and Modifications, or
- portions of any of the foregoing.
-
- d. "Recipient" means an individual or a legal entity exercising
- rights under the terms of this License. For legal entities, "Recip-
- ient" includes any entity that controls, is controlled by, or is
- under common control with Recipient. For purposes of this defini-
- tion, "control" of an entity means (i) the power, direct or indi-
- rect, to direct or manage such entity, or (ii) ownership of fifty
- percent (50%) or more of the outstanding shares or beneficial own-
- ership of such entity.
-
- e. "Required Notice" means the notice set forth in Exhibit A to
- this License.
-
- f. "Accompanying Technology" means any software or other technology
- that is not a Modification and that is distributed or made publicly
- available by Recipient with the Subject Software. Separate soft-
- ware files that do not contain any Original Software or any previ-
- ous Modification shall not be deemed a Modification, even if such
- software files are aggregated as part of a product, or in any
- medium of storage, with any file that does contain Original Soft-
- ware or any previous Modification.
-
-2. License Terms. All distribution of the Subject Software must be made sub-
-ject to the terms of this License. A copy of this License and the Required
-Notice must be included in any documentation for Subject Software where
-Recipient's rights relating to Subject Software and/or any Accompanying Tech-
-nology are described. Distributions of Subject Software in source code form
-must also include the Required Notice in every file distributed. In addition,
-a ReadMe file entitled "Important Legal Notice" must be distributed with each
-distribution of one or more files that incorporate Subject Software. That
-file must be included with distributions made in both source code and exe-
-cutable form. A copy of the License and the Required Notice must be included
-in that file. Recipient may distribute Accompanying Technology under a
-license of Recipient's choice, which may contain terms different from this
-License, provided that (i) Recipient is in compliance with the terms of this
-License, (ii) such other license terms do not modify or supersede the terms
-of this License as applicable to the Subject Software, (iii) Recipient hereby
-indemnifies SGI for any liability incurred by SGI as a result of the distri-
-bution of Accompanying Technology or the use of other license terms.
-
-3. Termination. This License and the rights granted hereunder will terminate
-automatically if Recipient fails to comply with terms herein and fails to
-cure such breach within 30 days of the breach. Any sublicense to the Subject
-Software that is properly granted shall survive any termination of this
-License absent termination by the terms of such sublicense. Provisions which,
-by their nature, must remain in effect beyond the termination of this License
-shall survive.
-
-4. Trademark Rights. This License does not grant any rights to use any trade
-name, trademark or service mark whatsoever. No trade name, trademark or ser-
-vice mark of SGI may be used to endorse or promote products derived from or
-incorporating any Subject Software without prior written permission of SGI.
-
-5. No Other Rights. No rights or licenses not expressly granted hereunder
-shall arise by implication, estoppel or otherwise. Title to and ownership of
-the Original Software at all times remains with SGI. All rights in the Origi-
-nal Software not expressly granted under this License are reserved.
-
-6. Compliance with Laws; Non-Infringement. Recipient shall comply with all
-applicable laws and regulations in connection with use and distribution of
-the Subject Software, including but not limited to, all export and import
-control laws and regulations of the U.S. government and other countries.
-Recipient may not distribute Subject Software that (i) in any way infringes
-(directly or contributorily) the rights (including patent, copyright, trade
-secret, trademark or other intellectual property rights of any kind) of any
-other person or entity, or (ii) breaches any representation or warranty,
-express, implied or statutory, which under any applicable law it might be
-deemed to have been distributed.
-
-7. Claims of Infringement. If Recipient at any time has knowledge of any one
-or more third party claims that reproduction, modification, use, distribu-
-tion, import or sale of Subject Software (including particular functionality
-or code incorporated in Subject Software) infringes the third party's intel-
-lectual property rights, Recipient must place in a well-identified web page
-bearing the title "LEGAL" a description of each such claim and a description
-of the party making each such claim in sufficient detail that a user of the
-Subject Software will know whom to contact regarding the claim. Also, upon
-gaining such knowledge of any such claim, Recipient must conspicuously
-include the URL for such web page in the Required Notice, and in the text of
-any related documentation, license agreement or collateral in which Recipient
-describes end user's rights relating to the Subject Software. If Recipient
-obtains such knowledge after it makes Subject Software available to any other
-person or entity, Recipient shall take other steps (such as notifying appro-
-priate mailing lists or newsgroups) reasonably calculated to provide such
-knowledge to those who received the Subject Software.
-
-8. DISCLAIMER OF WARRANTY. SUBJECT SOFTWARE IS PROVIDED ON AN "AS IS" BASIS,
-WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
-LIMITATION, WARRANTIES THAT THE SUBJECT SOFTWARE IS FREE OF DEFECTS, MER-
-CHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. SGI ASSUMES NO
-RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. SHOULD ANY SOFTWARE
-PROVE DEFECTIVE IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR ANY SER-
-VICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
-ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY SUBJECT SOFTWARE IS AUTHORIZED
-HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-9. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY,
-WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT LIABILITY),
-CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SUBJECT SOFTWARE OR
-THE USE OR OTHER DEALINGS IN THE SUBJECT SOFTWARE. SOME JURISDICTIONS DO NOT
-ALLOW THE EXCLUSION OR LIMITATION OF CERTAIN DAMAGES, SO THIS EXCLUSION AND
-LIMITATION MAY NOT APPLY TO RECIPIENT TO THE EXTENT SO DISALLOWED.
-
-10. Indemnity. Recipient shall be solely responsible for damages arising,
-directly or indirectly, out of its utilization of rights under this License.
-Recipient will defend, indemnify and hold SGI and its successors and assigns
-harmless from and against any loss, liability, damages, costs or expenses
-(including the payment of reasonable attorneys fees) arising out of (Recipi-
-ent's use, modification, reproduction and distribution of the Subject Soft-
-ware or out of any representation or warranty made by Recipient.
-
-11. U.S. Government End Users. The Subject Software is a "commercial item"
-consisting of "commercial computer software" as such terms are defined in
-title 48 of the Code of Federal Regulations and all U.S. Government End Users
-acquire only the rights set forth in this License and are subject to the
-terms of this License.
-
-12. Miscellaneous. This License represents the complete agreement concerning
-subject matter hereof. If any provision of this License is held to be unen-
-forceable by any judicial or administrative authority having proper jurisdic-
-tion with respect thereto, such provision shall be reformed so as to achieve
-as nearly as possible the same economic effect as the original provision and
-the remainder of this License will remain in effect. This License shall be
-governed by and construed in accordance with the laws of the United States
-and the State of California as applied to agreements entered into and to be
-performed entirely within California between California residents. Any liti-
-gation relating to this License shall be subject to the exclusive jurisdic-
-tion of the Federal Courts of the Northern District of California (or, absent
-subject matter jurisdiction in such courts, the courts of the State of Cali-
-fornia), with venue lying exclusively in Santa Clara County, California, with
-the losing party responsible for costs, including without limitation, court
-costs and reasonable attorneys fees and expenses. The application of the
-United Nations Convention on Contracts for the International Sale of Goods is
-expressly excluded. Any law or regulation that provides that the language of
-a contract shall be construed against the drafter shall not apply to this
-License.
-
-Exhibit A
-
-Copyright (c) 1994-1999 Silicon Graphics, Inc.
-
-The contents of this file are subject to the CID Font Code Public License
-Version 1.0 (the "License"). You may not use this file except in compliance
-with the License. You may obtain a copy of the License at Silicon Graphics,
-Inc., attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-or at http://www.sgi.com/software/opensource/cid/license.html
-
-Software distributed under the License is distributed on an "AS IS" basis.
-ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED
-WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR PURPOSE OR OF NON-
-INFRINGEMENT. See the License for the specific language governing rights and
-limitations under the License.
-
-The Original Software (as defined in the License) is CID font code that was
-developed by Silicon Graphics, Inc. Those portions of the Subject Software
-(as defined in the License) that were created by Silicon Graphics, Inc. are
-Copyright (c) 1994-1999 Silicon Graphics, Inc. All Rights Reserved.
-
-[NOTE: When using this text in connection with Subject Software delivered
-solely in object code form, Recipient may replace the words "this file" with
-"this software" in both the first and second sentences.]
-
-3.6 Bitstream Vera Fonts Copyright
-
-The fonts have a generous copyright, allowing derivative works (as long as
-"Bitstream" or "Vera" are not in the names), and full redistribution (so long
-as they are not *sold* by themselves). They can be be bundled, redistributed
-and sold with any software.
-
-The fonts are distributed under the following copyright:
-
-Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
-a trademark of Bitstream, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of the fonts accompanying this license ("Fonts") and associated documentation
-files (the "Font Software"), to reproduce and distribute the Font Software,
-including without limitation the rights to use, copy, merge, publish, dis-
-tribute, and/or sell copies of the Font Software, and to permit persons to
-whom the Font Software is furnished to do so, subject to the following condi-
-tions:
-
-The above copyright and trademark notices and this permission notice shall be
-included in all copies of one or more of the Font Software typefaces.
-
-The Font Software may be modified, altered, or added to, and in particular
-the designs of glyphs or characters in the Fonts may be modified and addi-
-tional glyphs or characters may be added to the Fonts, only if the fonts are
-renamed to names not containing either the words "Bitstream" or the word
-"Vera".
-
-This License becomes null and void to the extent applicable to Fonts or Font
-Software that has been modified and is distributed under the "Bitstream Vera"
-names.
-
-The Font Software may be sold as part of a larger software package but no
-copy of one or more of the Font Software typefaces may be sold by itself.
-
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
-TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDA-
-TION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GEN-
-ERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR
-INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFT-
-WARE.
-
-Except as contained in this notice, the names of Gnome, the Gnome Foundation,
-and Bitstream Inc., shall not be used in advertising or otherwise to promote
-the sale, use or other dealings in this Font Software without prior written
-authorization from the Gnome Foundation or Bitstream Inc., respectively. For
-further information, contact: fonts at gnome dot org.
-
-3.7 Bigelow & Holmes Inc and URW++ GmbH Luxi font license
-
-[[
- Inapplicable "Bigelow & Holmes Inc and URW++ GmbH Luxi font license"
- removed by Debian.
-]]
-
-$XdotOrg: xc/programs/Xserver/hw/xfree86/doc/LICENSE,v 1.3 2004/09/03 23:41:21 kem Exp $
-
-********************************************************************************
-
-X.Org's LICENSE document does not appear to be completely comprehensive.
-
---------------------------------------------------------------------------------
-
-Many files appear to be licensed under the "SGI FREE SOFTWARE
-LICENSE B (Version 1.1 [02/22/2000])":
-
-SGI FREE SOFTWARE LICENSE B (Version 1.1 [02/22/2000])
-
-1. Definitions.
-
- 1.1. "Additional Notice Provisions" means such additional provisions as
- appear in the Notice in Original Code under the heading "Additional
- Notice Provisions."
-
- 1.2. "Covered Code" means the Original Code or Modifications, or any
- combination thereof.
-
- 1.3. "Hardware" means any physical device that accepts input, processes
- input, stores the results of processing, and/or provides output.
-
- 1.4. "Larger Work" means a work that combines Covered Code or portions
- thereof with code not governed by the terms of this License.
-
- 1.5. "Licensable" means having the right to grant, to the maximum
- extent possible, whether at the time of the initial grant or
- subsequently acquired, any and all of the rights conveyed herein.
-
- 1.6. "License" means this document.
-
- 1.7. "Licensed Patents" means patent claims Licensable by SGI that are
- infringed by the use or sale of Original Code or any Modifications
- provided by SGI, or any combination thereof.
-
- 1.8. "Modifications" means any addition to or deletion from the
- substance or structure of the Original Code or any previous
- Modifications. When Covered Code is released as a series of files, a
- Modification is:
-
- A. Any addition to the contents of a file containing Original Code
- and/or addition to or deletion from the contents of a file
- containing previous Modifications.
-
- B. Any new file that contains any part of the Original Code or
- previous Modifications.
-
- 1.9. "Notice" means any notice in Original Code or Covered Code, as
- required by and in compliance with this License.
-
- 1.10. "Original Code" means source code of computer software code that
- is described in the source code Notice required by Exhibit A as
- Original Code, and updates and error corrections specifically thereto.
-
- 1.11. "Recipient" means an individual or a legal entity exercising
- rights under, and complying with all of the terms of, this License or a
- future version of this License issued under Section 8. For legal
- entities, "Recipient" includes any entity that controls, is controlled
- by, or is under common control with Recipient. For purposes of this
- definition, "control" of an entity means (a) the power, direct or
- indirect, to direct or manage such entity, or (b) ownership of fifty
- percent (50%) or more of the outstanding shares or beneficial ownership
- of such entity.
-
- 1.12. "Recipient Patents" means patent claims Licensable by a Recipient
- that are infringed by the use or sale of Original Code or any
- Modifications provided by SGI, or any combination thereof.
-
- 1.13. "SGI" means Silicon Graphics, Inc.
-
- 1.14. "SGI Patents" means patent claims Licensable by SGI other than
- the Licensed Patents.
-
-2. License Grant and Restrictions.
-
- 2.1. SGI License Grant. Subject to the terms of this License and any
- third party intellectual property claims, for the duration of
- intellectual property protections inherent in the Original Code, SGI
- hereby grants Recipient a worldwide, royalty-free, non-exclusive
- license, to do the following: (i) under copyrights Licensable by SGI,
- to reproduce, distribute, create derivative works from, and, to the
- extent applicable, display and perform the Original Code and/or any
- Modifications provided by SGI alone and/or as part of a Larger Work;
- and (ii) under any Licensable Patents, to make, have made, use, sell,
- offer for sale, import and/or otherwise transfer the Original Code
- and/or any Modifications provided by SGI. Recipient accepts the terms
- and conditions of this License by undertaking any of the aforementioned
- actions. The patent license shall apply to the Covered Code if, at the
- time any related Modification is added, such addition of the
- Modification causes such combination to be covered by the Licensed
- Patents. The patent license in Section 2.1(ii) shall not apply to any
- other combinations that include the Modification. No patent license is
- provided under SGI Patents for infringements of SGI Patents by
- Modifications not provided by SGI or combinations of Original Code and
- Modifications not provided by SGI.
-
- 2.2. Recipient License Grant. Subject to the terms of this License and
- any third party intellectual property claims, Recipient hereby grants
- SGI and any other Recipients a worldwide, royalty-free, non-exclusive
- license, under any Recipient Patents, to make, have made, use, sell,
- offer for sale, import and/or otherwise transfer the Original Code
- and/or any Modifications provided by SGI.
-
- 2.3. No License For Hardware Implementations. The licenses granted in
- Section 2.1 and 2.2 are not applicable to implementation in Hardware of
- the algorithms embodied in the Original Code or any Modifications
- provided by SGI .
-
-3. Redistributions.
-
- 3.1. Retention of Notice/Copy of License. The Notice set forth in
- Exhibit A, below, must be conspicuously retained or included in any and
- all redistributions of Covered Code. For distributions of the Covered
- Code in source code form, the Notice must appear in every file that can
- include a text comments field; in executable form, the Notice and a
- copy of this License must appear in related documentation or collateral
- where the Recipient's rights relating to Covered Code are described.
- Any Additional Notice Provisions which actually appears in the Original
- Code must also be retained or included in any and all redistributions
- of Covered Code.
-
- 3.2. Alternative License. Provided that Recipient is in compliance with
- the terms of this License, Recipient may, so long as without derogation
- of any of SGI's rights in and to the Original Code, distribute the
- source code and/or executable version(s) of Covered Code under (1) this
- License; (2) a license identical to this License but for only such
- changes as are necessary in order to clarify Recipient's role as
- licensor of Modifications; and/or (3) a license of Recipient's
- choosing, containing terms different from this License, provided that
- the license terms include this Section 3 and Sections 4, 6, 7, 10, 12,
- and 13, which terms may not be modified or superseded by any other
- terms of such license. If Recipient elects to use any license other
- than this License, Recipient must make it absolutely clear that any of
- its terms which differ from this License are offered by Recipient
- alone, and not by SGI. It is emphasized that this License is a limited
- license, and, regardless of the license form employed by Recipient in
- accordance with this Section 3.2, Recipient may relicense only such
- rights, in Original Code and Modifications by SGI, as it has actually
- been granted by SGI in this License.
-
- 3.3. Indemnity. Recipient hereby agrees to indemnify SGI for any
- liability incurred by SGI as a result of any such alternative license
- terms Recipient offers.
-
-4. Termination. This License and the rights granted hereunder will
-terminate automatically if Recipient breaches any term herein and fails to
-cure such breach within 30 days thereof. Any sublicense to the Covered Code
-that is properly granted shall survive any termination of this License,
-absent termination by the terms of such sublicense. Provisions that, by
-their nature, must remain in effect beyond the termination of this License,
-shall survive.
-
-5. No Trademark Or Other Rights. This License does not grant any rights to:
-(i) any software apart from the Covered Code, nor shall any other rights or
-licenses not expressly granted hereunder arise by implication, estoppel or
-otherwise with respect to the Covered Code; (ii) any trade name, trademark
-or service mark whatsoever, including without limitation any related right
-for purposes of endorsement or promotion of products derived from the
-Covered Code, without prior written permission of SGI; or (iii) any title
-to or ownership of the Original Code, which shall at all times remains with
-SGI. All rights in the Original Code not expressly granted under this
-License are reserved.
-
-6. Compliance with Laws; Non-Infringement. There are various worldwide
-laws, regulations, and executive orders applicable to dispositions of
-Covered Code, including without limitation export, re-export, and import
-control laws, regulations, and executive orders, of the U.S. government and
-other countries, and Recipient is reminded it is obliged to obey such laws,
-regulations, and executive orders. Recipient may not distribute Covered
-Code that (i) in any way infringes (directly or contributorily) any
-intellectual property rights of any kind of any other person or entity or
-(ii) breaches any representation or warranty, express, implied or
-statutory, to which, under any applicable law, it might be deemed to have
-been subject.
-
-7. Claims of Infringement. If Recipient learns of any third party claim
-that any disposition of Covered Code and/or functionality wholly or
-partially infringes the third party's intellectual property rights,
-Recipient will promptly notify SGI of such claim.
-
-8. Versions of the License. SGI may publish revised and/or new versions of
-the License from time to time, each with a distinguishing version number.
-Once Covered Code has been published under a particular version of the
-License, Recipient may, for the duration of the license, continue to use it
-under the terms of that version, or choose to use such Covered Code under
-the terms of any subsequent version published by SGI. Subject to the
-provisions of Sections 3 and 4 of this License, only SGI may modify the
-terms applicable to Covered Code created under this License.
-
-9. DISCLAIMER OF WARRANTY. COVERED CODE IS PROVIDED "AS IS." ALL EXPRESS
-AND IMPLIED WARRANTIES AND CONDITIONS ARE DISCLAIMED, INCLUDING, WITHOUT
-LIMITATION, ANY IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY,
-SATISFACTORY QUALITY, FITNESS FOR A PARTICULAR PURPOSE, AND
-NON-INFRINGEMENT. SGI ASSUMES NO RISK AS TO THE QUALITY AND PERFORMANCE OF
-THE SOFTWARE. SHOULD THE SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, SGI
-ASSUMES NO COST OR LIABILITY FOR SERVICING, REPAIR OR CORRECTION. THIS
-DISCLAIMER OF WARRANTY IS AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY
-COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT SUBJECT TO THIS DISCLAIMER.
-10. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES NOR LEGAL THEORY,
-WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT
-LIABILITY), CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR BE LIABLE
-FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF
-ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
-WORK STOPPAGE, LOSS OF DATA, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND
-ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY
-SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM
-SGI's NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION.
-SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL
-OR CONSEQUENTIAL DAMAGES, SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO
-RECIPIENT.
-
-11. Indemnity. Recipient shall be solely responsible for damages arising,
-directly or indirectly, out of its utilization of rights under this
-License. Recipient will defend, indemnify and hold harmless Silicon
-Graphics, Inc. from and against any loss, liability, damages, costs or
-expenses (including the payment of reasonable attorneys fees) arising out
-of Recipient's use, modification, reproduction and distribution of the
-Covered Code or out of any representation or warranty made by Recipient.
-
-12. U.S. Government End Users. The Covered Code is a "commercial item"
-consisting of "commercial computer software" as such terms are defined in
-title 48 of the Code of Federal Regulations and all U.S. Government End
-Users acquire only the rights set forth in this License and are subject to
-the terms of this License.
-
-13. Miscellaneous. This License represents the complete agreement
-concerning the its subject matter. If any provision of this License is held
-to be unenforceable, such provision shall be reformed so as to achieve as
-nearly as possible the same legal and economic effect as the original
-provision and the remainder of this License will remain in effect. This
-License shall be governed by and construed in accordance with the laws of
-the United States and the State of California as applied to agreements
-entered into and to be performed entirely within California between
-California residents. Any litigation relating to this License shall be
-subject to the exclusive jurisdiction of the Federal Courts of the Northern
-District of California (or, absent subject matter jurisdiction in such
-courts, the courts of the State of California), with venue lying
-exclusively in Santa Clara County, California, with the losing party
-responsible for costs, including without limitation, court costs and
-reasonable attorneys fees and expenses. The application of the United
-Nations Convention on Contracts for the International Sale of Goods is
-expressly excluded. Any law or regulation that provides that the language
-of a contract shall be construed against the drafter shall not apply to
-this License.
-
-Exhibit A
-
-License Applicability. Except to the extent portions of this file are made
-subject to an alternative license as permitted in the SGI Free Software
-License B, Version 1.1 (the "License"), the contents of this file are
-subject only to the provisions of the License. You may not use this file
-except in compliance with the License. You may obtain a copy of the License
-at Silicon Graphics, Inc., attn: Legal Services, 1600 Amphitheatre Parkway,
-Mountain View, CA 94043-1351, or at: http://oss.sgi.com/projects/FreeB
-
-Note that, as provided in the License, the Software is distributed on an
-"AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-
-Original Code. The Original Code is: [name of software, version number, and
-release date], developed by Silicon Graphics, Inc. The Original Code is
-Copyright (c) [dates of first publication, as appearing in the Notice in
-the Original Code] Silicon Graphics, Inc. Copyright in any portions created
-by third parties is as indicated elsewhere herein. All Rights Reserved.
-Additional Notice Provisions: [such additional provisions, if any, as
-appear in the Notice in the Original Code under the heading "Additional
-Notice Provisions"]
-
---------------------------------------------------------------------------------
-The Bitstream Type 1 fonts are under the following license:
-
-(c) Copyright 1989-1992, Bitstream Inc., Cambridge, MA.
-
-You are hereby granted permission under all Bitstream propriety rights
-to use, copy, modify, sublicense, sell, and redistribute the 4 Bitstream
-Charter (r) Type 1 outline fonts and the 4 Courier Type 1 outline fonts
-for any purpose and without restriction; provided, that this notice is
-left intact on all copies of such fonts and that Bitstream's trademark
-is acknowledged as shown below on all unmodified copies of the 4 Charter
-Type 1 fonts.
-
-BITSTREAM CHARTER is a registered trademark of Bitstream Inc.
-
Modified: people/zinoviev/console-setup/debian/changelog
===================================================================
--- people/zinoviev/console-setup/debian/changelog 2006-07-20 21:25:38 UTC (rev 194)
+++ people/zinoviev/console-setup/debian/changelog 2006-07-22 11:25:06 UTC (rev 195)
@@ -5,22 +5,23 @@
* Added Czech translation. Closes: #360333
[ Anton Zinoviev ]
- * Update Keyboard/ckb/ from the SVN repository of XKeyboardConfig
* Keyboard/ckbcomp: include /usr/share/X11/xkb to the list of
directories for keyboard data. The data from /etc/console-setup/ckb
are still the default.
- * Correct a typo in the Bulgarian translation. Thanks to Yavor Doganov,
- closes: #359677.
- * Add an optional argument to xmlreader - the XML source file to use
- instead of ckb/rules/xorg.xml. Similarly add an optional argument to
- kbdnames-maker and non-optional to kbdcompiler - the file to use
- instead of KeyboardNames.pl.
* Sync the Keyboard/ckb data with the data in xkb-data package, version
0.8-5. Update ckbcomp with two new keysyms (Cyrillic_(CHE|KA)_vertbar).
+ * Do not package the keyboard data. Depend on xkb-data. Thanks to
+ Denis Barbier, closes: #359775.
+ * Fix a shell syntax error in debian/config.proto that causes
+ installation of console-setup to hang on powerpc. Thanks to Colin
+ Watson, closes: #374765.
* ckbcomp: new option -compact to generate compact keymaps.
+ * New experimental package console-setup-mini.
+ * Correct a typo in the Bulgarian translation. Thanks to Yavor Doganov,
+ closes: #359677.
+
+ -- Anton Zinoviev <zinoviev at debian.org> Fri, 21 Jul 2006 21:19:51 +0300
- -- Anton Zinoviev <zinoviev at debian.org> Thu, 20 Jul 2006 11:44:05 +0300
-
console-setup (1.6) unstable; urgency=low
[ Anton Zinoviev ]
Added: people/zinoviev/console-setup/debian/compat
===================================================================
--- people/zinoviev/console-setup/debian/compat 2006-07-20 21:25:38 UTC (rev 194)
+++ people/zinoviev/console-setup/debian/compat 2006-07-22 11:25:06 UTC (rev 195)
@@ -0,0 +1 @@
+5
Modified: people/zinoviev/console-setup/debian/config.proto
===================================================================
--- people/zinoviev/console-setup/debian/config.proto 2006-07-20 21:25:38 UTC (rev 194)
+++ people/zinoviev/console-setup/debian/config.proto 2006-07-22 11:25:06 UTC (rev 195)
@@ -161,7 +161,7 @@
if [ "$arch" = 'powerpc' -o "$arch" = 'm68k' ]; then
if [ "$arch" = powerpc ]; then
- line = `sed -n 's/^machine.*: *//p' /proc/cpuinfo`
+ line=`sed -n 's/^machine.*: *//p' /proc/cpuinfo`
if [ "$line" = '' ]; then
echo unknown
return 0
@@ -1118,6 +1118,7 @@
variant="$RET"
case "$layout" in
# TODO: make s.t. to not forget to update this list
+ # Don't forget to update also the list in kbdcompiler
am|ara|ben|bd|bg|bt|by|cs|deva|ge|gh|gr|guj|guru|il|in|ir|iku|jp|kan|kh|la|lao|lk|mk|mm|mn|mv|mal|ori|pk|ru|scc|sy|syr|tel|th|tj|tam|ua|uz)
latin=no
real_layout=us,$layout
Copied: people/zinoviev/console-setup/debian/console-setup-mini.console-setup.init (from rev 187, people/zinoviev/console-setup/debian/console-setup-mini.init)
===================================================================
--- people/zinoviev/console-setup/debian/console-setup-mini.init 2006-07-20 15:32:45 UTC (rev 187)
+++ people/zinoviev/console-setup/debian/console-setup-mini.console-setup.init 2006-07-22 11:25:06 UTC (rev 195)
@@ -0,0 +1 @@
+link console-setup.console-setup.init
\ No newline at end of file
Deleted: people/zinoviev/console-setup/debian/console-setup-mini.init
===================================================================
--- people/zinoviev/console-setup/debian/console-setup-mini.init 2006-07-20 21:25:38 UTC (rev 194)
+++ people/zinoviev/console-setup/debian/console-setup-mini.init 2006-07-22 11:25:06 UTC (rev 195)
@@ -1 +0,0 @@
-link console-setup.init
\ No newline at end of file
Added: people/zinoviev/console-setup/debian/console-setup-mini.postinst
===================================================================
--- people/zinoviev/console-setup/debian/console-setup-mini.postinst 2006-07-20 21:25:38 UTC (rev 194)
+++ people/zinoviev/console-setup/debian/console-setup-mini.postinst 2006-07-22 11:25:06 UTC (rev 195)
@@ -0,0 +1 @@
+link console-setup.postinst
\ No newline at end of file
Property changes on: people/zinoviev/console-setup/debian/console-setup-mini.postinst
___________________________________________________________________
Name: svn:special
+ *
Added: people/zinoviev/console-setup/debian/console-setup-mini.postrm
===================================================================
--- people/zinoviev/console-setup/debian/console-setup-mini.postrm 2006-07-20 21:25:38 UTC (rev 194)
+++ people/zinoviev/console-setup/debian/console-setup-mini.postrm 2006-07-22 11:25:06 UTC (rev 195)
@@ -0,0 +1 @@
+link console-setup.postrm
\ No newline at end of file
Property changes on: people/zinoviev/console-setup/debian/console-setup-mini.postrm
___________________________________________________________________
Name: svn:special
+ *
Added: people/zinoviev/console-setup/debian/console-setup-mini.templates
===================================================================
--- people/zinoviev/console-setup/debian/console-setup-mini.templates 2006-07-20 21:25:38 UTC (rev 194)
+++ people/zinoviev/console-setup/debian/console-setup-mini.templates 2006-07-22 11:25:06 UTC (rev 195)
@@ -0,0 +1 @@
+link console-setup.templates
\ No newline at end of file
Property changes on: people/zinoviev/console-setup/debian/console-setup-mini.templates
___________________________________________________________________
Name: svn:special
+ *
Copied: people/zinoviev/console-setup/debian/console-setup.console-setup.init (from rev 162, people/zinoviev/console-setup/debian/console-setup.init)
Modified: people/zinoviev/console-setup/debian/console-setup.copyright
===================================================================
--- people/zinoviev/console-setup/debian/console-setup.copyright 2006-07-20 21:25:38 UTC (rev 194)
+++ people/zinoviev/console-setup/debian/console-setup.copyright 2006-07-22 11:25:06 UTC (rev 195)
@@ -1,19 +1,10 @@
-The components of this package are distributed under different license
-termes.
-
All console fonts are public domain by nature. The source BDF-fonts
-in the directory Fonts/bdf are distributed under many different
-licenses, see in the file copyright.fonts for details.
+are distributed under many different licenses, see in the file
+copyright.fonts for details.
-The keyboard files are borrowed from the CVS of the XKeyboardConfig
-project and the Keyboard/locale directory is borrowed from the X
-Window System distribution of X.org Foundation. As a result the files
-in the directories Keyboard/ckb and Keyboard/locale have many
-different license terms, look at the file copyright.X for details.
-
Everything else in this package is
-Copyright (c) 2005, 2006 Anton Zinoviev, zinoviev at debian.org
+Copyright (c) 1999,2000,2001,2002,2003,2006 Anton Zinoviev, zinoviev at debian.org
It is distributed under terms of the GNU General Public License
version 2.0 or (at your choice) any later version.
Deleted: people/zinoviev/console-setup/debian/console-setup.init
===================================================================
--- people/zinoviev/console-setup/debian/console-setup.init 2006-07-20 21:25:38 UTC (rev 194)
+++ people/zinoviev/console-setup/debian/console-setup.init 2006-07-22 11:25:06 UTC (rev 195)
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-set -e
-
-test -f /bin/setupcon || exit 0
-
-case "$1" in
- stop)
- # console-setup isn't a daemon
- ;;
- start|force-reload|restart|reload)
- case `readlink /proc/self/fd/2` in
- /dev/tty[0-9]*|/dev/vc/[0-9]*|/dev/console)
- echo -n "Setting up font and keyboard on the console... "
- setupcon
- echo done.
- ;;
- *)
- exit 0
- ;;
- esac
- ;;
- *)
- echo 'Usage: /etc/init.d/console-setup {start|reload|restart|force-reload|stop}'
- exit 1
- ;;
-esac
-
Copied: people/zinoviev/console-setup/debian/console-setup.postinst (from rev 162, people/zinoviev/console-setup/debian/postinst)
===================================================================
--- people/zinoviev/console-setup/debian/postinst 2006-04-05 05:20:44 UTC (rev 162)
+++ people/zinoviev/console-setup/debian/console-setup.postinst 2006-07-22 11:25:06 UTC (rev 195)
@@ -0,0 +1,151 @@
+#!/bin/sh
+
+set -e
+
+# The same as /usr/bin/which - in order to make this script work
+# in environments where "which" is not available
+which () {
+ local IFS
+ IFS=:
+ for i in $PATH; do
+ if [ -x "$i/$1" ]; then
+ echo "$i/$1"
+ return 0
+ fi
+ done
+ return 1
+}
+
+# In order to make this script work in environments where
+# "md5sum" is not available
+md5sum=`which md5sum`
+if [ -z "$md5sum" ]; then
+ md5sum=true
+fi
+
+echo 11111 >>/tmp/clog
+
+CONFIGDIR=/etc/console-setup
+CONFIGFILE=/etc/default/console-setup
+
+# Source debconf library.
+. /usr/share/debconf/confmodule
+
+fontdir=/usr/share/consolefonts
+
+if [ "$1" = "configure" ]; then
+
+echo 22222 >>/tmp/clog
+
+ db_get console-setup/codeset
+ codeset="$RET"
+ db_get console-setup/fontface
+ fontface="$RET"
+ db_get console-setup/fontsize
+ fontsize="$RET"
+
+ fontname=$codeset-$fontface$fontsize.psf.gz
+
+ db_get console-setup/charmap
+ charmap="$RET"
+
+ db_get console-setup/ttys
+ ttys="$RET"
+
+
+ db_get console-setup/modelcode
+ model="$RET"
+
+ db_get console-setup/layoutcode
+ layout="$RET"
+
+ db_get console-setup/variantcode
+ variant="$RET"
+
+ db_get console-setup/optionscode
+ options="$RET"
+
+echo 33333 >>/tmp/clog
+
+ if [ "$charmap" != UTF-8 ]; then
+ acm=$CONFIGDIR/$charmap.acm.gz
+ acm_option="-charmap $charmap"
+ else
+ acm=''
+ acm_option=''
+ fi
+
+ if [ ! -e $CONFIGFILE ]; then
+ cat /usr/share/doc/console-setup/examples/console-setup \
+ /usr/share/doc/console-setup-mini/examples/console-setup \
+ 2>/dev/null >$CONFIGFILE || true
+ cat >>$CONFIGFILE <<EOF
+
+# Do not update the following md5 sum if you change
+# $CONFIGDIR/boottime.kmap.gz and Debconf will not overwrite
+# your custom keymap. Do not update it even if you want to make
+# Debconf overwrite it. Instead simply specify the empty string as
+# a md5 sum.
+
+BOOTTIME_KMAP_MD5=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+EOF
+ fi
+
+ . $CONFIGFILE || true
+
+echo 44444 >>/tmp/clog
+echo "model=$model layout=$layout variant=$variant options=$options" >>/tmp/clog
+
+ if \
+ [ -z "$BOOTTIME_KMAP_MD5" ] \
+ || [ ! -f "$CONFIGDIR/boottime.kmap.gz" ] \
+ || echo "$BOOTTIME_KMAP_MD5 $CONFIGDIR/boottime.kmap.gz" \
+ | $md5sum -c 2>/dev/null >/dev/null
+ then
+ if which gzip >/dev/null; then
+ ckbcomp $acm_option -model "$model" \
+ "$layout" "$variant" "$options" \
+ | gzip -9 >$CONFIGDIR/boottime.kmap.gz
+ fi
+ BOOTTIME_KMAP_MD5=`$md5sum $CONFIGDIR/boottime.kmap.gz | sed 's/ .*//'`
+ fi
+
+ # Ensure we do not mess up the config file's ownership and permissions.
+ cp -a -f $CONFIGFILE $CONFIGFILE.tmp
+
+ # If the admin deleted or commented some variables but then set
+ # them via debconf, (re-)add them to the conffile.
+ for var in \
+ ACTIVE_CONSOLES CHARMAP CODESET FONTFACE FONTSIZE \
+ XKBMODEL XKBLAYOUT XKBVARIANT XKBOPTIONS BOOTTIME_KMAP_MD5
+ do
+ if ! grep "^ *${var}=" $CONFIGFILE >/dev/null; then
+ echo "${var}=" >>$CONFIGFILE
+ fi
+ done
+
+echo 55555 >>/tmp/clog
+
+ awk '
+/^ *ACTIVE_CONSOLES=/ { print "ACTIVE_CONSOLES=\"'"$ttys"'\""; next; }
+/^ *CHARMAP=/ { print "CHARMAP=\"'"$charmap"'\""; next; }
+/^ *CODESET=/ { print "CODESET=\"'"$codeset"'\""; next; }
+/^ *FONTFACE=/ { print "FONTFACE=\"'"$fontface"'\""; next; }
+/^ *FONTSIZE=/ { print "FONTSIZE=\"'"$fontsize"'\""; next; }
+/^ *XKBMODEL=/ { print "XKBMODEL=\"'"$model"'\""; next; }
+/^ *XKBLAYOUT=/ { print "XKBLAYOUT=\"'"$layout"'\""; next; }
+/^ *XKBVARIANT=/ { print "XKBVARIANT=\"'"$variant"'\""; next; }
+/^ *XKBOPTIONS=/ { print "XKBOPTIONS=\"'"$options"'\""; next; }
+/^ *BOOTTIME_KMAP_MD5=/ {
+ print "BOOTTIME_KMAP_MD5=\"'"$BOOTTIME_KMAP_MD5"'\"";
+ next;
+}
+{ print; }
+' <$CONFIGFILE >$CONFIGFILE.tmp
+
+ mv -f $CONFIGFILE.tmp $CONFIGFILE
+fi
+
+echo 66666 >>/tmp/clog
+
+#DEBHELPER#
Copied: people/zinoviev/console-setup/debian/console-setup.postrm (from rev 162, people/zinoviev/console-setup/debian/postrm)
Copied: people/zinoviev/console-setup/debian/console-setup.templates (from rev 162, people/zinoviev/console-setup/debian/templates)
Modified: people/zinoviev/console-setup/debian/control
===================================================================
--- people/zinoviev/console-setup/debian/control 2006-07-20 21:25:38 UTC (rev 194)
+++ people/zinoviev/console-setup/debian/control 2006-07-22 11:25:06 UTC (rev 195)
@@ -3,14 +3,14 @@
Priority: optional
Maintainer: Console utilities maintainers <pkg-kbd-devel at lists.alioth.debian.org>
Uploaders: Anton Zinoviev <zinoviev at debian.org>
-Build-Depends-Indep: debhelper (>= 5), perl, po-debconf, libxml-parser-perl
+Build-Depends-Indep: debhelper (>= 5), perl, po-debconf, libxml-parser-perl, xkb-data
Standards-Version: 3.6.2
Package: console-setup
Section: utils
Architecture: all
Recommends: kbd (>= 0.99-12) | console-tools (>= 1:0.2.3-16)
-Depends: debconf (>= 0.5) | debconf-2.0, console-terminus (>= 4.16)
+Depends: debconf (>= 0.5) | debconf-2.0, console-terminus (>= 4.16), xkb-data
Description: Setup the font and the keyboard on the console
The package provides the Linux console with the same versatile
keyboard configuration that X Window uses. As a result there is no
@@ -24,6 +24,22 @@
VGA, the simplistic Fixed, and the cleaned Terminus, TerminusBold and
TerminusBoldVGA.
+Package: console-setup-mini
+Section: utils
+Priority: extra
+Architecture: all
+Recommends: kbd | console-tools
+Depends: debconf (>= 0.5) | debconf-2.0
+Conflicts: console-setup, console-terminus
+Description: An experimental micro version of console-setup package
+ This package can be useful when Debian system is installed on
+ handhelds or other devices with small storage space. It was created
+ as proof of concept for a method to implement versatile keyboard
+ configuration in the Debian installer.
+ .
+ This package supports only UTF-8. The legacy 8-bit encodings are not
+ supported.
+
Package: bdf2psf
Architecture: all
Section: utils
Deleted: people/zinoviev/console-setup/debian/postinst
===================================================================
--- people/zinoviev/console-setup/debian/postinst 2006-07-20 21:25:38 UTC (rev 194)
+++ people/zinoviev/console-setup/debian/postinst 2006-07-22 11:25:06 UTC (rev 195)
@@ -1,112 +0,0 @@
-#!/bin/sh
-
-set -e
-
-CONFIGDIR=/etc/console-setup
-CONFIGFILE=/etc/default/console-setup
-
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
-fontdir=/usr/share/consolefonts
-
-if [ "$1" = "configure" ]; then
-
- db_get console-setup/codeset
- codeset="$RET"
- db_get console-setup/fontface
- fontface="$RET"
- db_get console-setup/fontsize
- fontsize="$RET"
-
- fontname=$codeset-$fontface$fontsize.psf.gz
-
- db_get console-setup/charmap
- charmap="$RET"
-
- db_get console-setup/ttys
- ttys="$RET"
-
-
- db_get console-setup/modelcode
- model="$RET"
-
- db_get console-setup/layoutcode
- layout="$RET"
-
- db_get console-setup/variantcode
- variant="$RET"
-
- db_get console-setup/optionscode
- options="$RET"
-
- if [ "$charmap" != UTF-8 ]; then
- acm=$CONFIGDIR/$charmap.acm.gz
- acm_option="-charmap $charmap"
- else
- acm=''
- acm_option=''
- fi
-
- if [ ! -e $CONFIGFILE ]; then
- cat /usr/share/doc/console-setup/examples/console-setup >$CONFIGFILE
- cat >>$CONFIGFILE <<EOF
-
-# Do not update the following md5 sum if you change
-# $CONFIGDIR/boottime.kmap.gz and Debconf will not overwrite
-# your custom keymap. Do not update it even if you want to make
-# Debconf overwrite it. Instead simply specify the empty string as
-# a md5 sum.
-
-BOOTTIME_KMAP_MD5=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-EOF
- fi
-
- . $CONFIGFILE || true
-
- if \
- [ -z "$BOOTTIME_KMAP_MD5" ] \
- || [ ! -f "$CONFIGDIR/boottime.kmap.gz" ] \
- || echo "$BOOTTIME_KMAP_MD5 $CONFIGDIR/boottime.kmap.gz" \
- | md5sum -c 2>/dev/null >/dev/null
- then
- ckbcomp $acm_option -model "$model" "$layout" "$variant" "$options" \
- | gzip -9 >$CONFIGDIR/boottime.kmap.gz
- BOOTTIME_KMAP_MD5=`md5sum $CONFIGDIR/boottime.kmap.gz | sed 's/ .*//'`
- fi
-
- # Ensure we do not mess up the config file's ownership and permissions.
- cp -a -f $CONFIGFILE $CONFIGFILE.tmp
-
- # If the admin deleted or commented some variables but then set
- # them via debconf, (re-)add them to the conffile.
- for var in \
- ACTIVE_CONSOLES CHARMAP CODESET FONTFACE FONTSIZE \
- XKBMODEL XKBLAYOUT XKBVARIANT XKBOPTIONS BOOTTIME_KMAP_MD5
- do
- if ! grep "^ *${var}=" $CONFIGFILE >/dev/null; then
- echo "${var}=" >>$CONFIGFILE
- fi
- done
-
- awk '
-/^ *ACTIVE_CONSOLES=/ { print "ACTIVE_CONSOLES=\"'"$ttys"'\""; next; }
-/^ *CHARMAP=/ { print "CHARMAP=\"'"$charmap"'\""; next; }
-/^ *CODESET=/ { print "CODESET=\"'"$codeset"'\""; next; }
-/^ *FONTFACE=/ { print "FONTFACE=\"'"$fontface"'\""; next; }
-/^ *FONTSIZE=/ { print "FONTSIZE=\"'"$fontsize"'\""; next; }
-/^ *XKBMODEL=/ { print "XKBMODEL=\"'"$model"'\""; next; }
-/^ *XKBLAYOUT=/ { print "XKBLAYOUT=\"'"$layout"'\""; next; }
-/^ *XKBVARIANT=/ { print "XKBVARIANT=\"'"$variant"'\""; next; }
-/^ *XKBOPTIONS=/ { print "XKBOPTIONS=\"'"$options"'\""; next; }
-/^ *BOOTTIME_KMAP_MD5=/ {
- print "BOOTTIME_KMAP_MD5=\"'"$BOOTTIME_KMAP_MD5"'\"";
- next;
-}
-{ print; }
-' <$CONFIGFILE >$CONFIGFILE.tmp
-
- mv -f $CONFIGFILE.tmp $CONFIGFILE
-fi
-
-#DEBHELPER#
Deleted: people/zinoviev/console-setup/debian/postrm
===================================================================
--- people/zinoviev/console-setup/debian/postrm 2006-07-20 21:25:38 UTC (rev 194)
+++ people/zinoviev/console-setup/debian/postrm 2006-07-22 11:25:06 UTC (rev 195)
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ purge = "$1" ]; then
- rm -f /etc/default/console-setup
- rm -rf /etc/console-setup
-fi
-
-#DEBHELPER#
Modified: people/zinoviev/console-setup/debian/rules
===================================================================
--- people/zinoviev/console-setup/debian/rules 2006-07-20 21:25:38 UTC (rev 194)
+++ people/zinoviev/console-setup/debian/rules 2006-07-22 11:25:06 UTC (rev 195)
@@ -1,13 +1,16 @@
#!/usr/bin/make -f
SHELL = /bin/bash
-export DH_COMPAT=5
+xkbdir = /usr/share/X11/xkb
+export xkbdir
+
main_build:
$(MAKE)
+ cd Keyboard && $(MAKE) build-mini
touch main_build
-debian/config: debian/config.proto main_build
+debian/console-setup.config debian/console-setup-mini.config: debian/config.proto main_build
awk ' \
/## *FONTSETS *##/ { \
printf "fontsets='\''"; \
@@ -23,22 +26,23 @@
} \
/## *KBDNAMES *##/ { \
printf "kbdnames='\''"; \
- system("cd Keyboard && ./kbdnames-maker"); \
+ system("cd Keyboard && ./kbdnames-maker MyKeyboardNames.pl"); \
printf "'\''"; \
next; \
} \
{ \
print; \
-}' debian/config.proto >debian/config
+}' debian/config.proto >debian/console-setup.config
+ cp debian/console-setup.config debian/console-setup-mini.config
-build: main_build debian/config
+build: main_build debian/console-setup.config debian/console-setup-mini.config
.PHONY : clean
clean:
dh_testdir
-$(MAKE) maintainer-clean
-rm -f build main_build
- -rm -f debian/config
+ -rm -f debian/*.config
-rm -f debian/*~
dh_clean
@@ -47,20 +51,75 @@
dh_testdir
dh_testroot
dh_clean -k
+# console-setup-mini
+ dh_install -pconsole-setup-mini Keyboard/*.ekmap.gz \
+ usr/share/console-setup-mini
+ dh_install -pconsole-setup-mini Fonts/Arabic-VGA16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-mini Fonts/Armenian-Fixed16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-mini Fonts/CyrAsia-Fixed16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-mini Fonts/CyrKoi-TerminusBold16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-mini Fonts/CyrSlav-TerminusBold16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-mini Fonts/Ethiopian-Goha16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-mini Fonts/Georgian-Fixed16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-mini Fonts/Greek-VGA16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-mini Fonts/Hebrew-VGA16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-mini Fonts/Lao-Fixed16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-mini Fonts/Lat15-TerminusBold16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-mini Fonts/Lat2-TerminusBold16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-mini Fonts/Lat38-VGA16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-mini Fonts/Lat7-TerminusBold16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-mini Fonts/Thai-Fixed16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-mini Fonts/Uni1-VGA16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-mini Fonts/Uni2-VGA16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-mini Fonts/Uni3-Fixed16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-mini Fonts/Vietnamese-Fixed16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-mini Keyboard/ckbcomp-mini usr/bin
+ dh_link -pconsole-setup-mini usr/bin/ckbcomp-mini usr/bin/ckbcomp
+ dh_install -pconsole-setup-mini setupcon bin
+ install -d debian/console-setup-mini/etc/default/
+ install -d debian/console-setup-mini/etc/console-setup/
+ install -d debian/console-setup-mini/usr/share/doc/console-setup-mini/examples/
+ cp config debian/console-setup-mini/usr/share/doc/console-setup-mini/examples/console-setup
+ rm -rf `find debian/console-setup-mini -name .cvsignore`
+ rm -rf `find debian/console-setup-mini -name .svn`
+# console-setup
$(MAKE) etcdir=debian/console-setup/etc \
prefix=debian/console-setup/usr install
rm debian/console-setup/usr/share/consolefonts/*-Terminus*.psf.gz
+ rm -rf debian/console-setup/etc/console-setup/ckb/
install -d debian/console-setup/usr/share/doc/console-setup/examples/
mv debian/console-setup/etc/default/console-setup \
debian/console-setup/usr/share/doc/console-setup/examples/
+ rm -rf `find debian/console-setup -name .cvsignore`
+ rm -rf `find debian/console-setup -name .svn`
+# bdf2psf
dh_install -pbdf2psf Fonts/bdf2psf usr/bin/
dh_install -pbdf2psf Fonts/*.equivalents Fonts/*.set \
Fonts/fontsets usr/share/bdf2psf
- rm -rf `find debian/console-setup -name .cvsignore`
- rm -rf `find debian/console-setup -name .svn`
+ rm -rf `find debian/bdf2psf -name .cvsignore`
rm -rf `find debian/bdf2psf -name .svn`
+# common
dh_installinit --no-start --name keyboard-setup -- start 06 S .
- dh_installinit -- start 49 S .
+ dh_installinit --name console-setup -- start 49 S .
# Build architecture-independent files here.
.PHONY : binary-indep
@@ -70,8 +129,12 @@
dh_installxfonts
dh_installdebconf
dh_installdocs -pconsole-setup README*
+ dh_install -p console-setup copyright.fonts \
+ usr/share/doc/console-setup
+ dh_installdocs -pconsole-setup-mini
+ dh_install -p console-setup-mini copyright.fonts \
+ usr/share/doc/console-setup-mini
dh_installdocs -pbdf2psf debian/README.fontsets
- cp copyright.fonts copyright.X debian/console-setup/usr/share/doc/console-setup/
# dh_installexamples
dh_installman -pbdf2psf Fonts/bdf2psf.1
# dh_installinfo
Deleted: people/zinoviev/console-setup/debian/templates
===================================================================
--- people/zinoviev/console-setup/debian/templates 2006-07-20 21:25:38 UTC (rev 194)
+++ people/zinoviev/console-setup/debian/templates 2006-07-22 11:25:06 UTC (rev 195)
@@ -1,192 +0,0 @@
-Template: console-setup/codeset
-Type: select
-# I am not sure if these should be translated. They
-# directly to the font file names and are documented in README files.
-Choices: Arabic, Armenian, CyrAsia, CyrKoi, CyrSlav, Ethiopian, Georgian, Greek, Hebrew, Lao, Lat15, Lat2, Lat38, Lat7, Thai, Uni1, Uni2, Uni3, Vietnamese
-Default: Uni1
-# The languages with many non-ASCII letters should not use formated
-# list. In you decide to use formated list keep the lines relatively short.
-_Description: Codeset for your language environment:
- - Lat15 covers ISO 8859-1, ISO 8859-15 and ISO 8859-9;
- - Lat2 covers ISO 8859-2, the Euro sign as well as the
- Romanian letters with comma below;
- - Lat38 covers ISO 8859-3 and ISO 8859-13;
- - Lat7 covers ISO 8859-13;
- - CyrSlav covers the Slavic Cyrillic letters as well as
- the Serbian Latin letters;
- - Uni1 supports most of the Latin languages, the Slavic
- Cyrillic languages, Hebrew and barely Arabic;
- - Uni2 supports most of the Latin languages, the Slavic
- Cyrillic languages and Greek;
- - Uni3 supports most of the Latin and Cyrillic languages.
-
-Template: console-setup/model
-Type: select
-Choices: ${CHOICES}
-_Description: Keyboard model:
-
-Template: console-setup/layout
-Type: select
-Choices: ${CHOICES}
-Default: U.S. English
-_Description: The origin of the keyboard:
-
-Template: console-setup/variant
-Type: select
-Choices: ${CHOICES}
-_Description: Keyboard layout:
- There are more than one keyboard layouts with the origin you selected.
- Please select the layout matching your keyboard.
-
-Template: console-setup/dont_ask_layout
-Type: note
-_Description: Unsupported settings in configuration file
- The configuration file /etc/default/console-setup specifies keyboard
- layout and variant that are not supported by the configuration
- program. Because of that no questions about the keyboard layout will
- be asked and your current configuration will be preserved.
-
-Template: console-setup/fontface
-Type: select
-Choices: ${CHOICES}
-Default: Fixed
-# The languages with many non-ASCII letters should not use formated
-# list. In you decide to use formated list keep the lines relatively short.
-_Description: Font for the console:
- Please choose the font face you would like to use on Linux console.
- .
- - VGA is traditionally looking and has medium coverage
- of international scripts;
- - Fixed has simplistic look and has a better coverage
- of international scripts;
- - Terminus is aimed to reduce the eyes fatigue though
- some symbols have a similar aspect which may be a problem
- for programmers. It only supports the Latin and the
- Cyrillic scripts.
- .
- If you prefer bold version of the Terminus font and you don't use
- framebuffer then choose TerminusBoldVGA. If you use framebuffer then
- choose TerminusBold.
-
-Template: console-setup/fontsize-text
-Type: select
-Choices: ${CHOICES}
-Default: 16
-_Description: Font size:
- Please select the size of the font for the Linux console. For a
- reference - the font your computer starts with has size 16.
-
-Template: console-setup/fontsize-fb
-Type: select
-Choices: ${CHOICES}
-Default: 16
-_Description: Font size:
- Please select the size of the font for the Linux console. When the
- size is represented as a plain number then the corresponding font can
- be used with all console drivers and the number measures the height
- of the symbols (in number of scan lines). Otherwise the size has the
- format HEIGHTxWIDTH and the corresponding fonts can be used only if
- you use framebuffer and the kbd console package (console-tools
- doesn't work for such fonts). Currently these fonts can not be used
- if the framebuffer you use is based on the RadeonFB kernel module.
- .
- You can use the height of the fonts in order to figure out the real
- size of the symbols on the console. For a reference - the font your
- computer starts with has height 16.
-
-Template: console-setup/charmap
-Type: select
-Choices: ${CHOICES}
-Default: UTF-8
-_Description: Encoding on the console:
-
-Template: console-setup/ttys
-Type: string
-Default: /dev/tty[1-6]
-_Description: Virtual consoles in use:
- Please enter a space delimited list of virtual consoles you use. The usual
- Unix filename wildcards are allowed (*, ? and [...]).
- .
- If you are unsure, then use the default /dev/tty[1-6] which stands for six
- virtual consoles. If you use devfs, then enter /dev/vc/[1-6] instead.
-
-Template: console-setup/toggle
-Type: select
-__Choices: Caps Lock, Right Alt, Right Control, Right Shift, Right Logo key, Menu key, Alt+Shift, Control+Shift, Shift+Caps Lock, Control+Alt, Both Shift keys together, Both Control keys together, Both Alt keys together, Left Alt, Left Control, Left Shift, Left Logo key, No toggling
-Default: Alt+Shift
-_Description: Method for toggling between Latin and non-Latin mode:
- Since your keyboard is a non-Latin one, you will need a way to toggle
- between the Latin and the non-Latin mode. Several options are available.
- .
- The most ergonomic choices seem to be the right Alt and the Caps Lock keys
- (in the later case use the combination Shift+Caps Lock for normal Caps
- toggle). Another popular choice is the Alt+Shift combination; notice
- however that in this case the combination Alt+Shift (or Control+Shift if
- you choose it) will lose its usual meaning in Emacs and other programs
- using it.
- .
- Notice the listed keys are not present on all keyboards.
-
-Template: console-setup/switch
-Type: select
-__Choices: No temporary switch, Right Alt, Left Alt, Right Logo key, Left Logo key, Both Logo keys
-Default: No temporary switch,
-_Description: Method for temporarily toggle between Latin and non-Latin input:
- Sometimes the keyboard is in non-Latin mode and you want to type only few
- Latin letters. In this case it may be desirable to have a key for
- temporary switching between non-Latin and Latin letters. While this key
- is pressed in non-Latin mode the keyboard types Latin letters and in
- reverse, when the keyboard is in Latin mode and you are pressing this key
- the keyboard will type non-Latin letters.
- .
- If you don't like this feature, choose the option "No temporary switch".
-
-Template: console-setup/altgr
-Type: select
-__Choices: No AltGr key, Right Alt, Right Control, Menu key, Right Logo key, Left Logo key, Both Logo keys, Left Alt
-Default: Right Alt
-_Description: AltGr key replacement:
- With some of the keyboard layouts, AltGr is a modifier key used to input
- some characters, primarily ones that are unusual for the language of the
- keyboard layout, such as foreign currency symbols and accented letters.
- If a key has a third symbol on it (on the front vertical face or the
- bottom right of the key top, sometimes in a different colour), then AltGr
- is often the means of eliciting that symbol.
-
-Template: console-setup/compose
-Type: select
-__Choices: No compose key, Right Alt, Right Logo key, Right Control, Menu key, Caps Lock
-Default: No compose key
-_Description: Compose key:
- The Compose key (known also as Multi_key) is a key which is designated to
- signal the software to interpret the next keystrokes as a combination in
- order to produce a character not found on the keyboard.
- .
- On the text console the Compose key does not work in Unicode mode. If not
- in Unicode mode, regardless of what you choose here, you can always use
- also the Alt+period combination as a Compose key.
-
-Template: console-setup/modelcode
-Type: string
-Default: none
-Description: for internal use
-
-Template: console-setup/layoutcode
-Type: string
-Default: none
-Description: for internal use
-
-Template: console-setup/variantcode
-Type: string
-Default: none
-Description: for internal use
-
-Template: console-setup/optionscode
-Type: string
-Default: none
-Description: for internal use
-
-Template: console-setup/fontsize
-Type: string
-Default: none
-Description: for internal use
Modified: people/zinoviev/console-setup/setupcon
===================================================================
--- people/zinoviev/console-setup/setupcon 2006-07-20 21:25:38 UTC (rev 194)
+++ people/zinoviev/console-setup/setupcon 2006-07-22 11:25:06 UTC (rev 195)
@@ -108,6 +108,13 @@
verbose='>/dev/null 2>&1'
fi
+if which ckbcomp-mini >/dev/null && [ "$CHARMAP" != UTF-8 ]; then
+ CHARMAP=UTF-8
+ if [ "$VERBOSE_OUTPUT" = yes ]; then
+ echo Only UTF-8 is supported by console-setup-mini
+ fi
+fi
+
case `readlink /proc/self/fd/2` in
/dev/tty[0-9]*|/dev/vc/[0-9]*|/dev/console)
;;
@@ -162,7 +169,16 @@
cp "$FONT" /etc/console-setup/
fi
else
- FONT="$CODESET-$FONTFACE$FONTSIZE.psf.gz"
+ if which ckbcomp-mini >/dev/null; then
+ FONT=$(echo `ls /usr/share/consolefonts/$CODESET-*.psf.gz \
+ 2>/dev/null`)
+ FONT=${FONT%% *}
+ if [ -z "$FONT" ]; then
+ FONT="$CODESET-$FONTFACE$FONTSIZE.psf.gz"
+ fi
+ else
+ FONT="$CODESET-$FONTFACE$FONTSIZE.psf.gz"
+ fi
case "$FONTSIZE" in
*x*)
bigfont=yes
More information about the Pkg-kbd-commit
mailing list