Changeset 8cf08a11


Ignore:
Timestamp:
01/27/2016 06:43:42 PM (7 years ago)
Author:
DJ Lucas <dj@…>
Branches:
systemd-13485
Children:
a7e1ac8
Parents:
14ba5f4
Message:

Remove -systemd nameing for xml files and move entities to packages.ent for Chapter 13

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@16858 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
4 deleted
4 edited
11 moved

Legend:

Unmodified
Added
Removed

  • general/prog/prog.xml

    r14ba5f4 r8cf08a11  
    2525  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="check.xml"/>
    2626  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clisp.xml"/>
    27   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cmake-systemd.xml"/>
     27  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cmake.xml"/>
    2828  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cvs.xml"/>
    2929  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cvsserver.xml"/>
    … …  
    4646  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="npapi-sdk.xml"/>
    4747  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="perl-modules.xml"/>
    48   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="php-systemd.xml"/>
     48  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="php.xml"/>
    4949  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python2.xml"/>
    5050  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python3.xml"/>
    51   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python-modules-systemd.xml"/>
     51  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python-modules.xml"/>
    5252  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ruby.xml"/>
    5353  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="scons.xml"/>
    5454  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="slang.xml"/>
    55   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="subversion-systemd.xml"/>
    56   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="svnserver-systemd.xml"/>
     55  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="subversion.xml"/>
     56  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="svnserver.xml"/>
    5757  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="swig.xml"/>
    5858  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tcl.xml"/>

  • general/prog/python-modules.xml

    r14ba5f4 r8cf08a11  
    109109
    110110  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    111     href="pyatspi2-systemd.xml"/>
     111    href="pyatspi2.xml"/>
    112112
    113113  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    130130
    131131  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    132     href="setuptools-systemd.xml"/>
     132    href="setuptools.xml"/>
    133133
    134134  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    135     href="beaker-systemd.xml"/>
     135    href="beaker.xml"/>
    136136
    137137  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    138     href="markupsafe-systemd.xml"/>
     138    href="markupsafe.xml"/>
    139139
    140140  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    141     href="jinja2-systemd.xml"/>
     141    href="jinja2.xml"/>
    142142
    143143  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    144     href="mako-systemd.xml"/>
     144    href="mako.xml"/>
    145145
    146146  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    147     href="pyyaml-systemd.xml"/>
     147    href="pyyaml.xml"/>
    148148
    149149</sect1>

  • general/prog/subversion.xml

    r14ba5f4 r8cf08a11  
    88           "http://www.apache.org/dist/subversion/subversion-&subversion-version;.tar.bz2">
    99  <!ENTITY subversion-download-ftp  " ">
    10   <!ENTITY subversion-md5sum        "766a89bbbb388f8eb76166672d3b9e49">
    11   <!ENTITY subversion-size          "6.6 MB">
    12   <!ENTITY subversion-buildsize     "143 MB  (284 MB with all bindings and API documentation built; additional 968 MB for tests)">
    13   <!ENTITY subversion-time          "0.9 SBU (Additional 30 SBU to build documentation, all bindings and to run full test suite.)">
     10  <!ENTITY subversion-md5sum        "20ae7b0d4ef07eeaf73eb4e23317b495">
     11  <!ENTITY subversion-size          "7.4 MB">
     12  <!ENTITY subversion-buildsize     "130 MB (349 MB with all bindings and API documentation built; additional 703 MB for tests)">
     13  <!ENTITY subversion-time          "1.1 SBU (2.9 SBU with all bindings and API documentation built; additional 11 SBU for tests)">
    1414]>
    1515
    … …  
    4242    </para>
    4343
    44     &lfs76_checked;
     44    &lfs78_checked;
    4545
    4646    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    8888    <bridgehead renderas="sect4">Recommended</bridgehead>
    8989    <para role="recommended">
    90       <xref linkend="openssl"/> and
    9190      <xref linkend="serf"/> (for handling http:// and https:// URLs)
    9291    </para>
    … …  
    199198
    200199    <para>
    201       To test the results, issue: <command>make -k check</command>. One test
    202       (wc-queries-test) is known to fail with recent versions of SQLite.
     200      To test the results, issue: <command>make check</command>.
    203201    </para>
    204202
    … …  
    219217
    220218<screen role="root"><userinput>make -j1 install &amp;&amp;
    221 install -v -m755 -d /usr/share/doc/subversion-&subversion-version; &amp;&amp;
    222 cp      -v -R       doc/* \
    223                     /usr/share/doc/subversion-&subversion-version;</userinput></screen>
     219install -v -dm755 /usr/share/doc/subversion-&subversion-version; &amp;&amp;
     220cp      -rv       doc/* \
     221                  /usr/share/doc/subversion-&subversion-version;</userinput></screen>
    224222
    225223    <para>
    … …  
    339337        <seg>
    340338          /usr/include/subversion-1,
    341           /usr/lib/perl5/site_perl/&lfs-perl-version;/auto/SVN (optional),
    342           /usr/lib/perl5/site_perl/&lfs-perl-version;/SVN (optional),
    343           /usr/lib/python&python2-majorver;/site-packages/libsvn (optional),
    344           /usr/lib/python&python2-majorver;/site-packages/svn (optional),
    345           /usr/lib/ruby/site_ruby/&lt;x.y&gt;/i686-linux/svn (optional),
    346           /usr/lib/ruby/site_ruby/&lt;x.y&gt;/svn (optional),
     339          /usr/lib/perl5/site_perl/&lfs-perl-version;/auto/SVN,
     340          /usr/lib/perl5/site_perl/&lfs-perl-version;/SVN,
     341          /usr/lib/python&python2-majorver;/site-packages/{libsvn,svn},
     342          /usr/lib/ruby/site_ruby/&lt;x.y.z&gt;/&lt;arch-linux&gt;-linux/svn,
     343          /usr/lib/ruby/site_ruby/&lt;x.y.z&gt;/svn,
     344          /usr/lib/svn-javahl, and
     345          /usr/share/doc/subversion-&subversion-version;
    347346<!--      /usr/lib/svn-python/libsvn (optional),
    348347          /usr/lib/svn-python/svn (optional),
    349348-->
    350           /usr/lib/svn-javahl (optional), and
    351           /usr/share/doc/subversion-&subversion-version;
    352349        </seg>
    353350      </seglistitem>

  • packages.ent

    r14ba5f4 r8cf08a11  
    289289<!ENTITY npapi-sdk-version            "0.27.2">
    290290<!ENTITY php-version                  "5.6.12">
     291<!ENTITY pyatspi2-version             "2.16.0">
    291292<!ENTITY python2-version              "2.7.10">
    292293<!ENTITY python3-version              "3.5.0">
    … …  
    352353
    353354<!-- Python module versions used in the Python Modules instructions -->
     355<!ENTITY Beaker-version               "1.7.0">
    354356<!ENTITY dbus-python-version          "1.2.0">
     357<!ENTITY Jinja2-version               "2.7.3">
     358<!ENTITY Mako-version                 "1.0.1">
     359<!ENTITY MarkupSafe-version           "0.23">
    355360<!ENTITY py2cairo-version             "1.10.0">
    356361<!ENTITY pycairo-version              "1.10.0">
    … …  
    359364<!ENTITY pygtk-version                "2.24.0">
    360365<!ENTITY pyxdg-version                "0.25">
     366<!ENTITY PyYAML-version               "3.11">
     367<!ENTITY setuptools-version           "17.1.1">
    361368
    362369<!-- Part IV -->

  • systemd.ent

    r14ba5f4 r8cf08a11  
    2020<!--<!ENTITY libxkbcommon-version         "0.5.0">-->
    2121<!--<!ENTITY ModemManager-version         "1.4.10">-->
    22 <!ENTITY pyatspi2-version             "2.16.0">
     22<!-- <!ENTITY pyatspi2-version             "2.16.0">-->
    2323<!--<!ENTITY qtchooser-version            "39">-->
    2424<!ENTITY sound-theme-freedesktop-version "0.8">
    … …  
    2828<!--<!ENTITY weston-version               "1.8.0">-->
    2929<!--<!ENTITY yaml-version                 "0.1.6">-->
    30 
     30<!--
    3131<!ENTITY Beaker-version               "1.7.0">
    3232<!ENTITY Jinja2-version               "2.7.3">
    … …  
    3535<!ENTITY setuptools-version           "17.1.1">
    3636<!ENTITY PyYAML-version               "3.11">
    37 
     37-->
    3838<!ENTITY % kde5-package-entities SYSTEM      "kde5/kde5.ent">
    3939%kde5-package-entities;
Note: See TracChangeset for help on using the changeset viewer.