Changeset b9fa514 for BOOK


Ignore:
Timestamp:
Jul 2, 2017, 9:55:35 PM (7 years ago)
Author:
Chris Staub <chris@…>
Branches:
master, systemd
Children:
24c892d
Parents:
b9cf596 (diff), ce6b8dc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of clfs.org:cross-lfs

Location:
BOOK
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • BOOK/final-system/common/diffutils.xml

    rb9cf596 rb9fa514  
    2929
    3030<screen os="s2"><userinput>sed -i 's:= @mkdir_p@:= /bin/mkdir -p:' po/Makefile.in.in</userinput></screen>
    31 
    32     <para os="s3">Adjust the source to build with the included GNULIB code:</para>
    33 
    34 <screen os="s4"><userinput>sed -i '233,237 s/max)/max) \\/' lib/intprops.h</userinput></screen>
    3531
    3632    <para os="a">Prepare Diffutils for compilation:</para>

  • BOOK/final-system/multilib/diffutils.xml

    rb9cf596 rb9fa514  
    2929    href="../common/diffutils.xml"
    3030    xpointer="xpointer(//*[@os='s2'])"/>
    31 
    32     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    33     href="../common/diffutils.xml"
    34     xpointer="xpointer(//*[@os='s3'])"/>
    35 
    36     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    37     href="../common/diffutils.xml"
    38     xpointer="xpointer(//*[@os='s4'])"/>
    3931
    4032    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/general.ent

    rb9cf596 rb9fa514  
    11<?xml version="1.0" encoding="ISO-8859-1"?>
    22
    3 <!ENTITY month "06"> <!-- Use two digits -->
    4 <!ENTITY month_name "June">
    5 <!ENTITY day "23"> <!-- Use two digits -->
     3<!ENTITY month "07"> <!-- Use two digits -->
     4<!ENTITY month_name "July">
     5<!ENTITY day "02"> <!-- Use two digits -->
    66<!ENTITY year "2017"> <!-- Use four digits -->
    77

  • BOOK/introduction/common/changelog.xml

    rb9cf596 rb9fa514  
    3737-->
    3838    <listitem>
     39      <para>02 July 2017</para>
     40      <itemizedlist>
     41        <listitem>
     42          <para>[William Harrington] - Upgrade Diffutils to 3.6. Fixes
     43          ticket <ulink url="&clfs-ticket-root;1175">#1175.</ulink></para>
     44        </listitem>
     45      </itemizedlist>
     46    </listitem>
     47
     48    <listitem>
    3949      <para>09 June 2017</para>
    4050      <itemizedlist>

  • BOOK/packages.ent

    rb9cf596 rb9fa514  
    116116<!ENTITY dhcpcd-home "http://roy.marples.name/projects/dhcpcd">
    117117
    118 <!ENTITY diffutils-version "3.5">
    119 <!ENTITY diffutils-size "1,361 KB">
     118<!ENTITY diffutils-version "3.6">
     119<!ENTITY diffutils-size "1,398 KB">
    120120<!ENTITY diffutils-url "&gnu;diffutils/diffutils-&diffutils-version;.tar.xz">
    121 <!ENTITY diffutils-md5 "569354697ff1cfc9a9de3781361015fa">
     121<!ENTITY diffutils-md5 "07cf286672ced26fba54cd0313bdc071">
    122122<!ENTITY diffutils-home "&gnu-software;diffutils">
    123123

  • BOOK/temp-system/common/diffutils.xml

    rb9cf596 rb9fa514  
    2222  <sect2 role="installation">
    2323    <title>Installation of Diffutils</title>
    24 
    25     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../../final-system/common/diffutils.xml"
    27     xpointer="xpointer(//*[@os='s3'])"/>
    28 
    29     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../../final-system/common/diffutils.xml"
    31     xpointer="xpointer(//*[@os='s4'])"/>
    3224
    3325    <para os="a">Prepare Diffutils for compilation:</para>
Note: See TracChangeset for help on using the changeset viewer.