Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=0571e88cd63873b504f4034c8406dd9bbeb766bc
commit 0571e88cd63873b504f4034c8406dd9bbeb766bc Author: Michel Hermier <herm...@frugalware.org> Date: Wed Dec 1 13:24:15 2010 +0100 kbd-1.15.2-2-i686 * Remove rc.font and rc.keymap. systemd provide support for that. diff --git a/source/base/kbd/FrugalBuild b/source/base/kbd/FrugalBuild index 68c9378..f645fa4 100644 --- a/source/base/kbd/FrugalBuild +++ b/source/base/kbd/FrugalBuild @@ -3,7 +3,7 @@ pkgname=kbd pkgver=1.15.2 -pkgrel=1 +pkgrel=2 pkgdesc="Keyboard maps and console fonts" url="ftp://ftp.altlinux.org/pub/people/legion/kbd/"; _F_archive_grepv="wip\|rc" @@ -13,23 +13,13 @@ groups=('base') archs=('i686' 'x86_64' 'ppc') backup=(etc/sysconfig/font) source=($url/$pkgname-$pkgver.tar.gz \ - rc.font rc.font-{de,hu}.po rc.keymap rc.keymap-{de,hu}.po \ font) sha1sums=('6252a2bf6b897416719dc976e3ac26cf28e6e932' \ - '72aee792be75d38defbde653c2ff06e8c56586dc' \ - '7b1e17e399608f54ff70ac22cf8e697e01ea6b23' \ - 'd385735e880bea9f8444dfbc5144007eaaffee32' \ - 'ddb2af28b950d816bf5ae7d1d121d59fb0f71cee' \ - 'beceda61cdf168e4063873a9ea6312dbc8284613' \ - 'b9c50c54c7f3b1efce7858a39b0dd7490cc742a3' \ '84e361527f415ef4d560b3e6affea0d463d544de') build() { Fbuild --enable-optional-progs - # init script - Frcd2 font - Frcd2 keymap # config Ffile /etc/sysconfig/font } diff --git a/source/base/kbd/kbd.install b/source/base/kbd/kbd.install index ffad3f4..5428627 100644 --- a/source/base/kbd/kbd.install +++ b/source/base/kbd/kbd.install @@ -1,16 +1,7 @@ -# arg 1: the new package version -post_install() -{ - cd /etc/rc.d/rcS.d - ln -sf ../rc.font S05rc.font - chkconfig --add rc.keymap -} -# arg 1: the new package version -# arg 2: the old package version post_upgrade() { - post_install $1 + pre_remove "$@" if [ ! -f /etc/sysconfig/keymap ] ; then echo -e '# /etc/sysconfig/keymap\n' > /etc/sysconfig/keymap echo -n '# specifiy the keyboard map, ' >> /etc/sysconfig/keymap @@ -22,11 +13,9 @@ post_upgrade() fi } -# arg 1: the old package version pre_remove() { rm /etc/rc.d/rcS.d/S05rc.font - chkconfig --del rc.keymap } op=$1 diff --git a/source/base/kbd/pot/rc.font.pot b/source/base/kbd/pot/rc.font.pot deleted file mode 100644 index 184899f..0000000 --- a/source/base/kbd/pot/rc.font.pot +++ /dev/null @@ -1,25 +0,0 @@ -# rc.font. -# Copyright (C) YEAR THE rc.font'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.font package. -# FIRST AUTHOR <em...@address>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: rc.font\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-19 12:41+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <em...@address>\n" -"Language-Team: LANGUAGE <l...@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: rc.font:28 -msgid "Loading console font" -msgstr "" - -#: rc.font:40 -msgid "Press F2 for verbose mode" -msgstr "" diff --git a/source/base/kbd/pot/rc.keymap.pot b/source/base/kbd/pot/rc.keymap.pot deleted file mode 100644 index 8538ac0..0000000 --- a/source/base/kbd/pot/rc.keymap.pot +++ /dev/null @@ -1,25 +0,0 @@ -# rc.keymap. -# Copyright (C) YEAR THE rc.keymap'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.keymap package. -# FIRST AUTHOR <em...@address>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: rc.keymap\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-19 12:46+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <em...@address>\n" -"Language-Team: LANGUAGE <l...@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: rc.keymap:18 -msgid "Loading keyboard map" -msgstr "" - -#: rc.keymap:26 -msgid "You haven't set a keymap in /etc/sysconfig/keymap" -msgstr "" diff --git a/source/base/kbd/rc.font b/source/base/kbd/rc.font deleted file mode 100644 index cc9ce04..0000000 --- a/source/base/kbd/rc.font +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -# (c) 2003-2006 Miklos Vajna <vmik...@frugalware.org> -# (c) 2005 Marcus Habermehl <bmh198...@yahoo.de> -# rc.font for Frugalware -# distributed under GPL License - -source /lib/initscripts/functions -TEXTDOMAIN=font -TEXTDOMAINDIR=/lib/initscripts/messages - -if [[ "$2" != "S" ]] ; then - msg $"Loading console font" -fi - -if [ -e /etc/sysconfig/font ] ; then - source /etc/sysconfig/font - if [ ! -z ${font} ] ; then - for i in `seq 1 12` - do - setfont ${font} -C /dev/tty$i - done - retval=$? - if [[ "$2" != "S" ]] ; then - ok ${retval} - fi - fi -fi - -if echo $LANG |grep -qi utf; then - kbd_mode -u - dumpkeys |loadkeys --unicode - echo -n -e '\033%G' -else - kbd_mode -a - echo -n -e '\033%@' -fi diff --git a/source/base/kbd/rc.font-de.po b/source/base/kbd/rc.font-de.po deleted file mode 100644 index 4ba892f..0000000 --- a/source/base/kbd/rc.font-de.po +++ /dev/null @@ -1,25 +0,0 @@ -# rc.font. -# Copyright (C) 2005 THE rc.font'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.font package. -# Marcus Habermehl <bmh198...@yahoo.de>, 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.font\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-19 12:41+0100\n" -"PO-Revision-Date: 2005-11-19 12:43+0100\n" -"Last-Translator: Marcus Habermehl <bmh198...@yahoo.de>\n" -"Language-Team: German <translation-team...@lists.sourceforge.net>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: rc.font:28 -msgid "Loading console font" -msgstr "Lade Konsolenfont" - -#: rc.font:40 -msgid "Press F2 for verbose mode" -msgstr "Drücken Sie F2 für Systemmeldungen" diff --git a/source/base/kbd/rc.font-hu.po b/source/base/kbd/rc.font-hu.po deleted file mode 100644 index d9e456a..0000000 --- a/source/base/kbd/rc.font-hu.po +++ /dev/null @@ -1,25 +0,0 @@ -# rc.font. -# Copyright (C) 2005 THE rc.font'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.font package. -# Marcus Habermehl <bmh198...@yahoo.de>, 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.font\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-19 12:41+0100\n" -"PO-Revision-Date: 2005-11-19 12:42+0100\n" -"Last-Translator: Marcus Habermehl <bmh198...@yahoo.de>\n" -"Language-Team: Hungarian <translation-team...@lists.sourceforge.net>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: rc.font:28 -msgid "Loading console font" -msgstr "A konzol betûtípusának betöltése" - -#: rc.font:40 -msgid "Press F2 for verbose mode" -msgstr "Üssön F2-t részletes módhoz" diff --git a/source/base/kbd/rc.keymap b/source/base/kbd/rc.keymap deleted file mode 100644 index 890ccdb..0000000 --- a/source/base/kbd/rc.keymap +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# (c) 2005 Marcus Habermehl <bmh198...@yahoo.de> -# (c) 2003 Vajna Miklos <vmik...@frugalware.org> -# rc.keymap for FrugalWare -# distributed under GPL License - -# chkconfig: 2345 80 50 -# description: Load the keyboard map, specified in /etc/sysconfig/keymap - -source /lib/initscripts/functions -TEXTDOMAIN=keymap -TEXTDOMAINDIR=/lib/initscripts/messages - -actions=(start stop status) - -pid="test -f /var/lock/subsys/keymap && echo running" - -rc_start() -{ - msg $"Loading keyboard map" - if [ -f /etc/sysconfig/keymap ] ; then - source /etc/sysconfig/keymap - if [ ! -z ${keymap} ] ; then - loadkeys ${keymap} >/dev/null - ok $? - else - ok 999 - hint $"You haven't set a keymap in /etc/sysconfig/keymap" - fi - else - ok 999 - fi - if ! echo $LANG |grep -qi utf; then - for i in `seq 1 12` - do - kbd_mode -a -C /dev/tty$i - echo -n -e '\033%@' > /dev/tty$i - done - fi - [ -d /var/lock/subsys ] || mkdir -p /var/lock/subsys - touch /var/lock/subsys/keymap -} - -rc_stop() -{ - rm -f /var/lock/subsys/keymap -} - -rc_exec $1 diff --git a/source/base/kbd/rc.keymap-de.po b/source/base/kbd/rc.keymap-de.po deleted file mode 100644 index c96c774..0000000 --- a/source/base/kbd/rc.keymap-de.po +++ /dev/null @@ -1,25 +0,0 @@ -# rc.keymap. -# Copyright (C) 2005 THE rc.keymap'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.keymap package. -# Marcus Habermehl <bmh198...@yahoo.de>, 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.keymap\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-19 12:46+0100\n" -"PO-Revision-Date: 2005-11-19 13:10+0100\n" -"Last-Translator: Marcus Habermehl <bmh198...@yahoo.de>\n" -"Language-Team: German <translation-team...@lists.sourceforge.net>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: rc.keymap:18 -msgid "Loading keyboard map" -msgstr "Lade Tastaturbelegung" - -#: rc.keymap:26 -msgid "You haven't set a keymap in /etc/sysconfig/keymap" -msgstr "Sie haben keine Tastaturbelegung in /etc/sysconfig/keymap eingestellt" diff --git a/source/base/kbd/rc.keymap-hu.po b/source/base/kbd/rc.keymap-hu.po deleted file mode 100644 index e35d10b..0000000 --- a/source/base/kbd/rc.keymap-hu.po +++ /dev/null @@ -1,25 +0,0 @@ -# rc.keymap. -# Copyright (C) 2005 THE rc.keymap'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.keymap package. -# Marcus Habermehl <bmh198...@yahoo.de>, 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.keymap\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-19 12:46+0100\n" -"PO-Revision-Date: 2005-11-19 12:47+0100\n" -"Last-Translator: Marcus Habermehl <bmh198...@yahoo.de>\n" -"Language-Team: Hungarian <translation-team...@lists.sourceforge.net>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: rc.keymap:18 -msgid "Loading keyboard map" -msgstr "A billentyûzetkiosztás betöltése" - -#: rc.keymap:26 -msgid "You haven't set a keymap in /etc/sysconfig/keymap" -msgstr "Nincs beállítva billentyûzet kiosztás a /etc/sysconfig/keymap fájlban"
_______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
