This patch adds the xkeyboard-config package and adds a warning that
xkbdata is deprecated. This is just a first step to updating to Xorg-7.2.
---
BOOK/general.ent | 1 +
BOOK/introduction/welcome/changelog.xml | 4 +
BOOK/x/installing/installing.xml | 1 +
BOOK/x/installing/x7data.xml | 4 +
BOOK/x/installing/x7server.xml | 3 +-
BOOK/x/installing/xkeyboard-config.xml | 120 +++++++++++++++++++++++++++++++
6 files changed, 132 insertions(+), 1 deletions(-)
create mode 100644 BOOK/x/installing/xkeyboard-config.xml
diff --git a/BOOK/general.ent b/BOOK/general.ent
index f252a9a..c662ca6 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -384,6 +384,7 @@ $Date$
<!ENTITY xfree86-version "4.6.0">
<!ENTITY xorg7-version "7.1">
<!ENTITY luit-version "1.0.2">
+<!ENTITY xkeyboard-config-version "0.9">
<!ENTITY xbitmaps-version "1.0.1">
<!ENTITY xorg-server-version "1.1.1">
<!ENTITY libdrm-version "2.0.1">
diff --git a/BOOK/introduction/welcome/changelog.xml
b/BOOK/introduction/welcome/changelog.xml
index 4e479c0..05ebaa1 100644
--- a/BOOK/introduction/welcome/changelog.xml
+++ b/BOOK/introduction/welcome/changelog.xml
@@ -48,6 +48,10 @@
<para>[dnicholson] - Fix the installation of the mail extensions
to go to the correct directory in Thunderbird.</para>
</listitem>
+ <listitem>
+ <para>[dnicholson] - Added the XKeyboardConfig package, which
+ replaces xkbdata for Xorg-7.</para>
+ </listitem>
</itemizedlist>
</listitem>
diff --git a/BOOK/x/installing/installing.xml b/BOOK/x/installing/installing.xml
index d8bf927..d349911 100644
--- a/BOOK/x/installing/installing.xml
+++ b/BOOK/x/installing/installing.xml
@@ -56,6 +56,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="x7app.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="x7data.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="x7font.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="xkeyboard-config.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="luit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="x7server.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="x7driver.xml"/>
diff --git a/BOOK/x/installing/x7data.xml b/BOOK/x/installing/x7data.xml
index 7746c7e..3d5ecb4 100644
--- a/BOOK/x/installing/x7data.xml
+++ b/BOOK/x/installing/x7data.xml
@@ -83,6 +83,10 @@ wget -B
http://xorg.freedesktop.org/releases/individual/data/ \
<sect2 role="installation">
<title>Installation of Xorg Data</title>
+ <warning><para>The <application>xkbdata</application> package is
+ deprecated and should not be installed. It has been replaced by
+ <xref linkend="xkeyboard-config"/>.</para></warning>
+
<para>Compile the selected packages with the following commands:</para>
<screen><userinput>./configure $XORG_CONFIG &&
diff --git a/BOOK/x/installing/x7server.xml b/BOOK/x/installing/x7server.xml
index f414bcf..46dd4a1 100644
--- a/BOOK/x/installing/x7server.xml
+++ b/BOOK/x/installing/x7server.xml
@@ -68,7 +68,8 @@
<bridgehead renderas="sect3">Xorg Server Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
- <para role="required"><xref linkend="xorg7-font"/></para>
+ <para role="required"><xref linkend="xorg7-font"/> and
+ <xref linkend="xkeyboard-config"/></para>
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional"><xref linkend="mesalib"/> and
diff --git a/BOOK/x/installing/xkeyboard-config.xml
b/BOOK/x/installing/xkeyboard-config.xml
new file mode 100644
index 0000000..60ce074
--- /dev/null
+++ b/BOOK/x/installing/xkeyboard-config.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
+ %general-entities;
+
+ <!ENTITY xkeyboard-config-download-http
"http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-&xkeyboard-config-version;.tar.bz2";>
+ <!ENTITY xkeyboard-config-download-ftp
"ftp://ftp.x.org/pub/current/src/extras/xkeyboard-config-&xkeyboard-config-version;.tar.bz2";>
+ <!ENTITY xkeyboard-config-md5sum "52afe60101ace8532881e70f6c2dc020">
+ <!ENTITY xkeyboard-config-size "461 KB">
+ <!ENTITY xkeyboard-config-buildsize "8.1 MB">
+ <!ENTITY xkeyboard-config-time "less than 0.1 SBU">
+]>
+
+<sect1 id="xkeyboard-config"
xreflabel="xkeyboard-config-&xkeyboard-config-version;">
+ <?dbhtml filename="xkeyboard-config.html"?>
+
+ <sect1info>
+ <othername>$LastChangedBy$</othername>
+ <date>$Date$</date>
+ </sect1info>
+
+ <title>XKeyboardConfig-&xkeyboard-config-version;</title>
+
+ <indexterm zone="xkeyboard-config">
+ <primary sortas="a-XKeyboardConfig">XKeyboardConfig</primary>
+ </indexterm>
+
+ <!--Required section-->
+ <sect2 role="package">
+ <title>Introduction to XKeyboardConfig</title>
+
+ <para>The <application>XKeyboardConfig</application> package contains
+ the keyboard configuration database for the X Window System.</para>
+
+ <bridgehead renderas="sect3">Package Information</bridgehead>
+ <itemizedlist spacing="compact">
+ <listitem>
+ <para>Download (HTTP): <ulink
url="&xkeyboard-config-download-http;"/></para>
+ </listitem>
+ <listitem>
+ <para>Download (FTP): <ulink
url="&xkeyboard-config-download-ftp;"/></para>
+ </listitem>
+ <listitem>
+ <para>Download MD5 sum: &xkeyboard-config-md5sum;</para>
+ </listitem>
+ <listitem>
+ <para>Download size: &xkeyboard-config-size;</para>
+ </listitem>
+ <listitem>
+ <para>Estimated disk space required:
&xkeyboard-config-buildsize;</para>
+ </listitem>
+ <listitem>
+ <para>Estimated build time: &xkeyboard-config-time;</para>
+ </listitem>
+ </itemizedlist>
+
+ <bridgehead renderas="sect3">XKeyboardConfig Dependencies</bridgehead>
+
+ <bridgehead renderas="sect4">Required</bridgehead>
+ <para role="required"><xref linkend="xorg7-app"/> and
+ <xref linkend="intltool"/></para>
+
+ <para condition="html" role="usernotes">User Notes:
+ <ulink url="&blfs-wiki;/xkeyboard-config"/></para>
+
+ </sect2>
+
+ <sect2 role="installation">
+ <title>Installation of XKeyboardConfig</title>
+
+ <para>Install <application>XKeyboardConfig</application> by running the
+ following commands:</para>
+
+<screen><userinput>./configure $XORG_CONFIG
--with-xkb-base=$XORG_PREFIX/share/X11/xkb \
+ --with-xkb-rules-symlink=xorg &&
+make</userinput></screen>
+
+ <para>This package does not come with a test suite.</para>
+
+ <para>Now, as the <systemitem class="username">root</systemitem>
user:</para>
+
+<screen role="root"><userinput>make install &&
+install -dv -m755
$XORG_PREFIX/share/doc/xkeyboard-config-&xkeyboard-config-version; &&
+install -v -m644 docs/{README,HOWTO}*
$XORG_PREFIX/share/doc/xkeyboard-config-&xkeyboard-config-version;</userinput></screen>
+
+ </sect2>
+
+ <sect2 role="commands">
+ <title>Command Explanations</title>
+
+ <para><parameter>--with-xkb-base=$XORG_PREFIX/share/X11/xkb</parameter>:
+ This parameter sets the installation directory for the keyboard data to
+ the location where <xref linkend="xorg7-server"/> expects it.</para>
+
+ <para><parameter>--with-xkb-rules-symlink=xorg</parameter>: By default,
+ the XKB rules installed are named "base". This creates symlinks named
+ "xorg" to those rules, which is the default name used by Xorg.</para>
+
+ </sect2>
+
+ <sect2 role="content">
+ <title>Contents</title>
+
+ <segmentedlist>
+ <segtitle>Installed Programs</segtitle>
+ <segtitle>Installed Libraries</segtitle>
+ <segtitle>Installed Directory</segtitle>
+
+ <seglistitem>
+ <seg>None</seg>
+ <seg>None</seg>
+ <seg><envar>$XORG_PREFIX</envar>/share/X11/xkb,
+
<envar>$XORG_PREFIX</envar>/share/doc/xkeyboard-config-&xkeyboard-config-version;</seg>
+ </seglistitem>
+ </segmentedlist>
+
+ </sect2>
+
+</sect1>
--
1.5.1.3
--
http://linuxfromscratch.org/mailman/listinfo/blfs-dev
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
