aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml10
-rw-r--r--chapter01/whatsnew.xml5
-rw-r--r--chapter03/patches.xml15
-rw-r--r--chapter06/groff.xml2
-rw-r--r--general.ent5
-rw-r--r--patches.ent2
6 files changed, 21 insertions, 18 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index ff8a69d54..2d16768b1 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,16 @@
-->
<listitem>
+ <para>March 7, 2006</para>
+ <itemizedlist>
+ <listitem>
+ <para>[archaic] - Replaced the debian-specific groff patch with an
+ LFS-style patch.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>March 3, 2006</para>
<itemizedlist>
<listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 1f30710f5..a96b24483 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -196,7 +196,7 @@
<title>Downgraded to:</title>
<listitem>
- <para>Groff &groff-version;-&groff-patchlevel;</para>
+ <para>Groff &groff-version;</para>
</listitem>
</itemizedlist>
@@ -220,6 +220,9 @@
<para>&gcc-specs-patch;</para>
</listitem>
<listitem>
+ <para>&groff-debian-patch;</para>
+ </listitem>
+ <listitem>
<para>Berkeley DB-&db-version;</para>
</listitem>
<listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index e8c753d4a..4d7bf5782 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -103,18 +103,9 @@
</varlistentry>
<varlistentry>
- <term>Groff Debian Patch - 129 KB:</term>
- <listitem>
- <para><ulink url="http://ftp.debian.org/debian/pool/main/g/groff/&groff-debian-patch;"/></para>
-
- <note>
- <para>Groff Debian Patch (&groff-version;-&groff-patchlevel;) may no
- longer be available at the listed location. The site administrators
- of the master download location occasionally remove older versions
- when new ones are released. There is no alternative download location
- yet.</para>
- </note>
- <!-- Actually there's snapshot.debian.net, but they have hardware problems -->
+ <term>Groff Debian Patch - 360 KB:</term>
+ <listitem>
+ <para><ulink url="&patches-root;&groff-debian-patch;"/></para>
</listitem>
</varlistentry>
diff --git a/chapter06/groff.xml b/chapter06/groff.xml
index 9f41b2ae3..206971348 100644
--- a/chapter06/groff.xml
+++ b/chapter06/groff.xml
@@ -47,7 +47,7 @@
<para>Apply the patch that adds the <quote>ascii8</quote> and
<quote>nippon</quote> devices to Groff:</para>
-<screen><userinput>zcat ../&groff-debian-patch; | patch -Np1</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&groff-debian-patch;</userinput></screen>
<note>
<para>These devices are used by Man-DB when formatting non-English manual
diff --git a/general.ent b/general.ent
index 691e46538..6c5ed3586 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20060303">
-<!ENTITY releasedate "March 3, 2006">
+<!ENTITY version "SVN-20060307">
+<!ENTITY releasedate "March 7, 2006">
<!ENTITY milestone "6.2">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
@@ -49,7 +49,6 @@
<!ENTITY glibc-version "2.3.6">
<!ENTITY grep-version "2.5.1a">
<!ENTITY groff-version "1.18.1.1">
-<!ENTITY groff-patchlevel "11">
<!ENTITY grub-version "0.97">
<!ENTITY gzip-version "1.3.5">
<!ENTITY hotplug-version "2004_09_23">
diff --git a/patches.ent b/patches.ent
index 1570c69c5..6200c3ab6 100644
--- a/patches.ent
+++ b/patches.ent
@@ -22,7 +22,7 @@
<!ENTITY grep-fixes-patch "grep-&grep-version;-redhat_fixes-2.patch">
-<!ENTITY groff-debian-patch "groff_&groff-version;-&groff-patchlevel;.diff.gz">
+<!ENTITY groff-debian-patch "groff-&groff-version;-debian_fixes-1.patch">
<!ENTITY gzip-security_fix-patch "gzip-&gzip-version;-security_fixes-1.patch">