Changeset 7cb9b1d

Timestamp:

May 29, 2014, 12:58:23 AM (11 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:

• BOOK/introduction/common/changelog.xml (modified) (1 diff)
• BOOK/packages.ent (modified) (3 diffs)
• BOOK/patches.ent (modified) (1 diff)
• patches/systemd-212-compat-1.patch (deleted)
• patches/systemd-213-compat-1.patch (added)

BOOK/introduction/common/changelog.xml

@@ -48 +48 @@
 
     <listitem>
+      <para>28 May 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Upgrade Systemd to 213.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Upgrade TZData to 2014d.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Upgrade Man-pages to 3.68.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>25 May 2014</para>
       <itemizedlist>

BOOK/packages.ent

@@ -344 +344 @@
 <!ENTITY man-db-md5 "ce7b697f8e8016a085d9f5975ae6c4fb">
 
-<!ENTITY man-pages-version "3.67">
-<!ENTITY man-pages-size "1,248 KB">
+<!ENTITY man-pages-version "3.68">
+<!ENTITY man-pages-size "1,254 KB">
 <!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
-<!ENTITY man-pages-md5 "5629dae00ef93658ada9226aa33b51b6">
+<!ENTITY man-pages-md5 "43965ed65b34aeff75767b162f97eb01">
 <!ENTITY man-pages-home "http://www.win.tue.nl/~aeb/linux/man">
 
@@ -440 +440 @@
 <!ENTITY sysvinit-home "http://savannah.nongnu.org/projects/sysvinit">
 
-<!ENTITY systemd-version "212">
-<!ENTITY systemd-size "2,723 KB">
+<!ENTITY systemd-version "213">
+<!ENTITY systemd-size "2,783 KB">
 <!ENTITY systemd-url "http://www.freedesktop.org/software/systemd/systemd-&systemd-version;.tar.xz">
-<!ENTITY systemd-md5 "257a75fff826ff91cb1ce567091cf270">
+<!ENTITY systemd-md5 "06496edcf86ddf6d8c12d72ba78e735d">
 <!ENTITY systemd-home "http://freedesktop.org/wiki/Software/systemd">
 
@@ -459 +459 @@
 <!ENTITY tcl-home "http://www.tcl.tk">
 
-<!ENTITY tzdata-version "2014c">
+<!ENTITY tzdata-version "2014d">
 <!ENTITY tzdata-size "221 KB">
 <!ENTITY tzdata-url "http://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz">
-<!ENTITY tzdata-md5 "fa7f3dc1c6f6238253a6f2b850467e2e">
+<!ENTITY tzdata-md5 "299b86c0368ecfb321f15d5c408a1d9b">
 <!ENTITY tzdata-home "http://www.iana.org/time-zones">
 

BOOK/patches.ent

@@ -62 +62 @@
 
 <!ENTITY systemd-compat-patch "systemd-&systemd-version;-compat-1.patch">
-<!ENTITY systemd-compat-patch-md5 "09bfa3f4b09620555aa107e48a4f850b">
-<!ENTITY systemd-compat-patch-size "9.244 KB">
+<!ENTITY systemd-compat-patch-md5 "2a5816fdfc8bd2376a40c382004ad1ac">
+<!ENTITY systemd-compat-patch-size "7.863 KB">
 
 <!ENTITY sysvinit-tools_updates-patch "sysvinit-&sysvinit-version;-tools_updates-1.patch">