Changeset 6cefbfb for BOOK/patches.ent


Ignore:
Timestamp:
Apr 16, 2011, 2:36:23 PM (13 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
21e442f
Parents:
8c3f58f (diff), af891d2 (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/introduction/common/changelog.xml
BOOK/packages.ent

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/patches.ent

    r8c3f58f r6cefbfb  
    55<!-- Start of Common Patches -->
    66
    7 <!ENTITY bash-branch_update-patch "bash-&bash-version;-branch_update-2.patch">
    8 <!ENTITY bash-branch_update-patch-md5 "7645587a6efcefa67936dcaeb9b2bee7">
    9 <!ENTITY bash-branch_update-patch-size "8 KB">
     7<!ENTITY bash-branch_update-patch "bash-&bash-version;-branch_update-1.patch">
     8<!ENTITY bash-branch_update-patch-md5 "ee7bbf5d36058487cbe23f5571a2c21c">
     9<!ENTITY bash-branch_update-patch-size "12 KB">
    1010
    1111<!ENTITY cloog-ppl-autogen-patch "cloog-ppl-&cloog-ppl-version;-autogen-1.patch">
    … …  
    2222
    2323<!ENTITY gcc-specs-patch "gcc-&gcc-version;-specs-1.patch">
    24 <!ENTITY gcc-specs-patch-md5 "15e207e152928cb307f38aa0c0924429">
     24<!ENTITY gcc-specs-patch-md5 "61d583984f9f12b6f37141e132fc7d57">
    2525<!ENTITY gcc-specs-patch-size "20 KB">
    2626
    … …  
    4343<!ENTITY ncurses-bashfix-patch "ncurses-&ncurses-version;-bash_fix-1.patch">
    4444<!ENTITY ncurses-bashfix-patch-md5 "c6f7f2ab0ebaf7721ebeb266641352db">
    45 <!ENTITY ncurses-bashfix-patch-size ".7 KB">
     45<!ENTITY ncurses-bashfix-patch-size "4 KB">
    4646
    47 <!ENTITY ncurses-branch_update-patch "ncurses-&ncurses-version;-branch_update-22.patch">
    48 <!ENTITY ncurses-branch_update-patch-md5 "3b543b078fe0703e9277b75076209a79">
    49 <!ENTITY ncurses-branch_update-patch-size "6,280 KB">
     47<!ENTITY ncurses-branch_update-patch "ncurses-&ncurses-version;-branch_update-1.patch">
     48<!ENTITY ncurses-branch_update-patch-md5 "5361bccf700849ba968a8886cdfaa879">
     49<!ENTITY ncurses-branch_update-patch-size "324 KB">
    5050
    5151<!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch">
    … …  
    6666
    6767<!ENTITY tar-man-patch "tar-&tar-version;-man-1.patch">
    68 <!ENTITY tar-man-patch-md5 "6a1a1d8bdc00fc149c28aa1f8405fc93">
     68<!ENTITY tar-man-patch-md5 "79d962bddc4871b394e5f8e3267680fe">
    6969<!ENTITY tar-man-patch-size "20 KB">
    7070
    … …  
    9090
    9191<!ENTITY gcc-pure64-patch "gcc-&gcc-version;-pure64-1.patch">
    92 <!ENTITY gcc-pure64-patch-md5 "9f230c4d6fc288405d831aaf02ef8a69">
     92<!ENTITY gcc-pure64-patch-md5 "7c41d649fe266f11e4dbdd2392f7729b">
    9393<!ENTITY gcc-pure64-patch-size "12 KB">
    9494
    9595<!ENTITY gcc-specs_pure64-patch "gcc-&gcc-version;-pure64_specs-1.patch">
    96 <!ENTITY gcc-specs_pure64-patch-md5 "bdf42c85af936319438f912a3870e3ea">
     96<!ENTITY gcc-specs_pure64-patch-md5 "24f012f5d407d48bf6191ec5aa6bed60">
    9797<!ENTITY gcc-specs_pure64-patch-size "24 KB">
    9898
Note: See TracChangeset for help on using the changeset viewer.