[Pkg-kbd-commit] r259 - console-setup/debian
zinoviev at alioth.debian.org
zinoviev at alioth.debian.org
Sun Jul 15 12:58:44 UTC 2007
Author: zinoviev
Date: 2007-07-15 12:58:44 +0000 (Sun, 15 Jul 2007)
New Revision: 259
Added:
console-setup/debian/console-setup-udeb.base-installer
console-setup/debian/console-setup-udeb.startup
Removed:
console-setup/debian/control-udeb
Modified:
console-setup/debian/config.proto
console-setup/debian/console-setup.templates
console-setup/debian/control
console-setup/debian/rules
Log:
console-setup: apply a patch by Colin Watson for udebs
Modified: console-setup/debian/config.proto
===================================================================
--- console-setup/debian/config.proto 2007-07-02 12:41:30 UTC (rev 258)
+++ console-setup/debian/config.proto 2007-07-15 12:58:44 UTC (rev 259)
@@ -926,8 +926,12 @@
if which locale >/dev/null; then
default_charmap=`locale charmap`
+# TODO: Let localechooser provides information about the charmap
+# Untill then we will ask.
+# elif [ -d /lib/debian-installer ]; then
+# default_charmap=UTF-8
else
- default_charmap=unknown # TODO: d-i
+ default_charmap=unknown
fi
if [ "$locale" = C ]; then
default_charmap=UTF-8
@@ -1119,10 +1123,36 @@
esac
fi
+# Get defaults from debconf, to allow preseeding.
+if [ -d /lib/debian-installer ]; then
+ if db_get console-setup/modelcode && [ "$RET" ]; then
+ default_model="$RET"
+ fi
+ if db_get console-setup/layoutcode && [ "$RET" ]; then
+ default_layout="$RET"
+ layout_priority=medium
+ fi
+ if db_get console-setup/variantcode && [ "$RET" ]; then
+ default_variant="$RET"
+ fi
+ if db_get console-setup/optionscode && [ "$RET" ]; then
+ XKBOPTIONS="$RET"
+ got_xkboptions=yes
+ fi
+ if db_get console-setup/fontsize && [ "$RET" ]; then
+ db_set console-setup/fontsize-text "$RET"
+ db_set console-setup/fontsize-fb "$RET"
+ fi
+fi
+
# Load the config file, if it exists.
if [ -e $CONFIGFILE ]; then
. $CONFIGFILE || true
+ got_full_config=yes
+ got_xkboptions=yes
+ model_priority=medium
+ layout_priority=medium
default_ttys="$ACTIVE_CONSOLES"
default_charmap="$CHARMAP"
default_fontface="$FONTFACE"
@@ -1151,7 +1181,9 @@
default_variant="$XKBVARIANT"
;;
esac
+fi
+if [ "$got_xkboptions" = yes ]; then
default_toggle='No toggling'
default_switch='No temporary switch'
default_altgr='No AltGr key'
@@ -1232,7 +1264,9 @@
unsupported_layout=yes;;
esac
done
+fi
+if [ "$got_full_config" = yes ]; then
# Store values from config file into debconf db.
db_set console-setup/ttys "$default_ttys"
@@ -1242,6 +1276,8 @@
db_set console-setup/fontsize-text "$default_fontsize"
db_set console-setup/fontsize-fb "$default_fontsize"
db_set console-setup/fontsize "$default_fontsize"
+fi
+if [ "$got_xkboptions" = yes ]; then
db_set console-setup/toggle "$default_toggle"
db_set console-setup/switch "$default_switch"
db_set console-setup/altgr "$default_altgr"
Added: console-setup/debian/console-setup-udeb.base-installer
===================================================================
--- console-setup/debian/console-setup-udeb.base-installer (rev 0)
+++ console-setup/debian/console-setup-udeb.base-installer 2007-07-15 12:58:44 UTC (rev 259)
@@ -0,0 +1,11 @@
+#! /bin/sh
+set -e
+
+. /usr/share/debconf/confmodule
+
+mkdir -p /target/etc/default
+cp -a /etc/default/console-setup /target/etc/default/
+
+apt-install console-setup || true
+
+exit 0
Added: console-setup/debian/console-setup-udeb.startup
===================================================================
--- console-setup/debian/console-setup-udeb.startup (rev 0)
+++ console-setup/debian/console-setup-udeb.startup 2007-07-15 12:58:44 UTC (rev 259)
@@ -0,0 +1,11 @@
+#! /bin/sh
+
+if [ "$TERM_TYPE" = virtual ]; then
+ # Set console mode to Unicode, if necessary.
+ if type kbd-mode >/dev/null 2>&1; then
+ kbd-mode -u
+ fi
+
+ # TODO: support bootkbd= (may require teaching setupcon more about
+ # ckbcomp-mini?)
+fi
Modified: console-setup/debian/console-setup.templates
===================================================================
--- console-setup/debian/console-setup.templates 2007-07-02 12:41:30 UTC (rev 258)
+++ console-setup/debian/console-setup.templates 2007-07-15 12:58:44 UTC (rev 259)
@@ -154,31 +154,25 @@
Template: console-setup/modelcode
Type: string
-Default: this default value is completely ignored
Description: for internal use
Template: console-setup/layoutcode
Type: string
-Default: this default value is completely ignored
Description: for internal use
Template: console-setup/variantcode
Type: string
-Default: this default value is completely ignored
Description: for internal use
Template: console-setup/optionscode
Type: string
-Default: this default value is completely ignored
Description: for internal use
Template: console-setup/fontsize
Type: string
-Default: this default value is completely ignored
Description: for internal use
Template: console-setup/codesetcode
Type: string
-Default: this default value is completely ignored
Description: for internal use
Modified: console-setup/debian/control
===================================================================
--- console-setup/debian/control 2007-07-02 12:41:30 UTC (rev 258)
+++ console-setup/debian/control 2007-07-15 12:58:44 UTC (rev 259)
@@ -67,3 +67,68 @@
the source BDF font should be 7, 8 or 9 pixels, otherwise the
converter creates fonts suitable for framebuffer only.
+Package: console-setup-udeb
+Section: debian-installer
+Priority: extra
+Depends: console-setup-ekmap, console-setup-fonts-udeb, archdetect, cdebconf-udeb, kbd-udeb
+Architecture: all
+Description: Configure the keyboard
+ This is an experimental replacement of kbd-chooser.
+XC-Package-Type: udeb
+XB-Installer-Menu-Item: 1200
+
+Package: console-setup-amiga-ekmap
+Provides: console-setup-ekmap
+Section: debian-installer
+Priority: extra
+Architecture: all
+Description: Encoded keyboard layouts for amiga keyboards
+XC-Package-Type: udeb
+
+Package: console-setup-ataritt-ekmap
+Provides: console-setup-ekmap
+Section: debian-installer
+Priority: extra
+Architecture: all
+Description: Encoded keyboard layouts for ataritt keyboards
+XC-Package-Type: udeb
+
+Package: console-setup-macintoshold-ekmap
+Provides: console-setup-ekmap
+Section: debian-installer
+Priority: extra
+Architecture: all
+Description: Encoded keyboard layouts for macintoshold keyboards
+XC-Package-Type: udeb
+
+Package: console-setup-pc-ekmap
+Provides: console-setup-ekmap
+Section: debian-installer
+Priority: extra
+Architecture: all
+Description: Encoded keyboard layouts for pc keyboards
+XC-Package-Type: udeb
+
+Package: console-setup-sun4-ekmap
+Provides: console-setup-ekmap
+Section: debian-installer
+Priority: extra
+Architecture: all
+Description: Encoded keyboard layouts for sun4 keyboards
+XC-Package-Type: udeb
+
+Package: console-setup-sun5-ekmap
+Provides: console-setup-ekmap
+Section: debian-installer
+Priority: extra
+Architecture: all
+Description: Encoded keyboard layouts for sun5 keyboards
+XC-Package-Type: udeb
+
+Package: console-setup-fonts-udeb
+Section: debian-installer
+Priority: extra
+Architecture: all
+Description: Console fonts for Debian Installer
+XC-Package-Type: udeb
+
Deleted: console-setup/debian/control-udeb
===================================================================
--- console-setup/debian/control-udeb 2007-07-02 12:41:30 UTC (rev 258)
+++ console-setup/debian/control-udeb 2007-07-15 12:58:44 UTC (rev 259)
@@ -1,66 +0,0 @@
-Package: console-setup-udeb
-Section: debian-installer
-Priority: extra
-Depends: console-setup-ekmap, archdetect, cdebconf-udeb
-Architecture: all
-Description: Configure the keyboard
- This is an experimental replacement of kbd-chooser. It depends on
- loadkeys which does not exist in the installer currently.
-XC-Package-Type: udeb
-XB-Installer-Menu-Item: 1200
-
-Package: console-setup-amiga-ekmap
-Provides: console-setup-ekmap
-Section: debian-installer
-Priority: extra
-Architecture: all
-Description: Encoded keyboard layouts for amiga keyboards
-XC-Package-Type: udeb
-
-Package: console-setup-ataritt-ekmap
-Provides: console-setup-ekmap
-Section: debian-installer
-Priority: extra
-Architecture: all
-Description: Encoded keyboard layouts for ataritt keyboards
-XC-Package-Type: udeb
-
-Package: console-setup-macintoshold-ekmap
-Provides: console-setup-ekmap
-Section: debian-installer
-Priority: extra
-Architecture: all
-Description: Encoded keyboard layouts for macintoshold keyboards
-XC-Package-Type: udeb
-
-Package: console-setup-pc-ekmap
-Provides: console-setup-ekmap
-Section: debian-installer
-Priority: extra
-Architecture: all
-Description: Encoded keyboard layouts for pc keyboards
-XC-Package-Type: udeb
-
-Package: console-setup-sun4-ekmap
-Provides: console-setup-ekmap
-Section: debian-installer
-Priority: extra
-Architecture: all
-Description: Encoded keyboard layouts for sun4 keyboards
-XC-Package-Type: udeb
-
-Package: console-setup-sun5-ekmap
-Provides: console-setup-ekmap
-Section: debian-installer
-Priority: extra
-Architecture: all
-Description: Encoded keyboard layouts for sun5 keyboards
-XC-Package-Type: udeb
-
-Package: console-setup-fonts-udeb
-Section: debian-installer
-Priority: extra
-Architecture: all
-Description: Console fonts for Debian Installer
-XC-Package-Type: udeb
-
Modified: console-setup/debian/rules
===================================================================
--- console-setup/debian/rules 2007-07-02 12:41:30 UTC (rev 258)
+++ console-setup/debian/rules 2007-07-15 12:58:44 UTC (rev 259)
@@ -51,7 +51,7 @@
dh_clean
.PHONY : install
-install: install-main install-mini install-bdf2psf
+install: install-main install-mini install-bdf2psf install-udeb
.PHONY : install-main
install-main: build
@@ -205,6 +205,12 @@
dh_link -pconsole-setup-udeb usr/bin/ckbcomp-mini usr/bin/ckbcomp
dh_install -pconsole-setup-udeb setupcon bin
dh_install -p console-setup-udeb debian/console-setup.config usr/share/console-setup-mini
+ dh_installdirs -p console-setup-udeb lib/debian-installer.d
+ install -m0644 debian/console-setup-udeb.startup \
+ debian/console-setup-udeb/lib/debian-installer.d/S55console-setup
+ dh_installdirs -p console-setup-udeb usr/lib/base-installer.d
+ install -m0755 debian/console-setup-udeb.base-installer \
+ debian/console-setup-udeb/usr/lib/base-installer.d/20console-setup
dh_installdirs -p console-setup-udeb etc/default
dh_installdirs -p console-setup-udeb etc/console-setup/
dh_installdirs -p console-setup-udeb usr/share/doc/console-setup-mini/examples/
More information about the Pkg-kbd-commit
mailing list