Author: dj
Date: Sun Jun 5 20:35:53 2016
New Revision: 17451
Log:
[Systemd merge] - genlib and python-modules
Added:
trunk/BOOK/general/prog/beaker.xml (contents, props changed)
- copied, changed from r17441, branches/systemd/general/prog/beaker.xml
trunk/BOOK/general/prog/jinja2.xml (contents, props changed)
- copied, changed from r17441, branches/systemd/general/prog/jinja2.xml
trunk/BOOK/general/prog/mako.xml (contents, props changed)
- copied, changed from r17441, branches/systemd/general/prog/mako.xml
trunk/BOOK/general/prog/markupsafe.xml (contents, props changed)
- copied, changed from r17441,
branches/systemd/general/prog/markupsafe.xml
trunk/BOOK/general/prog/pyatspi2.xml (contents, props changed)
- copied, changed from r17441, branches/systemd/general/prog/pyatspi2.xml
trunk/BOOK/general/prog/pyyaml.xml (contents, props changed)
- copied, changed from r17441, branches/systemd/general/prog/pyyaml.xml
trunk/BOOK/general/prog/setuptools.xml (contents, props changed)
- copied, changed from r17441,
branches/systemd/general/prog/setuptools.xml
Modified:
trunk/BOOK/general/genlib/gobject-introspection.xml
trunk/BOOK/general/prog/python-modules.xml
trunk/BOOK/packages.ent
Modified: trunk/BOOK/general/genlib/gobject-introspection.xml
==============================================================================
--- trunk/BOOK/general/genlib/gobject-introspection.xml Sun Jun 5 18:01:31
2016 (r17450)
+++ trunk/BOOK/general/genlib/gobject-introspection.xml Sun Jun 5 20:35:53
2016 (r17451)
@@ -83,7 +83,8 @@
<para role="optional">
<xref linkend="cairo"/> (required for the tests),
<xref linkend="gtk-doc"/> and
- <ulink url="http://www.makotemplates.org/";>Mako</ulink>
+ <phrase revision="sysv"><ulink
url="http://www.makotemplates.org/";>Mako</ulink></phrase>
+ <phrase revision="systemd"><xref linkend="Mako"/></phrase>
</para>
<para condition="html" role="usernotes">User Notes:
Copied and modified: trunk/BOOK/general/prog/beaker.xml (from r17441,
branches/systemd/general/prog/beaker.xml)
==============================================================================
--- branches/systemd/general/prog/beaker.xml Sat Jun 4 15:13:50 2016
(r17441, copy source)
+++ trunk/BOOK/general/prog/beaker.xml Sun Jun 5 20:35:53 2016 (r17451)
@@ -14,7 +14,7 @@
]>
<!-- Begin Beaker -->
- <sect2 id="Beaker" xreflabel="Beaker-&Beaker-version;">
+ <sect2 id="Beaker" xreflabel="Beaker-&Beaker-version;" revision="systemd">
<title>Beaker-&Beaker-version;</title>
@@ -31,8 +31,6 @@
web applications and stand-alone Python scripts and applications.
</para>
- &lfs77_checked;
-
<bridgehead renderas="sect4">Package Information</bridgehead>
<itemizedlist spacing="compact">
<listitem>
Copied and modified: trunk/BOOK/general/prog/jinja2.xml (from r17441,
branches/systemd/general/prog/jinja2.xml)
==============================================================================
--- branches/systemd/general/prog/jinja2.xml Sat Jun 4 15:13:50 2016
(r17441, copy source)
+++ trunk/BOOK/general/prog/jinja2.xml Sun Jun 5 20:35:53 2016 (r17451)
@@ -14,7 +14,7 @@
]>
<!-- Begin Jinja2 -->
- <sect2 id="Jinja2" xreflabel="Jinja2-&Jinja2-version;">
+ <sect2 id="Jinja2" xreflabel="Jinja2-&Jinja2-version;" revision="systemd">
<title>Jinja2-&Jinja2-version;</title>
@@ -30,8 +30,6 @@
module that implements a simple pythonic template language.
</para>
- &lfs77_checked;
-
<bridgehead renderas="sect4">Package Information</bridgehead>
<itemizedlist spacing="compact">
<listitem>
Copied and modified: trunk/BOOK/general/prog/mako.xml (from r17441,
branches/systemd/general/prog/mako.xml)
==============================================================================
--- branches/systemd/general/prog/mako.xml Sat Jun 4 15:13:50 2016
(r17441, copy source)
+++ trunk/BOOK/general/prog/mako.xml Sun Jun 5 20:35:53 2016 (r17451)
@@ -14,7 +14,7 @@
]>
<!-- Begin Mako -->
- <sect2 id="Mako" xreflabel="Mako-&mako-version;">
+ <sect2 id="Mako" xreflabel="Mako-&mako-version;" revision="systemd">
<title>Mako-&mako-version;</title>
@@ -31,8 +31,6 @@
<application>Python</application> platform.
</para>
- &lfs77_checked;
-
<bridgehead renderas="sect4">Package Information</bridgehead>
<itemizedlist spacing="compact">
<listitem>
Copied and modified: trunk/BOOK/general/prog/markupsafe.xml (from r17441,
branches/systemd/general/prog/markupsafe.xml)
==============================================================================
--- branches/systemd/general/prog/markupsafe.xml Sat Jun 4 15:13:50
2016 (r17441, copy source)
+++ trunk/BOOK/general/prog/markupsafe.xml Sun Jun 5 20:35:53 2016
(r17451)
@@ -14,7 +14,7 @@
]>
<!-- Begin MarkupSafe -->
- <sect2 id="MarkupSafe" xreflabel="MarkupSafe-&MarkupSafe-version;">
+ <sect2 id="MarkupSafe" xreflabel="MarkupSafe-&MarkupSafe-version;"
revision="systemd">
<title>MarkupSafe-&MarkupSafe-version;</title>
@@ -30,8 +30,6 @@
module that implements a XML/HTML/XHTML Markup safe string.
</para>
- &lfs77_checked;
-
<bridgehead renderas="sect4">Package Information</bridgehead>
<itemizedlist spacing="compact">
<listitem>
Copied and modified: trunk/BOOK/general/prog/pyatspi2.xml (from r17441,
branches/systemd/general/prog/pyatspi2.xml)
==============================================================================
--- branches/systemd/general/prog/pyatspi2.xml Sat Jun 4 15:13:50 2016
(r17441, copy source)
+++ trunk/BOOK/general/prog/pyatspi2.xml Sun Jun 5 20:35:53 2016
(r17451)
@@ -15,13 +15,13 @@
]>
<!-- Begin PyAtSpi2 -->
- <sect2 id="pyatspi2" xreflabel="PyAtSpi2-&pyatspi2-version;">
+ <sect2 id="pyatspi2" xreflabel="PyAtSpi2-&pyatspi2-version;"
revision="systemd">
<title>PyAtSpi2-&pyatspi2-version;</title>
<indexterm zone="pyatspi2">
<primary sortas="a-PyAtSpi2">PyAtSpi2</primary>
- </indexterm>
+ </indexterm>
<sect3 role="package">
<title>Introduction to PyAtSpi2</title>
@@ -33,8 +33,6 @@
Accessibility.
</para>
- &lfs77_checked;
-
<bridgehead renderas="sect4">Package Information</bridgehead>
<itemizedlist spacing="compact">
<listitem>
Modified: trunk/BOOK/general/prog/python-modules.xml
==============================================================================
--- trunk/BOOK/general/prog/python-modules.xml Sun Jun 5 18:01:31 2016
(r17450)
+++ trunk/BOOK/general/prog/python-modules.xml Sun Jun 5 20:35:53 2016
(r17451)
@@ -36,6 +36,11 @@
<xref linkend="dbus-python"/>
</para>
</listitem>
+ <listitem revision="systemd">
+ <para>
+ <xref linkend="pyatspi2"/>
+ </para>
+ </listitem>
<listitem>
<para>
<xref linkend="py2cairo"/>
@@ -66,6 +71,36 @@
<xref linkend="pyxdg"/>
</para>
</listitem>
+ <listitem revision="systemd">
+ <para>
+ <xref linkend="setuptools"/>
+ </para>
+ </listitem>
+ <listitem revision="systemd">
+ <para>
+ <xref linkend="Beaker"/>
+ </para>
+ </listitem>
+ <listitem revision="systemd">
+ <para>
+ <xref linkend="MarkupSafe"/>
+ </para>
+ </listitem>
+ <listitem revision="systemd">
+ <para>
+ <xref linkend="Jinja2"/>
+ </para>
+ </listitem>
+ <listitem revision="systemd">
+ <para>
+ <xref linkend="Mako"/>
+ </para>
+ </listitem>
+ <listitem revision="systemd">
+ <para>
+ <xref linkend="PyYAML"/>
+ </para>
+ </listitem>
</itemizedlist>
</sect2>
@@ -73,6 +108,9 @@
href="dbus-python.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+ href="pyatspi2.xml"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="py2cairo.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
@@ -90,4 +128,22 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="pyxdg.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+ href="setuptools.xml"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+ href="beaker.xml"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+ href="markupsafe.xml"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+ href="jinja2.xml"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+ href="mako.xml"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+ href="pyyaml.xml"/>
+
</sect1>
Copied and modified: trunk/BOOK/general/prog/pyyaml.xml (from r17441,
branches/systemd/general/prog/pyyaml.xml)
==============================================================================
--- branches/systemd/general/prog/pyyaml.xml Sat Jun 4 15:13:50 2016
(r17441, copy source)
+++ trunk/BOOK/general/prog/pyyaml.xml Sun Jun 5 20:35:53 2016 (r17451)
@@ -13,7 +13,7 @@
]>
<!-- Begin PyYAML -->
- <sect2 id="PyYAML" xreflabel="PyYAML-&PyYAML-version;">
+ <sect2 id="PyYAML" xreflabel="PyYAML-&PyYAML-version;" revision="systemd">
<title>PyYAML-&PyYAML-version;</title>
@@ -29,8 +29,6 @@
module that implements the next generation YAML parser and emitter.
</para>
- &lfs77_checked;
-
<bridgehead renderas="sect4">Package Information</bridgehead>
<itemizedlist spacing="compact">
<listitem>
Copied and modified: trunk/BOOK/general/prog/setuptools.xml (from r17441,
branches/systemd/general/prog/setuptools.xml)
==============================================================================
--- branches/systemd/general/prog/setuptools.xml Sat Jun 4 15:13:50
2016 (r17441, copy source)
+++ trunk/BOOK/general/prog/setuptools.xml Sun Jun 5 20:35:53 2016
(r17451)
@@ -14,7 +14,7 @@
]>
<!-- Begin Setuptools -->
- <sect2 id="setuptools" xreflabel="Setuptools-&setuptools-version;">
+ <sect2 id="setuptools" xreflabel="Setuptools-&setuptools-version;"
revision="systemd">
<title>Setuptools-&setuptools-version;</title>
@@ -31,8 +31,6 @@
uninstall <application>Python</application> packages.
</para>
- &lfs77_checked;
-
<bridgehead renderas="sect4">Package Information</bridgehead>
<itemizedlist spacing="compact">
<listitem>
Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent Sun Jun 5 18:01:31 2016 (r17450)
+++ trunk/BOOK/packages.ent Sun Jun 5 20:35:53 2016 (r17451)
@@ -360,14 +360,19 @@
<!ENTITY XML-Writer-version "0.625">
<!-- Python module versions used in the Python Modules instructions -->
+<!ENTITY Beaker-version "1.7.0">
<!ENTITY dbus-python-version "1.2.4">
+<!ENTITY Jinja2-version "2.7.3">
+<!ENTITY MarkupSafe-version "0.23">
+<!ENTITY pyatspi2-version "2.16.0">
<!ENTITY py2cairo-version "1.10.0">
<!ENTITY pycairo-version "1.10.0">
<!ENTITY pygobject2-version "2.28.6">
<!ENTITY pygobject3-version "3.20.1">
<!ENTITY pygtk-version "2.24.0">
<!ENTITY pyxdg-version "0.25">
-<!ENTITY setuptools-version "15.1">
+<!ENTITY PyYAML-version "3.11">
+<!ENTITY setuptools-version "17.1.1">
<!ENTITY mako-version "1.0.1">
<!-- Part IV -->
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
