Changeset 7cb9b1d


Ignore:
Timestamp:
May 29, 2014, 7:58:23 AM (10 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, master, systemd
Children:
000a8f8
Parents:
fcc84cc (diff), 67d6f59 (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' of git.cross-lfs.org:cross-lfs

Conflicts:

BOOK/introduction/common/changelog.xml

Files:
1 added
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • BOOK/introduction/common/changelog.xml

    rfcc84cc r7cb9b1d  
    4848
    4949    <listitem>
     50      <para>28 May 2014</para>
     51      <itemizedlist>
     52        <listitem>
     53          <para>[William Harrington] - Upgrade Systemd to 213.</para>
     54        </listitem>
     55        <listitem>
     56          <para>[William Harrington] - Upgrade TZData to 2014d.</para>
     57        </listitem>
     58        <listitem>
     59          <para>[William Harrington] - Upgrade Man-pages to 3.68.</para>
     60        </listitem>
     61      </itemizedlist>
     62    </listitem>
     63
     64    <listitem>
    5065      <para>25 May 2014</para>
    5166      <itemizedlist>
  • BOOK/packages.ent

    rfcc84cc r7cb9b1d  
    344344<!ENTITY man-db-md5 "ce7b697f8e8016a085d9f5975ae6c4fb">
    345345
    346 <!ENTITY man-pages-version "3.67">
    347 <!ENTITY man-pages-size "1,248 KB">
     346<!ENTITY man-pages-version "3.68">
     347<!ENTITY man-pages-size "1,254 KB">
    348348<!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
    349 <!ENTITY man-pages-md5 "5629dae00ef93658ada9226aa33b51b6">
     349<!ENTITY man-pages-md5 "43965ed65b34aeff75767b162f97eb01">
    350350<!ENTITY man-pages-home "http://www.win.tue.nl/~aeb/linux/man">
    351351
     
    440440<!ENTITY sysvinit-home "http://savannah.nongnu.org/projects/sysvinit">
    441441
    442 <!ENTITY systemd-version "212">
    443 <!ENTITY systemd-size "2,723 KB">
     442<!ENTITY systemd-version "213">
     443<!ENTITY systemd-size "2,783 KB">
    444444<!ENTITY systemd-url "http://www.freedesktop.org/software/systemd/systemd-&systemd-version;.tar.xz">
    445 <!ENTITY systemd-md5 "257a75fff826ff91cb1ce567091cf270">
     445<!ENTITY systemd-md5 "06496edcf86ddf6d8c12d72ba78e735d">
    446446<!ENTITY systemd-home "http://freedesktop.org/wiki/Software/systemd">
    447447
     
    459459<!ENTITY tcl-home "http://www.tcl.tk">
    460460
    461 <!ENTITY tzdata-version "2014c">
     461<!ENTITY tzdata-version "2014d">
    462462<!ENTITY tzdata-size "221 KB">
    463463<!ENTITY tzdata-url "http://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz">
    464 <!ENTITY tzdata-md5 "fa7f3dc1c6f6238253a6f2b850467e2e">
     464<!ENTITY tzdata-md5 "299b86c0368ecfb321f15d5c408a1d9b">
    465465<!ENTITY tzdata-home "http://www.iana.org/time-zones">
    466466
  • BOOK/patches.ent

    rfcc84cc r7cb9b1d  
    6262
    6363<!ENTITY systemd-compat-patch "systemd-&systemd-version;-compat-1.patch">
    64 <!ENTITY systemd-compat-patch-md5 "09bfa3f4b09620555aa107e48a4f850b">
    65 <!ENTITY systemd-compat-patch-size "9.244 KB">
     64<!ENTITY systemd-compat-patch-md5 "2a5816fdfc8bd2376a40c382004ad1ac">
     65<!ENTITY systemd-compat-patch-size "7.863 KB">
    6666
    6767<!ENTITY sysvinit-tools_updates-patch "sysvinit-&sysvinit-version;-tools_updates-1.patch">
Note: See TracChangeset for help on using the changeset viewer.