Changeset 1718e20 for BOOK/packages.ent


Ignore:
Timestamp:
May 23, 2011, 3:04:49 PM (13 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
cfb2026a
Parents:
30a199c (diff), 1ac2d0c (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/common/kbd.xml

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/packages.ent

    r30a199c r1718e20  
    4949<!ENTITY binutils-home "http://sources.redhat.com/binutils">
    5050
    51 <!ENTITY bison-version "2.4.3">
    52 <!ENTITY bison-size "1,616 KB">
     51<!ENTITY bison-version "2.5">
     52<!ENTITY bison-size "2,030 KB">
    5353<!ENTITY bison-url "&gnu;bison/bison-&bison-version;.tar.bz2">
    54 <!ENTITY bison-md5 "c1d3ea81bc370dbd43b6f0b2cd21287e">
     54<!ENTITY bison-md5 "9dba20116b13fc61a0846b0058fbe004">
    5555<!ENTITY bison-home "&gnu-software;bison">
    5656
    … …  
    193193<!ENTITY gettext-home "&gnu-software;gettext">
    194194
     195<!ENTITY glib-version "2.28.6">
     196<!ENTITY glib-size "6,956 KB">
     197<!ENTITY glib-url "http://ftp.gnome.org/pub/gnome/sources/glib/2.28/glib-&glib-version;.tar.bz2">
     198<!ENTITY glib-md5 "7d8fc15ae70d5111c0cf2a79d50ef717">
     199<!ENTITY glib-home "http://developer.gnome.org/glib/">
     200
    195201<!ENTITY gmp-version "5.0.2">
    196202<!ENTITY gmp-size "2,025 KB">
    … …  
    249255<!ENTITY iputils-home "http://www.linuxfoundation.org/en/Net:Iputils">
    250256
    251 <!ENTITY kbd-version "1.15.2">
    252 <!ENTITY kbd-size "1,524 KB">
     257<!ENTITY kbd-version "1.15.3">
     258<!ENTITY kbd-size "1,660 KB">
    253259<!ENTITY kbd-url "ftp://devel.altlinux.org/legion/kbd/kbd-&kbd-version;.tar.gz">
    254 <!ENTITY kbd-md5 "77d0b51454522bc6c170bbdc6e31202a">
     260<!ENTITY kbd-md5 "8143e179a0f3c25646ce5085e8777200">
    255261<!ENTITY kbd-home " ">
    256262
    … …  
    359365<!ENTITY perl-home "http://www.perl.org">
    360366
    361 <!ENTITY pkg-config-version "0.25">
    362 <!ENTITY pkg-config-size "968 KB">
     367<!ENTITY pkg-config-version "0.26">
     368<!ENTITY pkg-config-size "388 KB">
    363369<!ENTITY pkg-config-url "http://pkgconfig.freedesktop.org/releases/pkg-config-&pkg-config-version;.tar.gz">
    364 <!ENTITY pkg-config-md5 "a3270bab3f4b69b7dc6dbdacbcae9745">
     370<!ENTITY pkg-config-md5 "47525c26a9ba7ba14bf85e01509a7234">
    365371<!ENTITY pkg-config-home "http://pkgconfig.freedesktop.org/wiki/">
    366372
Note: See TracChangeset for help on using the changeset viewer.