Changeset 229ed25 for BOOK/materials/common/patches.xml

Timestamp:

Jan 4, 2014, 12:03:38 AM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

f90d077

Parents:

ec008670 (diff), e57ce38 (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/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.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/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

File:

• BOOK/materials/common/patches.xml (modified) (6 diffs)

BOOK/materials/common/patches.xml

@@ -28 +28 @@
     </varlistentry>
 
+<!-- Binutils branch update area
     <varlistentry>
-      <term>CLooG-PPL Autogen Patch - <token>&cloog-ppl-autogen-patch-size;</token>:</term>
+      <term>Binutils Branch Update Patch - <token>&binutils-branch_update-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
-        url="&patches-root;&cloog-ppl-autogen-patch;"/></para>
-        <para>MD5 sum: <literal>&cloog-ppl-autogen-patch-md5;</literal></para>
+        url="&patches-root;&binutils-branch_update-patch;"/></para>
+        <para>MD5 sum: <literal>&binutils-branch_update-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+-->
     <varlistentry>
       <term>Coreutils Uname Patch - <token>&coreutils-uname-patch-size;</token>:</term>
@@ -47 +48 @@
 
     <varlistentry>
-      <term>EGLIBC Dl Dep Fix Patch - <token>&eglibc-dl_dep_fix-patch-size;</token>:</term>
+      <term>Coreutils Noman Patch - <token>&coreutils-noman-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
-        url="&patches-root;&eglibc-dl_dep_fix-patch;"/></para>
-        <para>MD5 sum: <literal>&eglibc-dl_dep_fix-patch-md5;</literal></para>
+        url="&patches-root;&coreutils-noman-patch;"/></para>
+        <para>MD5 sum: <literal>&coreutils-noman-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Flex GCC 4.4.x Patch - <token>&flex-gcc44-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&flex-gcc44-patch;"/></para>
-        <para>MD5 sum: <literal>&flex-gcc44-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
+<!-- GCC Branch Update Area -->
     <varlistentry>
       <term>GCC Branch Update Patch - <token>&gcc-branch_update-patch-size;</token>:</term>
@@ -70 +63 @@
         url="&patches-root;&gcc-branch_update-patch;"/></para>
         <para>MD5 sum: <literal>&gcc-branch_update-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Iana-Etc Get Fix Patch - <token>&iana-etc-get_fix-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;&iana-etc-get_fix-patch;"/></para>
+        <para>MD5 sum: <literal>&iana-etc-get_fix-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Iana-Etc Protocol and Port Numbers Update - <token>&iana-etc-numbers_update-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;&iana-etc-numbers_update-patch;"/></para>
+        <para>MD5 sum: <literal>&iana-etc-numbers_update-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
@@ -83 +94 @@
 
     <varlistentry>
-      <term>IPUtils Pregenerated Documentation Patch - <token>&iputils-doc-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&iputils-doc-patch;"/></para>
-        <para>MD5 sum: <literal>&iputils-doc-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Kbd es.po Fix Patch - <token>&kbd-espo-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&kbd-espo-patch;"/></para>
-        <para>MD5 sum: <literal>&kbd-espo-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Man i18n Patch - <token>&man-i18n-patch-size;</token>:</term>
       <listitem>
@@ -106 +99 @@
         url="&patches-root;&man-i18n-patch;"/></para>
         <para>MD5 sum: <literal>&man-i18n-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>MPFR Fixes Patch - <token>&mpfr-fixes-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;&mpfr-fixes-patch;"/></para>
+        <para>MD5 sum: <literal>&mpfr-fixes-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
@@ -172 +174 @@
     </varlistentry>
 
-    <varlistentry>
-      <term>Texinfo New Compressors Patch - <token>&texinfo-new_compressors-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&texinfo-new_compressors-patch;"/></para>
-        <para>MD5 sum: <literal>&texinfo-new_compressors-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
+<!-- Vim branch update patch area -->
     <varlistentry>
       <term>Vim Branch Update Patch - <token>&vim-branch_update-patch-size;</token>:</term>