[Pkg-kbd-commit] r196 - people/zinoviev/console-setup/debian
Anton Zinoviev
zinoviev at costa.debian.org
Sat Jul 22 18:52:47 UTC 2006
Author: zinoviev
Date: 2006-07-22 18:52:46 +0000 (Sat, 22 Jul 2006)
New Revision: 196
Added:
people/zinoviev/console-setup/debian/console-setup-udeb.postinst
people/zinoviev/console-setup/debian/console-setup-udeb.templates
Modified:
people/zinoviev/console-setup/debian/config.proto
people/zinoviev/console-setup/debian/console-setup.postinst
people/zinoviev/console-setup/debian/console-setup.templates
people/zinoviev/console-setup/debian/control
people/zinoviev/console-setup/debian/rules
Log:
console-setup: New udebs
Modified: people/zinoviev/console-setup/debian/config.proto
===================================================================
--- people/zinoviev/console-setup/debian/config.proto 2006-07-22 11:25:06 UTC (rev 195)
+++ people/zinoviev/console-setup/debian/config.proto 2006-07-22 18:52:46 UTC (rev 196)
@@ -136,7 +136,6 @@
# The guess arch code is taken from "console-data.conf"
# (translated from Perl to shell)
-# TODO: use archdetect instead.
# SUBARCH KEYMAP SET DETECTION
# m68k/atari atari "Model: Atari"
@@ -157,6 +156,11 @@
guess_arch () {
local arch subarch line
+ if which archdetect >/dev/null; then
+ archdetect
+ return 0
+ fi
+
arch=`dpkg --print-installation-architecture`
if [ "$arch" = 'powerpc' -o "$arch" = 'm68k' ]; then
@@ -223,9 +227,16 @@
uniq
}
-eval `locale` # TODO: d-i
+if which locale >/dev/null; then
+ eval `locale`
+fi
-locale=$LC_CTYPE
+if [ "$LC_CTYPE" -a "$LC_CTYPE" != C ]; then
+ locale=$LC_CTYPE
+else
+ db_get debian-installer/locale
+ locale="$RET"
+fi
case "$locale" in
*KOI8*|*koi8*)
@@ -858,8 +869,11 @@
;;
esac
-# TODO: d-i
-default_charmap=`locale charmap`
+if which locale >/dev/null; then
+ default_charmap=`locale charmap`
+else
+ default_charmap=unknown # TODO: d-i
+fi
if [ "$locale" = C ]; then
default_charmap=UTF-8
charmap_priority=high
@@ -867,73 +881,85 @@
charmap_priority=low
else
default_charmap=UTF-8
- charmap_priority=medium
+ charmap_priority=high
fi
arch=`guess_arch`
case "$arch" in
- i386)
+ alpha*)
default_model=pc105
model_priority=medium
;;
- sparc)
- default_model=sun4 # also sun5, pc105
- model_priority=critical
- ;;
- alpha)
+ amd64*)
default_model=pc105
model_priority=medium
;;
- arm)
+ arm*)
default_model=pc105
model_priority=medium
;;
- arm/riscpc)
+ i386*)
default_model=pc105
model_priority=medium
;;
- mips)
+ ia64*)
default_model=pc105
model_priority=medium
;;
+ m68k/amiga)
+ default_model=amiga
+ model_priority=medium
+ ;;
m68k/atari)
default_model=ataritt
model_priority=medium
;;
- m68k/amiga)
- default_model=amiga
- model_priority=medium
- ;;
m68k/mac)
default_model=macintosh_old
model_priority=medium
;;
- m68k/mvme)
+ m68k/sun*)
+ default_model=sun4 # also sun5, pc105
+ model_priority=critical
+ ;;
+ m68k/*vme*)
default_model=pc105
model_priority=medium
;;
- m68k/bvme)
+ mips*)
default_model=pc105
model_priority=medium
;;
powerpc/amiga)
- default_model=amiga # apus
+ default_model=amiga
model_priority=medium
;;
- powerpc/chrp)
- default_model=pc105 # also macintosh_old
+ powerpc/apus)
+ default_model=amiga
+ model_priority=medium
+ ;;
+ powerpc/chrp*)
+ default_model=pc105 # also macintosh_old and maybe amiga
model_priority=critical
;;
powerpc/mac)
default_model=pc105
model_priority=medium
;;
+ powerpc/powermac*)
+ default_model=pc105
+ model_priority=medium
+ ;;
powerpc/prep)
default_model=pc105
model_priority=medium
;;
- amd64)
+ sparc*)
+ default_model=sun4 # also sun5, pc105
+ model_priority=critical
+ ;;
+ s390*)
default_model=pc105
model_priority=medium
;;
Added: people/zinoviev/console-setup/debian/console-setup-udeb.postinst
===================================================================
--- people/zinoviev/console-setup/debian/console-setup-udeb.postinst 2006-07-22 11:25:06 UTC (rev 195)
+++ people/zinoviev/console-setup/debian/console-setup-udeb.postinst 2006-07-22 18:52:46 UTC (rev 196)
@@ -0,0 +1 @@
+link console-setup.postinst
\ No newline at end of file
Property changes on: people/zinoviev/console-setup/debian/console-setup-udeb.postinst
___________________________________________________________________
Name: svn:special
+ *
Added: people/zinoviev/console-setup/debian/console-setup-udeb.templates
===================================================================
--- people/zinoviev/console-setup/debian/console-setup-udeb.templates 2006-07-22 11:25:06 UTC (rev 195)
+++ people/zinoviev/console-setup/debian/console-setup-udeb.templates 2006-07-22 18:52:46 UTC (rev 196)
@@ -0,0 +1 @@
+link console-setup.templates
\ No newline at end of file
Property changes on: people/zinoviev/console-setup/debian/console-setup-udeb.templates
___________________________________________________________________
Name: svn:special
+ *
Modified: people/zinoviev/console-setup/debian/console-setup.postinst
===================================================================
--- people/zinoviev/console-setup/debian/console-setup.postinst 2006-07-22 11:25:06 UTC (rev 195)
+++ people/zinoviev/console-setup/debian/console-setup.postinst 2006-07-22 18:52:46 UTC (rev 196)
@@ -23,7 +23,10 @@
md5sum=true
fi
-echo 11111 >>/tmp/clog
+# In d-i the config script is not executed automatically
+if [ -f /usr/share/console-setup-mini/console-setup.config ]; then
+ . /usr/share/console-setup-mini/console-setup.config
+fi
CONFIGDIR=/etc/console-setup
CONFIGFILE=/etc/default/console-setup
@@ -31,12 +34,8 @@
# 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
@@ -65,8 +64,6 @@
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"
@@ -93,9 +90,6 @@
. $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" ] \
@@ -124,28 +118,20 @@
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
+ sed \
+ -e "s|^ *ACTIVE_CONSOLES=.*|ACTIVE_CONSOLES=\"$ttys\"|" \
+ -e "s|^ *CHARMAP=.*|CHARMAP=\"$charmap\"|" \
+ -e "s|^ *CODESET=.*|CODESET=\"$codeset\"|" \
+ -e "s|^ *FONTFACE=.*|FONTFACE=\"$fontface\"|" \
+ -e "s|^ *FONTSIZE=.*|FONTSIZE=\"$fontsize\"|" \
+ -e "s|^ *XKBMODEL=.*|XKBMODEL=\"$model\"|" \
+ -e "s|^ *XKBLAYOUT=.*|XKBLAYOUT=\"$layout\"|" \
+ -e "s|^ *XKBVARIANT=.*|XKBVARIANT=\"$variant\"|" \
+ -e "s|^ *XKBOPTIONS=.*|XKBOPTIONS=\"$options\"|" \
+ -e "s|^ *BOOTTIME_KMAP_MD5=.*|BOOTTIME_KMAP_MD5=\"$BOOTTIME_KMAP_MD5\"|" \
+ <$CONFIGFILE >$CONFIGFILE.tmp
mv -f $CONFIGFILE.tmp $CONFIGFILE
fi
-echo 66666 >>/tmp/clog
-
#DEBHELPER#
Modified: people/zinoviev/console-setup/debian/console-setup.templates
===================================================================
--- people/zinoviev/console-setup/debian/console-setup.templates 2006-07-22 11:25:06 UTC (rev 195)
+++ people/zinoviev/console-setup/debian/console-setup.templates 2006-07-22 18:52:46 UTC (rev 196)
@@ -130,7 +130,7 @@
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,
+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
Modified: people/zinoviev/console-setup/debian/control
===================================================================
--- people/zinoviev/console-setup/debian/control 2006-07-22 11:25:06 UTC (rev 195)
+++ people/zinoviev/console-setup/debian/control 2006-07-22 18:52:46 UTC (rev 196)
@@ -40,6 +40,70 @@
This package supports only UTF-8. The legacy 8-bit encodings are not
supported.
+Package: console-setup-udeb
+Section: debian-installer
+Priority: optional
+Depends: console-setup-ekmap
+Architecture: all
+Description: Configure the keyboard
+XC-Package-Type: udeb
+XB-Installer-Menu-Item: 12
+
+Package: console-setup-amiga-ekmap
+Provides: console-setup-ekmap
+Section: debian-installer
+Priority: optional
+Architecture: all
+Description: Keyboard layouts for amiga keyboards
+XC-Package-Type: udeb
+
+Package: console-setup-ataritt-ekmap
+Provides: console-setup-ekmap
+Section: debian-installer
+Priority: optional
+Architecture: all
+Description: Keyboard layouts for ataritt keyboards
+XC-Package-Type: udeb
+
+Package: console-setup-macintoshold-ekmap
+Provides: console-setup-ekmap
+Section: debian-installer
+Priority: optional
+Architecture: all
+Description: Keyboard layouts for macintoshold keyboards
+XC-Package-Type: udeb
+
+Package: console-setup-pc-ekmap
+Provides: console-setup-ekmap
+Section: debian-installer
+Priority: optional
+Architecture: all
+Description: Keyboard layouts for pc keyboards
+XC-Package-Type: udeb
+
+Package: console-setup-sun4-ekmap
+Provides: console-setup-ekmap
+Section: debian-installer
+Priority: optional
+Architecture: all
+Description: Keyboard layouts for sun4 keyboards
+XC-Package-Type: udeb
+
+Package: console-setup-sun5-ekmap
+Provides: console-setup-ekmap
+Section: debian-installer
+Priority: optional
+Architecture: all
+Description: Keyboard layouts for sun5 keyboards
+XC-Package-Type: udeb
+
+Package: console-setup-fonts-udeb
+Section: debian-installer
+Priority: optional
+Architecture: all
+Description: Console fonts for Debian Installer
+XC-Package-Type: udeb
+
Package: bdf2psf
Architecture: all
Section: utils
Modified: people/zinoviev/console-setup/debian/rules
===================================================================
--- people/zinoviev/console-setup/debian/rules 2006-07-22 11:25:06 UTC (rev 195)
+++ people/zinoviev/console-setup/debian/rules 2006-07-22 18:52:46 UTC (rev 196)
@@ -101,6 +101,69 @@
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-*-ekmap
+ dh_install -pconsole-setup-amiga-ekmap Keyboard/amiga.ekmap.gz \
+ usr/share/console-setup-mini
+ dh_install -pconsole-setup-ataritt-ekmap Keyboard/ataritt.ekmap.gz \
+ usr/share/console-setup-mini
+ dh_install -pconsole-setup-macintoshold-ekmap Keyboard/macintosh_old.ekmap.gz \
+ usr/share/console-setup-mini
+ dh_install -pconsole-setup-pc-ekmap Keyboard/pc105.ekmap.gz \
+ usr/share/console-setup-mini
+ dh_install -pconsole-setup-sun4-ekmap Keyboard/sun4.ekmap.gz \
+ usr/share/console-setup-mini
+ dh_install -pconsole-setup-sun5-ekmap Keyboard/sun5.ekmap.gz \
+ usr/share/console-setup-mini
+# console-setup-fonts-udeb
+ dh_install -pconsole-setup-fonts-udeb Fonts/Arabic-VGA16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-fonts-udeb Fonts/Armenian-Fixed16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-fonts-udeb Fonts/CyrAsia-Fixed16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-fonts-udeb Fonts/CyrKoi-TerminusBold16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-fonts-udeb Fonts/CyrSlav-TerminusBold16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-fonts-udeb Fonts/Ethiopian-Goha16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-fonts-udeb Fonts/Georgian-Fixed16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-fonts-udeb Fonts/Greek-VGA16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-fonts-udeb Fonts/Hebrew-VGA16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-fonts-udeb Fonts/Lao-Fixed16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-fonts-udeb Fonts/Lat15-TerminusBold16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-fonts-udeb Fonts/Lat2-TerminusBold16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-fonts-udeb Fonts/Lat38-VGA16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-fonts-udeb Fonts/Lat7-TerminusBold16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-fonts-udeb Fonts/Thai-Fixed16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-fonts-udeb Fonts/Uni1-VGA16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-fonts-udeb Fonts/Uni2-VGA16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-fonts-udeb Fonts/Uni3-Fixed16.psf.gz \
+ usr/share/consolefonts
+ dh_install -pconsole-setup-fonts-udeb Fonts/Vietnamese-Fixed16.psf.gz \
+ usr/share/consolefonts
+# console-setup-udeb
+ dh_install -pconsole-setup-udeb Keyboard/ckbcomp-mini usr/bin
+ 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 etc/default
+ dh_installdirs -p console-setup-udeb etc/console-setup/
+ dh_installdirs -p console-setup-udeb usr/share/doc/console-setup-mini/examples/
+ cp config debian/console-setup-udeb/usr/share/doc/console-setup-mini/examples/console-setup
+ rm -rf `find debian/console-setup-udeb -name .cvsignore`
+ rm -rf `find debian/console-setup-udeb -name .svn`
# console-setup
$(MAKE) etcdir=debian/console-setup/etc \
prefix=debian/console-setup/usr install
More information about the Pkg-kbd-commit
mailing list