diff options
| -rw-r--r-- | appendices/dependencies.xml | 2 | ||||
| -rw-r--r-- | chapter01/changelog.xml | 11 | ||||
| -rw-r--r-- | chapter06/chapter06.xml | 2 | ||||
| -rw-r--r-- | general.ent | 4 |
4 files changed, 15 insertions, 4 deletions
diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml index c0fb368b9..b00f9f263 100644 --- a/appendices/dependencies.xml +++ b/appendices/dependencies.xml @@ -412,7 +412,7 @@ <segtitle>&testsuites;</segtitle> <seglistitem> - <seg>None</seg> + <seg>Psmisc</seg> </seglistitem> </segmentedlist> diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index eb7be9d10..11be65500 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -37,6 +37,17 @@ --> <listitem> + <para>2011-12-05</para> + <itemizedlist> + <listitem> + <para>[matthew] - Move Psmisc to before E2fsprogs because the + E2fsprogs testsuite uses killall. Fixes + <ulink url="&lfs-ticket-root;2975">#2975</ulink>.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2011-12-01</para> <itemizedlist> <listitem> diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index 0c6a7236e..b17c3695a 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -32,6 +32,7 @@ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bzip2.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncurses.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="psmisc.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="e2fsprogs.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="coreutils.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iana-etc.xml"/> @@ -64,7 +65,6 @@ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module-init-tools.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patch.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="psmisc.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysklogd.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysvinit.xml"/> diff --git a/general.ent b/general.ent index 5e5c5394a..7870003db 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ -<!ENTITY version "SVN-20111201"> -<!ENTITY releasedate "Dec 1 30, 2011"> +<!ENTITY version "SVN-20111205"> +<!ENTITY releasedate "Dec 5 30, 2011"> <!ENTITY copyrightdate "1999-2011"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "7.1"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> |