Changeset 52b4b72 for BOOK


Ignore:
Timestamp:
Jul 23, 2014, 12:36:25 AM (10 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, master, systemd
Children:
7703780
Parents:
1393767 (diff), d923363 (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 git.cross-lfs.org:cross-lfs

Location:
BOOK
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • BOOK/introduction/common/changelog.xml

    r1393767 r52b4b72  
    3838
    3939    <listitem>
     40      <para>21 July 2014</para>
     41      <itemizedlist>
     42        <listitem>
     43          <para>[William Harrington] - Update MPFR 3.1.2 fixes patch for patch
     44          level 10 update.</para>
     45        </listitem>
     46        <listitem>
     47          <para>[William Harrington] - Update VIM 7.4 Branch Update patch to
     48          patch level 373.</para>
     49        </listitem>
     50        <listitem>
     51          <para>[William Harrington] - Update Linux to 3.14.13.</para>
     52        </listitem>
     53      </itemizedlist>
     54    </listitem>
     55
     56    <listitem>
    4057      <para>18 July 2014</para>
    4158      <itemizedlist>

  • BOOK/packages.ent

    r1393767 r52b4b72  
    329329
    330330<!ENTITY linux-version "3.14">
    331 <!ENTITY linux-version2 "&linux-version;.12">
     331<!ENTITY linux-version2 "&linux-version;.13">
    332332<!ENTITY linux-size "78,399 KB">
    333333<!ENTITY linux-url "&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-version;.tar.xz">

  • BOOK/patches.ent

    r1393767 r52b4b72  
    4242
    4343<!ENTITY linux-sublevel-patch "patch-&linux-version2;.xz">
    44 <!ENTITY linux-sublevel-patch-md5 "89a5af1f3609d0c27e63fea298dd80ed">
    45 <!ENTITY linux-sublevel-patch-size "324 KB">
     44<!ENTITY linux-sublevel-patch-md5 "132470897fc5d57f5ac7d658100cc430">
     45<!ENTITY linux-sublevel-patch-size "338 KB">
    4646
    47 <!ENTITY mpfr-fixes-patch "mpfr-&mpfr-version;-fixes-3.patch">
    48 <!ENTITY mpfr-fixes-patch-md5 "34cec761c2e53658aad1214d77b7f184">
    49 <!ENTITY mpfr-fixes-patch-size "45 KB">
     47<!ENTITY mpfr-fixes-patch "mpfr-&mpfr-version;-fixes-4.patch">
     48<!ENTITY mpfr-fixes-patch-md5 "b6c1c0dcbf7661298037eeb346a8669c">
     49<!ENTITY mpfr-fixes-patch-size "55 KB">
    5050
    5151<!ENTITY ncurses-bashfix-patch "ncurses-&ncurses-version;-bash_fix-1.patch">
    … …  
    7575<!-- Vim branch update patch area -->
    7676
    77 <!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-4.patch">
    78 <!ENTITY vim-branch_update-patch-md5 "242c96838a05da13b47d25fb62bf8418">
    79 <!ENTITY vim-branch_update-patch-size "2,846 KB">
     77<!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-5.patch">
     78<!ENTITY vim-branch_update-patch-md5 "ef591881ff7aa8baac8aecc201e20f12">
     79<!ENTITY vim-branch_update-patch-size "3,139 KB">
    8080
    8181<!-- Start of multilib patches -->
Note: See TracChangeset for help on using the changeset viewer.