Author: dj
Date: Fri Jun 3 21:19:32 2016
New Revision: 17434
Log:
[systemd-merge] - Chapter 9 layout
Added:
trunk/BOOK/general/genlib/appstream-glib.xml (contents, props changed)
- copied, changed from r17427,
branches/systemd/general/genlib/appstream-glib.xml
trunk/BOOK/general/genlib/gcab.xml (contents, props changed)
- copied, changed from r17427, branches/systemd/general/genlib/gcab.xml
trunk/BOOK/general/genlib/grantlee.xml (contents, props changed)
- copied, changed from r17427,
branches/systemd/general/genlib/grantlee.xml
trunk/BOOK/general/genlib/libmbim.xml (contents, props changed)
- copied, changed from r17427, branches/systemd/general/genlib/libmbim.xml
trunk/BOOK/general/genlib/libnfsidmap.xml (contents, props changed)
- copied, changed from r17427,
branches/systemd/general/genlib/libnfsidmap.xml
trunk/BOOK/general/genlib/libqmi.xml (contents, props changed)
- copied, changed from r17427, branches/systemd/general/genlib/libqmi.xml
trunk/BOOK/general/genlib/libzeitgeist.xml (contents, props changed)
- copied, changed from r17427,
branches/systemd/general/genlib/libzeitgeist.xml
trunk/BOOK/general/genlib/yaml.xml (contents, props changed)
- copied, changed from r17427, branches/systemd/general/genlib/yaml.xml
Modified:
trunk/BOOK/general/genlib/genlib.xml
trunk/BOOK/packages.ent
Copied and modified: trunk/BOOK/general/genlib/appstream-glib.xml (from r17427,
branches/systemd/general/genlib/appstream-glib.xml)
==============================================================================
--- branches/systemd/general/genlib/appstream-glib.xml Thu Jun 2 13:29:29
2016 (r17427, copy source)
+++ trunk/BOOK/general/genlib/appstream-glib.xml Fri Jun 3 21:19:32
2016 (r17434)
@@ -13,7 +13,7 @@
<!ENTITY appstream-glib-time "0.2 SBU ">
]>
-<sect1 id="appstream-glib" xreflabel="Appstream-GLib-&appstream-glib-version;">
+<sect1 id="appstream-glib" xreflabel="Appstream-GLib-&appstream-glib-version;"
revision="systemd">
<?dbhtml filename="appstream-glib.html"?>
<sect1info>
@@ -38,7 +38,7 @@
standardized XML representation.
</para>
- &lfs77_checked;
+ <!-- &lfs77_checked; -->
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
Copied and modified: trunk/BOOK/general/genlib/gcab.xml (from r17427,
branches/systemd/general/genlib/gcab.xml)
==============================================================================
--- branches/systemd/general/genlib/gcab.xml Thu Jun 2 13:29:29 2016
(r17427, copy source)
+++ trunk/BOOK/general/genlib/gcab.xml Fri Jun 3 21:19:32 2016 (r17434)
@@ -14,7 +14,7 @@
<!ENTITY gcab-time "0.1 SBU (with tests)">
]>
-<sect1 id="gcab" xreflabel="gcab-&gcab-version;">
+<sect1 id="gcab" xreflabel="gcab-&gcab-version;" revision="systemd">
<?dbhtml filename="gcab.html"?>
<sect1info>
Modified: trunk/BOOK/general/genlib/genlib.xml
==============================================================================
--- trunk/BOOK/general/genlib/genlib.xml Fri Jun 3 20:04:06 2016
(r17433)
+++ trunk/BOOK/general/genlib/genlib.xml Fri Jun 3 21:19:32 2016
(r17434)
@@ -43,6 +43,9 @@
will need at some point. In this chapter these and some others are listed
and
it is explained why you may want to install them.</para>
+ <!-- systemd only -->
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="appstream-glib.xml"/>
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="apr.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="apr-util.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="aspell.xml"/>
@@ -51,11 +54,18 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dbus-glib.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="enchant.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="exempi.xml"/>
+
+ <!-- systemd only -->
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="gcab.xml"/>
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="glib2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="glibmm.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="gmime.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="gobject-introspection.xml"/>
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="grantlee.xml"/> -->
+
+ <!-- systemd only -->
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="grantlee.xml"/>
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="gsl.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="icu.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="js.xml"/>
@@ -69,9 +79,9 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="libatomic_ops.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libcroco.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libdaemon.xml"/>
- <!--
+<!--
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="libdbusmenuqt.xml"/>
- -->
+-->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libesmtp.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libffi.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libgcrypt.xml"/>
@@ -84,7 +94,14 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libiodbc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libksba.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="liblinear.xml"/>
+
+ <!-- systemd only -->
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libmbim.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="libnfsidmap.xml"/>
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libpaper.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libqmi.xml"/>
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libsigc++.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="libsigsegv.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="libstatgrab.xml"/>
@@ -96,6 +113,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="libxkbcommon.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libxml2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libxslt.xml"/>
+
+ <!-- systemd only -->
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="libzeitgeist.xml"/>
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="lzo.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="mtdev.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="npth.xml"/>
@@ -112,4 +133,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="wv.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="xapian.xml"/>
+ <!-- systemd only -->
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="yaml.xml"/>
</chapter>
Copied and modified: trunk/BOOK/general/genlib/grantlee.xml (from r17427,
branches/systemd/general/genlib/grantlee.xml)
==============================================================================
--- branches/systemd/general/genlib/grantlee.xml Thu Jun 2 13:29:29
2016 (r17427, copy source)
+++ trunk/BOOK/general/genlib/grantlee.xml Fri Jun 3 21:19:32 2016
(r17434)
@@ -13,7 +13,7 @@
<!ENTITY grantlee-time "0.8 SBU">
]>
-<sect1 id="grantlee" xreflabel="grantlee-&grantlee-version;">
+<sect1 id="grantlee" xreflabel="grantlee-&grantlee-version;"
revision="systemd">
<?dbhtml filename="grantlee.html"?>
<sect1info>
@@ -38,7 +38,7 @@
of documents from the data they contain, opening the door for theming.
</para>
- &lfs78_checked;
+ <!-- &lfs78_checked; -->
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
Copied and modified: trunk/BOOK/general/genlib/libmbim.xml (from r17427,
branches/systemd/general/genlib/libmbim.xml)
==============================================================================
--- branches/systemd/general/genlib/libmbim.xml Thu Jun 2 13:29:29 2016
(r17427, copy source)
+++ trunk/BOOK/general/genlib/libmbim.xml Fri Jun 3 21:19:32 2016
(r17434)
@@ -12,7 +12,7 @@
<!ENTITY libmbim-time "0.2 SBU">
]>
-<sect1 id="libmbim" xreflabel="libmbim-&libmbim-version;">
+<sect1 id="libmbim" xreflabel="libmbim-&libmbim-version;" revision="systemd">
<?dbhtml filename="libmbim.html"?>
<sect1info>
@@ -35,7 +35,7 @@
Broadband Model (MBIM) protocol.
</para>
- &lfs77_checked;
+ <!-- &lfs77_checked; -->
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
Copied and modified: trunk/BOOK/general/genlib/libnfsidmap.xml (from r17427,
branches/systemd/general/genlib/libnfsidmap.xml)
==============================================================================
--- branches/systemd/general/genlib/libnfsidmap.xml Thu Jun 2 13:29:29
2016 (r17427, copy source)
+++ trunk/BOOK/general/genlib/libnfsidmap.xml Fri Jun 3 21:19:32 2016
(r17434)
@@ -14,7 +14,7 @@
<!ENTITY libnfsidmap-time "less than 0.1 SBU">
]>
-<sect1 id="libnfsidmap" xreflabel="libnfsidmap-&libnfsidmap-version;">
+<sect1 id="libnfsidmap" xreflabel="libnfsidmap-&libnfsidmap-version;"
revision="systemd">
<?dbhtml filename="libnfsidmap.html"?>
<sect1info>
@@ -36,7 +36,7 @@
library to help mapping id's, mainly for NFSv4.
</para>
- &lfs77_checked;
+ <!-- &lfs77_checked; -->
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
Copied and modified: trunk/BOOK/general/genlib/libqmi.xml (from r17427,
branches/systemd/general/genlib/libqmi.xml)
==============================================================================
--- branches/systemd/general/genlib/libqmi.xml Thu Jun 2 13:29:29 2016
(r17427, copy source)
+++ trunk/BOOK/general/genlib/libqmi.xml Fri Jun 3 21:19:32 2016
(r17434)
@@ -12,7 +12,7 @@
<!ENTITY libqmi-time "0.3 SBU">
]>
-<sect1 id="libqmi" xreflabel="libqmi-&libqmi-version;">
+<sect1 id="libqmi" xreflabel="libqmi-&libqmi-version;" revision="systemd">
<?dbhtml filename="libqmi.html"?>
<sect1info>
@@ -35,7 +35,7 @@
(QMI) protocol.
</para>
- &lfs77_checked;
+ <!-- &lfs77_checked; -->
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
Copied and modified: trunk/BOOK/general/genlib/libzeitgeist.xml (from r17427,
branches/systemd/general/genlib/libzeitgeist.xml)
==============================================================================
--- branches/systemd/general/genlib/libzeitgeist.xml Thu Jun 2 13:29:29
2016 (r17427, copy source)
+++ trunk/BOOK/general/genlib/libzeitgeist.xml Fri Jun 3 21:19:32 2016
(r17434)
@@ -13,7 +13,7 @@
<!ENTITY libzeitgeist-time "0.1 SBU">
]>
-<sect1 id="libzeitgeist" xreflabel="libzeitgeist-&libzeitgeist-version;">
+<sect1 id="libzeitgeist" xreflabel="libzeitgeist-&libzeitgeist-version;"
revision="systemd">
<?dbhtml filename="libzeitgeist.html"?>
<sect1info>
@@ -39,7 +39,7 @@
information available to other applications.
</para>
- &lfs77_checked;
+ <!-- &lfs77_checked; -->
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
Copied and modified: trunk/BOOK/general/genlib/yaml.xml (from r17427,
branches/systemd/general/genlib/yaml.xml)
==============================================================================
--- branches/systemd/general/genlib/yaml.xml Thu Jun 2 13:29:29 2016
(r17427, copy source)
+++ trunk/BOOK/general/genlib/yaml.xml Fri Jun 3 21:19:32 2016 (r17434)
@@ -12,7 +12,7 @@
<!ENTITY yaml-time "0.1 SBU">
]>
-<sect1 id="yaml" xreflabel="YAML-&yaml-version;">
+<sect1 id="yaml" xreflabel="YAML-&yaml-version;" revision="systemd">
<?dbhtml filename="yaml.html"?>
<sect1info>
@@ -35,7 +35,7 @@
Language).
</para>
- &lfs77_checked;
+ <!-- &lfs77_checked; -->
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent Fri Jun 3 20:04:06 2016 (r17433)
+++ trunk/BOOK/packages.ent Fri Jun 3 21:19:32 2016 (r17434)
@@ -75,6 +75,7 @@
<!-- Part III -->
<!-- Chapter 9 -->
+<!ENTITY appstream-glib-version "0.5.0">
<!ENTITY apr-version "1.5.2">
<!ENTITY apr-util-version "1.5.4">
<!ENTITY aspell-version "0.60.6.1">
@@ -90,10 +91,12 @@
<!ENTITY enchant-version "1.6.0">
<!ENTITY exempi-version "2.3.0">
<!ENTITY expat-version "2.1.0">
+<!ENTITY gcab-version "0.7">
<!ENTITY glib2-version "2.48.1">
<!ENTITY glibmm-version "2.48.1">
<!ENTITY gmime-version "2.6.20">
<!ENTITY gobject-introspection-version "1.48.0">
+<!ENTITY grantlee-version "0.5.1">
<!ENTITY gsl-version "2.1">
<!ENTITY icu-major "57">
@@ -129,7 +132,10 @@
<!ENTITY libiodbc-version "3.52.10">
<!ENTITY libksba-version "1.3.4">
<!ENTITY liblinear-version "210">
+<!ENTITY libmbim-version "1.12.2">
+<!ENTITY libnfsidmap-version "0.26">
<!ENTITY libpaper-version "1.1.24+nmu4">
+<!ENTITY libqmi-version "1.12.6">
<!ENTITY libsigc-version "2.8.0">
<!ENTITY libsigsegv-version "2.10">
<!ENTITY libstatgrab-version "0.91">
@@ -158,6 +164,7 @@
<!ENTITY wayland-version "1.10.0">
<!ENTITY wv-version "1.2.9">
<!ENTITY xapian-version "1.2.23">
+<!ENTITY yaml-version "0.1.6">
<!-- Chapter 10 -->
<!ENTITY aalib-version "1.4rc5">
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
