Changeset 4ce7c10 for BOOK/packages.ent


Ignore:
Timestamp:
Jan 29, 2011, 4:28:46 PM (13 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
d2759bb
Parents:
f33b74f (diff), 9fedd70f (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/final-system/multilib/util-linux-64bit.xml
BOOK/final-system/multilib/util-linux-n32.xml
BOOK/final-system/multilib/util-linux.xml

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/packages.ent

    rf33b74f r4ce7c10  
    420420<!ENTITY uname_hack-home " ">
    421421
    422 <!ENTITY util-linux-ng-major-version "2.18">
    423 <!ENTITY util-linux-ng-version "&util-linux-ng-major-version;">
    424 <!ENTITY util-linux-ng-size "7,492 KB">
    425 <!ENTITY util-linux-ng-url "&kernel;linux/utils/util-linux-ng/v&util-linux-ng-major-version;/util-linux-ng-&util-linux-ng-version;.tar.bz2">
    426 <!ENTITY util-linux-ng-md5 "2f5f71e6af969d041d73ab778c141a77">
    427 <!ENTITY util-linux-ng-blkid-id "1.1.0">
    428 <!ENTITY util-linux-ng-uuid-id "1.3.0">
    429 <!ENTITY util-linux-ng-home "http://userweb.kernel.org/~kzak/util-linux-ng/">
     422<!ENTITY util-linux-major-version "2.19">
     423<!ENTITY util-linux-version "&util-linux-major-version;-rc3">
     424<!ENTITY util-linux-size "4,200 KB">
     425<!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v&util-linux-major-version;/util-linux-&util-linux-version;.tar.bz2">
     426<!ENTITY util-linux-md5 "89423502d34bd1e6da0ad29ac716145f">
     427<!ENTITY util-linux-blkid-id "1.1.0">
     428<!ENTITY util-linux-uuid-id "1.3.0">
     429<!ENTITY util-linux-home "http://userweb.kernel.org/~kzak/util-linux/">
    430430
    431431<!ENTITY vim-version "7.3">
Note: See TracChangeset for help on using the changeset viewer.