Author: dj
Date: 2012-06-11 20:16:18 -0600 (Mon, 11 Jun 2012)
New Revision: 10314
Modified:
trunk/BOOK/general.ent
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/x/installing/installing.xml
trunk/BOOK/x/installing/libXp.xml
trunk/BOOK/x/installing/printproto.xml
trunk/BOOK/x/installing/twm.xml
trunk/BOOK/x/installing/x7app.xml
trunk/BOOK/x/installing/x7driver.xml
trunk/BOOK/x/installing/x7font.xml
trunk/BOOK/x/installing/x7lib.xml
trunk/BOOK/x/installing/x7proto.xml
trunk/BOOK/x/installing/xclock.xml
trunk/BOOK/x/installing/xinit.xml
trunk/BOOK/x/installing/xterm.xml
Log:
Updated to Xorg-7.7-1.
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2012-06-12 01:36:21 UTC (rev 10313)
+++ trunk/BOOK/general.ent 2012-06-12 02:16:18 UTC (rev 10314)
@@ -104,6 +104,10 @@
<!ENTITY lfssvn_built2 " platform but has not been tested.">
<!-- End special entities about LFS compatibility -->
+<!ENTITY not-katamari "<para>This package is not a part of the Xorg
+ katamari and is provided only as a dependency to
+ other packages or for testing the completed Xorg
+ installation.</para>">
<!-- Part II -->
<!-- Chapter 3 -->
<!ENTITY initd-tools-version "0.1.3">
@@ -610,8 +614,8 @@
<!-- Part VI -->
<!-- Chapter 24 -->
-<!ENTITY xorg7-version "7.6">
-<!ENTITY xorg7-release "7.6-2">
+<!ENTITY xorg7-version "7.7">
+<!ENTITY xorg7-release "7.7-1">
<!ENTITY util-macros-version "1.17">
<!ENTITY makedepend-version "1.0.4">
<!ENTITY libXau-version "1.0.7">
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2012-06-12 01:36:21 UTC
(rev 10313)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2012-06-12 02:16:18 UTC
(rev 10314)
@@ -69,6 +69,9 @@
<listitem>
<para>[dj] - Updated to xterm-279.</para>
</listitem>
+ <listitem>
+ <para>[dj] - Updated to Xorg-7.7-1.</para>
+ </listitem>
</itemizedlist>
</listitem>
Modified: trunk/BOOK/x/installing/installing.xml
===================================================================
--- trunk/BOOK/x/installing/installing.xml 2012-06-12 01:36:21 UTC (rev
10313)
+++ trunk/BOOK/x/installing/installing.xml 2012-06-12 02:16:18 UTC (rev
10314)
@@ -20,11 +20,11 @@
<para><application>Xorg</application>, in addition to clearing up some
licensing issues with <ulink url="http://www.xfree86.org/";>XFree86</ulink>,
- introduced a completely autotooled build for the X Window system. This
+ introduced a completely auto-tooled build for the X Window system. This
means that the packages build and install using the conventional
<command>configure</command>, <command>make</command> and <command>make
install</command> commands, as opposed to a proprietary build system that
- requied hand editing of configuration parameters in a C-like syntax.</para>
+ required hand editing of configuration parameters in a C-like syntax.</para>
<para><application>Xorg</application> also brought with it a modular build
system. While this separation into modules resulted in full control of the
@@ -34,7 +34,17 @@
commercial distributions have elected to use <application>Xorg</application>
over the <application>XFree86</application> distribution due to both
licensing issues and the increased functionality provided by it over
- <application>XFree86</application>.</para>
+ <application>XFree86</application>. With the modular build system, also came
+ incremental updates to individual packages. The distribution of
+ <application>Xorg</application> is given a release number by the developers,
+ in this case Xorg-&xorg7-version;, and is referred to as the "katamari" by
+ the upstream developers. Additionally, the BLFS book appends a build number
+ to the end of version string to indicate whether a group of incremental
+ updates has been applied, while still retaining the versioning scheme of the
+ upstream developers. For instance, Xorg-&xorg7-version;-1 would indicate that
+ this is the 1st release, and is consistent with the katamari, while
+ Xorg-&xorg7-version;-2 would indicate that individual package updates have
+ been applied to the katamari.</para>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="xorg7.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="util-macros.xml"/>
Modified: trunk/BOOK/x/installing/libXp.xml
===================================================================
--- trunk/BOOK/x/installing/libXp.xml 2012-06-12 01:36:21 UTC (rev 10313)
+++ trunk/BOOK/x/installing/libXp.xml 2012-06-12 02:16:18 UTC (rev 10314)
@@ -32,6 +32,8 @@
<para>The <application>libXp</application> package contains a library
implementing the X Print Protocol.</para>
+ ¬-katamari;
+
&lfs71_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
Modified: trunk/BOOK/x/installing/printproto.xml
===================================================================
--- trunk/BOOK/x/installing/printproto.xml 2012-06-12 01:36:21 UTC (rev
10313)
+++ trunk/BOOK/x/installing/printproto.xml 2012-06-12 02:16:18 UTC (rev
10314)
@@ -32,6 +32,8 @@
<para>The <application>printproto</application> package provides the
protocol headers for the <xref linkend="libXp"/> package.</para>
+ ¬-katamari;
+
&lfs71_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
Modified: trunk/BOOK/x/installing/twm.xml
===================================================================
--- trunk/BOOK/x/installing/twm.xml 2012-06-12 01:36:21 UTC (rev 10313)
+++ trunk/BOOK/x/installing/twm.xml 2012-06-12 02:16:18 UTC (rev 10314)
@@ -32,6 +32,8 @@
<para>The <application>twm</application> package contains a very minimal
window manager.</para>
+ ¬-katamari;
+
&lfs71_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
Modified: trunk/BOOK/x/installing/x7app.xml
===================================================================
--- trunk/BOOK/x/installing/x7app.xml 2012-06-12 01:36:21 UTC (rev 10313)
+++ trunk/BOOK/x/installing/x7app.xml 2012-06-12 02:16:18 UTC (rev 10314)
@@ -8,9 +8,9 @@
<!ENTITY x7apps-download-ftp "ftp://ftp.x.org/pub/individual/app/";>
<!ENTITY x7apps-wget "&files-anduin;/xorg/app-&xorg7-release;.wget">
<!ENTITY x7apps-md5sum "&files-anduin;/xorg/app-&xorg7-release;.md5">
- <!ENTITY x7apps-size "5.3 MB">
- <!ENTITY x7apps-buildsize "60 MB">
- <!ENTITY x7apps-time "1.2 SBU">
+ <!ENTITY x7apps-size "4.8 MB">
+ <!ENTITY x7apps-buildsize "39.2 MB">
+ <!ENTITY x7apps-time "1.5 SBU">
]>
Modified: trunk/BOOK/x/installing/x7driver.xml
===================================================================
--- trunk/BOOK/x/installing/x7driver.xml 2012-06-12 01:36:21 UTC (rev
10313)
+++ trunk/BOOK/x/installing/x7driver.xml 2012-06-12 02:16:18 UTC (rev
10314)
@@ -8,9 +8,9 @@
<!ENTITY x7drivers-download-ftp "ftp://ftp.x.org/pub/individual/driver/";>
<!ENTITY x7drivers-wget
"&files-anduin;/xorg/driver-&xorg7-release;.wget">
<!ENTITY x7drivers-md5sum
"&files-anduin;/xorg/driver-&xorg7-release;.md5">
- <!ENTITY x7drivers-size "18.1 MB">
- <!ENTITY x7drivers-buildsize "71.6 MB">
- <!ENTITY x7drivers-time "3.9 SBU">
+ <!ENTITY x7drivers-size "10.7 MB">
+ <!ENTITY x7drivers-buildsize "162 MB">
+ <!ENTITY x7drivers-time "2.3 SBU">
]>
Modified: trunk/BOOK/x/installing/x7font.xml
===================================================================
--- trunk/BOOK/x/installing/x7font.xml 2012-06-12 01:36:21 UTC (rev 10313)
+++ trunk/BOOK/x/installing/x7font.xml 2012-06-12 02:16:18 UTC (rev 10314)
@@ -8,9 +8,9 @@
<!ENTITY x7fonts-download-ftp "ftp://ftp.x.org/pub/individual/font/";>
<!ENTITY x7fonts-wget
"&files-anduin;/xorg/font-&xorg7-release;.wget">
<!ENTITY x7fonts-md5sum
"&files-anduin;/xorg/font-&xorg7-release;.md5">
- <!ENTITY x7fonts-size "14.8 MB">
- <!ENTITY x7fonts-buildsize "269 MB">
- <!ENTITY x7fonts-time "2.0 SBU">
+ <!ENTITY x7fonts-size "15.0 MB">
+ <!ENTITY x7fonts-buildsize "278 MB">
+ <!ENTITY x7fonts-time "2.3 SBU">
]>
<sect1 id="xorg7-font" xreflabel="Xorg Fonts">
Modified: trunk/BOOK/x/installing/x7lib.xml
===================================================================
--- trunk/BOOK/x/installing/x7lib.xml 2012-06-12 01:36:21 UTC (rev 10313)
+++ trunk/BOOK/x/installing/x7lib.xml 2012-06-12 02:16:18 UTC (rev 10314)
@@ -8,9 +8,9 @@
<!ENTITY x7libs-download-ftp "ftp://ftp.x.org/pub/individual/lib/";>
<!ENTITY x7libs-wget "&files-anduin;/xorg/lib-&xorg7-release;.wget">
<!ENTITY x7libs-md5sum "&files-anduin;/xorg/lib-&xorg7-release;.md5">
- <!ENTITY x7libs-size "11.9 MB">
- <!ENTITY x7libs-buildsize "266 MB">
- <!ENTITY x7libs-time "4.0 SBU">
+ <!ENTITY x7libs-size "12.1 MB">
+ <!ENTITY x7libs-buildsize "327 MB">
+ <!ENTITY x7libs-time "3.7 SBU">
]>
Modified: trunk/BOOK/x/installing/x7proto.xml
===================================================================
--- trunk/BOOK/x/installing/x7proto.xml 2012-06-12 01:36:21 UTC (rev 10313)
+++ trunk/BOOK/x/installing/x7proto.xml 2012-06-12 02:16:18 UTC (rev 10314)
@@ -14,8 +14,8 @@
determined by the sum of all package source tarballs, the size of
installed files, and the size of the largest package's build
directory after running make install. -->
- <!ENTITY x7proto-buildsize "8.4 MB">
- <!ENTITY x7proto-time "0.5 SBU">
+ <!ENTITY x7proto-buildsize "21 MB">
+ <!ENTITY x7proto-time "0.8 SBU">
]>
Modified: trunk/BOOK/x/installing/xclock.xml
===================================================================
--- trunk/BOOK/x/installing/xclock.xml 2012-06-12 01:36:21 UTC (rev 10313)
+++ trunk/BOOK/x/installing/xclock.xml 2012-06-12 02:16:18 UTC (rev 10314)
@@ -32,6 +32,8 @@
<para>The <application>xclock</application> package contains a simple
clock application which is used in the default xinit configuration.</para>
+ ¬-katamari;
+
&lfs71_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
Modified: trunk/BOOK/x/installing/xinit.xml
===================================================================
--- trunk/BOOK/x/installing/xinit.xml 2012-06-12 01:36:21 UTC (rev 10313)
+++ trunk/BOOK/x/installing/xinit.xml 2012-06-12 02:16:18 UTC (rev 10314)
@@ -32,6 +32,8 @@
<para>The <application>xinit</application> package contains a usable script
to start the xserver.</para>
+ ¬-katamari;
+
&lfs71_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
Modified: trunk/BOOK/x/installing/xterm.xml
===================================================================
--- trunk/BOOK/x/installing/xterm.xml 2012-06-12 01:36:21 UTC (rev 10313)
+++ trunk/BOOK/x/installing/xterm.xml 2012-06-12 02:16:18 UTC (rev 10314)
@@ -32,6 +32,8 @@
<para><application>xterm</application> is a terminal emulator for
the X Window System.</para>
+ ¬-katamari;
+
&lfs71_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
