From 759586ea857b123073c1639f739b1b295840bfe2 Mon Sep 17 00:00:00 2001 From: DJ Lucas Date: Wed, 26 Nov 2008 21:57:09 +0000 Subject: [PATCH] Corrections from last night's commits, plus minor cleanup of Changlog entries. git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@7618 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- general/genlib/libdrm.xml | 2 ++ introduction/welcome/changelog.xml | 16 ++++++++++++++-- x/installing/libxcb.xml | 9 --------- x/installing/luit.xml | 5 ++++- x/installing/x7font.xml | 2 ++ x/installing/x7lib.xml | 2 ++ x/installing/x7proto.xml | 4 ++++ x/installing/x7util.xml | 2 ++ x/installing/xkeyboard-config.xml | 4 ++++ x/lib/mesalib.xml | 10 +++++----- 10 files changed, 39 insertions(+), 17 deletions(-) diff --git a/general/genlib/libdrm.xml b/general/genlib/libdrm.xml index 4f1adf6e4b..6e23ed3b2f 100644 --- a/general/genlib/libdrm.xml +++ b/general/genlib/libdrm.xml @@ -84,10 +84,12 @@ make Contents + Installed Programs Installed Library Installed Directory + None libdrm.{so,a} $XORG_PREFIX/include/drm diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index b9600f9a52..5a47290a82 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -86,10 +86,12 @@ - November 22th, 2008 + November 22nd, 2008 [thomas] - Update to cvs-1.11.23 (#2581). + + [thomas] - Update to sudo-1.6.9p18 (#2573). @@ -118,10 +120,20 @@ [thomas] - Updated to pkg-config-0.23, fixes #2551 + + [thomas] - Updated to popt-1.14, fixes #2505 + + [thomas] - Updated to ed-1.1, fixes #2567 + + [thomas] - Updated to nfs-utils-1.1.4, fixes #2568 + + [thomas] - Updated to curl-7.19.0, fixes #2532 + + [thomas] - Updated to ntp-4.2.4p5 @@ -165,7 +177,7 @@ - October 3nd, 2008 + October 3rd, 2008 [thomas] - Updated to wget-1.11.4. Fixes #2502. diff --git a/x/installing/libxcb.xml b/x/installing/libxcb.xml index 112f01080d..f3db9af7ba 100644 --- a/x/installing/libxcb.xml +++ b/x/installing/libxcb.xml @@ -57,15 +57,6 @@ - Additional Downloads - - - Required patch to workaround X11 locking bugs in other - applications: - - - libxcb Dependencies Required diff --git a/x/installing/luit.xml b/x/installing/luit.xml index 861aa722f3..0aafda635b 100644 --- a/x/installing/luit.xml +++ b/x/installing/luit.xml @@ -97,9 +97,12 @@ make Installed Program - + Installed Libraries + Installed Directories luit + None + None diff --git a/x/installing/x7font.xml b/x/installing/x7font.xml index acf1b428c2..8e5aa3ab38 100644 --- a/x/installing/x7font.xml +++ b/x/installing/x7font.xml @@ -119,10 +119,12 @@ ln -svn $XORG_PREFIX/lib/X11/fonts/TTF /usr/share/fonts/X11-TTF Installed Programs + Installed Libraries Installed Directories bdftruncate and ucs2any + None $XORG_PREFIX/fonts and /usr/share/fonts/X11-{TTF,OTF} diff --git a/x/installing/x7lib.xml b/x/installing/x7lib.xml index a524c0cd8d..70a7b6c4b3 100644 --- a/x/installing/x7lib.xml +++ b/x/installing/x7lib.xml @@ -151,6 +151,7 @@ ln -sv $XORG_PREFIX/include/X11 /usr/include/X11 Installed Programs Installed Libraries + Installed Directories cxpm, makestrs, sxpm, xft-config @@ -165,6 +166,7 @@ ln -sv $XORG_PREFIX/include/X11 /usr/include/X11 libXRes.{so,a}, libXss.{so,a}, libXt.{so,a}, libXtst.{so,a}, libXvMC.{so,a}, libXvMCW.{so,a}, libXv.{so,a}, libXxf86dga.{so,a}, libXxf86misc.{so,a}, and libXxf86vm.{so,a} + None diff --git a/x/installing/x7proto.xml b/x/installing/x7proto.xml index c47dab5ff1..889c318e31 100644 --- a/x/installing/x7proto.xml +++ b/x/installing/x7proto.xml @@ -109,9 +109,13 @@ md5sum -c ../proto-&xorg7-version;.md5 Contents + Installed Programs + Installed Libraries Installed Directories + None + None The following subdirectories of $XORG_PREFIX/: include/X11, include/GL, and lib/pkgconfig diff --git a/x/installing/x7util.xml b/x/installing/x7util.xml index 013affae10..13ca48aaad 100644 --- a/x/installing/x7util.xml +++ b/x/installing/x7util.xml @@ -113,11 +113,13 @@ make Installed Programs + Installed Libraries Installed Directories ccmakedep, cleanlinks, gccmakedep, imake, lndir, makedepend, makeg, mergelib, mkdirhier, mkhtmlindex, revpath, xmkmf + None The following subdirectories of $XORG_PREFIX/: bin, lib/X11/config, share/aclocal, and share/man diff --git a/x/installing/xkeyboard-config.xml b/x/installing/xkeyboard-config.xml index 467691e2bf..85826b3839 100644 --- a/x/installing/xkeyboard-config.xml +++ b/x/installing/xkeyboard-config.xml @@ -104,9 +104,13 @@ install -v -m644 docs/{README,HOWTO}* \ Contents + Installed Programs + Installed Libraries Installed Directory + None + None $XORG_PREFIX/share/X11/xkb, $XORG_PREFIX/share/doc/xkeyboard-config-&xkeyboard-config-version; diff --git a/x/lib/mesalib.xml b/x/lib/mesalib.xml index dd8ba8f7a6..5b6b16fd97 100644 --- a/x/lib/mesalib.xml +++ b/x/lib/mesalib.xml @@ -95,10 +95,10 @@ - Mesa's GLUT library in not released under a free software - license. Permission is grated by the copyright holder for its use with - in the Mesa distribution. is strongly - recommended over Mesa. + Mesa's GLUT library is not released under a free software + license. Permission is grated by the copyright holder for its use within + the Mesa distribution. is recommended over + Mesa's GLUT library. MesaLib Dependencies @@ -124,7 +124,7 @@ Mesa-&mesalib-version; directory. - Build MesaLib by running the following + Install MesaLib by running the following commands: sed 's@FLAGS=\"-g@FLAGS=\"@' -i configure &&