Changeset 8a1e392 for BOOK/packages.ent


Ignore:
Timestamp:
Jan 7, 2014, 2:40:56 AM (10 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
c3c06b8
Parents:
8faf5fa (diff), 117bccb (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' into systemd

Conflicts:

BOOK/general.ent
BOOK/packages.ent

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/packages.ent

    r8faf5fa r8a1e392  
    118118<!ENTITY dejagnu-home "&gnu-software;dejagnu">
    119119
    120 <!ENTITY dhcpcd-version "6.1.0">
    121 <!ENTITY dhcpcd-size "114 KB KB">
     120<!ENTITY dhcpcd-version "6.2.0">
     121<!ENTITY dhcpcd-size "122 KB KB">
    122122<!ENTITY dhcpcd-url "http://roy.marples.name/downloads/dhcpcd/dhcpcd-&dhcpcd-version;.tar.bz2">
    123 <!ENTITY dhcpcd-md5 "6070040c57492925af9ac6aed980de2a">
     123<!ENTITY dhcpcd-md5 "9a21b44992fa070c44160ad24106ff9e">
    124124<!ENTITY dhcpcd-home "http://roy.marples.name/projects/dhcpcd">
    125125
    … …  
    219219<!ENTITY gperf-home "&gnu-software;gperf">
    220220
    221 <!ENTITY grep-version "2.15">
    222 <!ENTITY grep-size "1,267 KB">
     221<!ENTITY grep-version "2.16">
     222<!ENTITY grep-size "1,210 KB">
    223223<!ENTITY grep-url "&gnu;grep/grep-&grep-version;.tar.xz">
    224 <!ENTITY grep-md5 "8cab8ca52bcae735af40278423c7c942">
     224<!ENTITY grep-md5 "502350a6c8f7c2b12ee58829e760b44d">
    225225<!ENTITY grep-home "&gnu-software;grep">
    226226
Note: See TracChangeset for help on using the changeset viewer.