Changeset 9793117 for BOOK/packages.ent


Ignore:
Timestamp:
Apr 23, 2011, 10:52:47 AM (14 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
bd31da6b
Parents:
21e442f (diff), a675f833 (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/appendices/dependencies/common.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

File:
1 edited

Legend:

Unmodified
Added
Removed
  • BOOK/packages.ent

    r21e442f r9793117  
    267267<!ENTITY libcap-home "http://sites.google.com/site/fullycapable/">
    268268
     269<!ENTITY libee-version "0.3.1">
     270<!ENTITY libee-size "344 KB">
     271<!ENTITY libee-url "http://www.libee.org/files/download/libee-&libee-version;.tar.gz">
     272<!ENTITY libee-md5 "61403a9a62b984381cf48454664f915e">
     273<!ENTITY libee-home "http://www.libee.org/">
     274
     275<!ENTITY libestr-version "0.1.0">
     276<!ENTITY libestr-size "308 KB">
     277<!ENTITY libestr-url "http://sourceforge.net/projects/libestr/files/libestr-&libestr-version;.tar.gz">
     278<!ENTITY libestr-md5 "1b8fe449cffc259075d327334c93bbda">
     279<!ENTITY libestr-home "http://sourceforge.net/projects/libestr/">
     280
    269281<!ENTITY libtool-version "2.4">
    270282<!ENTITY libtool-size "836 KB">
     
    384396<!ENTITY readline-home "http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html">
    385397
    386 <!ENTITY rsyslog-version "4.4.2">
    387 <!ENTITY rsyslog-size "1,956 KB">
     398<!ENTITY rsyslog-version "6.1.7">
     399<!ENTITY rsyslog-size "2,336 KB">
    388400<!ENTITY rsyslog-url "http://download.rsyslog.com/rsyslog/rsyslog-&rsyslog-version;.tar.gz">
    389 <!ENTITY rsyslog-md5 "a8ada67b6cd5c00fbeb3a4b687b17359">
     401<!ENTITY rsyslog-md5 "7f14d4fb992c3cc81fd61e561298bd46">
    390402<!ENTITY rsyslog-home "http://www.rsyslog.com/">
    391403
Note: See TracChangeset for help on using the changeset viewer.