diff options
-rw-r--r-- | chapter01/changelog.xml | 11 | ||||
-rw-r--r-- | chapter01/whatsnew.xml | 4 | ||||
-rw-r--r-- | chapter03/patches.xml | 8 | ||||
-rw-r--r-- | chapter06/bzip2.xml | 6 | ||||
-rw-r--r-- | general.ent | 4 | ||||
-rw-r--r-- | patches.ent | 4 |
6 files changed, 33 insertions, 4 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 68170f90f..f1952b919 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -37,6 +37,17 @@ --> <listitem> + <para>2010-05-21</para> + <itemizedlist> + <listitem> + <para>[matthew] - Add a patch to fix incorrect version numbers in + Bzip2. Thanks to Jeremy Huntwork (LightCube OS) for the patch. Fixes + <ulink url="&lfs-ticket-root;2624">#2624</ulink>.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2010-05-06</para> <itemizedlist> <listitem> diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index c545c83d7..f8266ca12 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -218,6 +218,10 @@ </listitem> <listitem> + <para>bzip2-1.0.5-version_fixes-1.patch</para> + </listitem> + + <listitem> <para>MPC-&mpc-version;</para> </listitem> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index db5c7a9eb..523de647c 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -43,6 +43,14 @@ </varlistentry> <varlistentry> + <term>Bzip2 Version Fixes Patch - <token>&bzip2-version-patch-size;</token>:</term> + <listitem> + <para>Download: <ulink url="&patches-root;&bzip2-version-patch;"/></para> + <para>MD5 sum: <literal>&bzip2-version-patch-md5;</literal></para> + </listitem> + </varlistentry> + + <varlistentry> <term>Coreutils Internationalization Fixes Patch - <token>&coreutils-i18n-patch-size;</token>:</term> <listitem> <para>Download: <ulink url="&patches-root;&coreutils-i18n-patch;"/></para> diff --git a/chapter06/bzip2.xml b/chapter06/bzip2.xml index 63af5e009..1abaaa9e4 100644 --- a/chapter06/bzip2.xml +++ b/chapter06/bzip2.xml @@ -43,9 +43,11 @@ <sect2 role="installation"> <title>Installation of Bzip2</title> - <para>Apply a patch to install the documentation for this package:</para> + <para>Apply 2 patches that will install the documentation for this package + and correct some hard-coded version numbers:</para> -<screen><userinput remap="pre">patch -Np1 -i ../&bzip2-docs-patch;</userinput></screen> +<screen><userinput remap="pre">patch -Np1 -i ../&bzip2-docs-patch; +patch -Np1 -i ../&bzip2-version-patch;</userinput></screen> <para>The following command ensures installation of symbolic links are relative:</para> diff --git a/general.ent b/general.ent index e01e66c0f..cb94129b7 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ -<!ENTITY version "SVN-20100506"> -<!ENTITY releasedate "May 6, 2010"> +<!ENTITY version "SVN-20100521"> +<!ENTITY releasedate "May 19, 2010"> <!ENTITY copyrightdate "1999-2010"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "6.7"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> diff --git a/patches.ent b/patches.ent index 8cfc62ddd..caa4e2e65 100644 --- a/patches.ent +++ b/patches.ent @@ -16,6 +16,10 @@ <!ENTITY bzip2-docs-patch-md5 "6a5ac7e89b791aae556de0f745916f7f"> <!ENTITY bzip2-docs-patch-size "1.6 KB"> +<!ENTITY bzip2-version-patch "bzip2-&bzip2-version;-version_fixes-1.patch"> +<!ENTITY bzip2-version-patch-md5 "5ef00b9da463b399f3d67ecfa276e7ea"> +<!ENTITY bzip2-version-patch-size "5.3 KB"> + <!ENTITY coreutils-i18n-patch "coreutils-&coreutils-version;-i18n-1.patch"> <!ENTITY coreutils-i18n-patch-md5 "13699e7e1c2ab2165dbe9f35c047e804"> |