[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, sysvinit, updated. clfs-3.0.0-rc1-sysvinit-26-gf11ffa6
git
git at cross-lfs.org
Tue Aug 5 03:14:48 PDT 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, sysvinit has been updated
via f11ffa6d39e8c5a390ed64ee7295f6e141397118 (commit)
via 06d0c6bc53151db9133f66a6ab466c44b51addb4 (commit)
via 6a2df0f683f983645cdb067025ba7328dacfef85 (commit)
via 8b80c2212e29850c854d1c9fecca0deb55fc622f (commit)
via 34725baac1daf2a82363005be5948d4857054056 (commit)
via 750bc5d1f6997ab84db8e4077789e27524496a15 (commit)
via 237a20aac5fb52b62b49e815127a7dca38168cc8 (commit)
from fc44790fc7163afabc5ca89ee7cabde2e3707a13 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f11ffa6d39e8c5a390ed64ee7295f6e141397118
Author: Chris Staub <chris at beaker67.com>
Date: Tue Aug 5 06:10:48 2014 -0400
Added changelog entry for restoring original Vim doc location
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 2ed4387..49c1c5e 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -37,6 +37,16 @@
-->
<listitem>
+ <para>05 August 2014</para>
+ <itemizedlist>
+ <listitem>
+ <para>[Chris] - Reversed change to Vim's docs location, so that
+ Vim can find its help files.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>01 August 2014</para>
<itemizedlist>
<listitem>
commit 06d0c6bc53151db9133f66a6ab466c44b51addb4
Author: Chris Staub <chris at beaker67.com>
Date: Tue Aug 5 05:52:32 2014 -0400
Updated date
diff --git a/BOOK/general.ent b/BOOK/general.ent
index ffc5659..f1bb913 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -2,7 +2,7 @@
<!ENTITY month "08"> <!-- Use two digits -->
<!ENTITY month_name "August">
-<!ENTITY day "01"> <!-- Use two digits -->
+<!ENTITY day "05"> <!-- Use two digits -->
<!ENTITY year "2014"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
commit 6a2df0f683f983645cdb067025ba7328dacfef85
Author: Chris Staub <chris at beaker67.com>
Date: Tue Aug 5 04:45:41 2014 -0400
Revert "Remove link for installed documentation and install documentation into the proper place with HELPSUBLOC variable during make install."
This reverts commit 906f724c28419a6465567fa94057cef558109f4f.
Conflicts:
BOOK/final-system/common/vim.xml
diff --git a/BOOK/final-system/common/vim.xml b/BOOK/final-system/common/vim.xml
index 38fb8e7..dca3843 100644
--- a/BOOK/final-system/common/vim.xml
+++ b/BOOK/final-system/common/vim.xml
@@ -63,7 +63,7 @@
<para os="j">Install the package:</para>
-<screen os="k"><userinput>make HELPSUBLOC=/usr/share/doc/vim-&vim-version; install</userinput></screen>
+<screen os="k"><userinput>make install</userinput></screen>
<para os="l">Many users are accustomed to using <command>vi</command>
instead of <command>vim</command>. Some programs, such as
@@ -74,7 +74,15 @@
<screen os="m"><userinput>ln -sv vim /usr/bin/vi</userinput></screen>
- <para os="n">If an X Window System is going to be installed on the CLFS
+<para os="n">By default, Vim's documentation is installed in
+<filename class="directory">/usr/share/vim</filename>. The following symlink
+allows the documentation to be accessed via
+<filename class="directory">/usr/share/doc/vim-&vim-version;</filename>, making
+it consistent with the location of documentation for other packages:</para>
+
+<screen os="o"><userinput>ln -sv ../vim/vim&vim-version2;/doc /usr/share/doc/vim-&vim-version;</userinput></screen>
+
+ <para os="p">If an X Window System is going to be installed on the CLFS
system, you may want to recompile Vim after installing X. Vim
comes with a GUI version of the editor that requires X and some
additional libraries to be installed. For more information, refer to the
@@ -140,14 +148,14 @@ EOF</userinput></screen>
<segmentedlist>
<segtitle>Installed programs</segtitle>
- <segtitle>Installed directories</segtitle>
+ <segtitle>Installed directory</segtitle>
<seglistitem>
<seg>efm_filter.pl, efm_perl.pl, ex (link to vim), less.sh, mve.awk,
pltags.pl, ref, rview (link to vim), rvim (link to vim), shtags.pl,
tcltags, vi (link to vim), view (link to vim), vim, vim132, vim2html.pl,
vimdiff (link to vim), vimm, vimspell.sh, vimtutor, xxd</seg>
- <seg>/usr/share/vim, /usr/share/doc/vim-&vim-version;</seg>
+ <seg>/usr/share/vim</seg>
</seglistitem>
</segmentedlist>
diff --git a/BOOK/final-system/multilib/vim.xml b/BOOK/final-system/multilib/vim.xml
index 7739f74..e2095b4 100644
--- a/BOOK/final-system/multilib/vim.xml
+++ b/BOOK/final-system/multilib/vim.xml
@@ -89,6 +89,14 @@
href="../common/vim.xml"
xpointer="xpointer(//*[@os='n'])"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/vim.xml"
+ xpointer="xpointer(//*[@os='o'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/vim.xml"
+ xpointer="xpointer(//*[@os='p'])"/>
+
</sect2>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
commit 8b80c2212e29850c854d1c9fecca0deb55fc622f
Author: Chris Staub <chris at beaker67.com>
Date: Tue Aug 5 04:44:06 2014 -0400
Revert "Don't use make install include from final-system vim. We don't want to install the documentation to /usr/share/doc for temp-system. Let vim install the documentation to its default location."
This reverts commit e6fe94de8833cd3f66c31a5a9c26bc800eb75c5b.
diff --git a/BOOK/temp-system/common/vim.xml b/BOOK/temp-system/common/vim.xml
index 1d9bf82..44c3dd7 100644
--- a/BOOK/temp-system/common/vim.xml
+++ b/BOOK/temp-system/common/vim.xml
@@ -115,7 +115,9 @@ EOF</userinput></screen>
href="../../final-system/common/vim.xml"
xpointer="xpointer(//*[@os='j'])"/>
-<screen os="k"><userinput>make install</userinput></screen>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../../final-system/common/vim.xml"
+ xpointer="xpointer(//*[@os='k'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/vim.xml"
commit 34725baac1daf2a82363005be5948d4857054056
Author: Chris Staub <chris at beaker67.com>
Date: Tue Aug 5 04:39:11 2014 -0400
Revert "Added command explanation to final-system vim"
This reverts commit dc74128530402b487734b219795760d98cc7c05e.
diff --git a/BOOK/final-system/common/vim.xml b/BOOK/final-system/common/vim.xml
index bf351a9..38fb8e7 100644
--- a/BOOK/final-system/common/vim.xml
+++ b/BOOK/final-system/common/vim.xml
@@ -65,31 +65,16 @@
<screen os="k"><userinput>make HELPSUBLOC=/usr/share/doc/vim-&vim-version; install</userinput></screen>
- <variablelist os="l">
- <title>The meaning of the make option:</title>
-
- <varlistentry>
- <term><parameter>HELPSUBLOC=/usr/share/doc/vim-&vim-version;</parameter></term>
- <listitem>
- <para>Tells Vim to install its documentation into
- <filename class="directory">/usr/share/doc/vim-&vim-version;</filename>
- instead of
- <filename class="directory">/usr/share/vim/vim&vim-version2;/doc</filename>.</para>
- </listitem>
- </varlistentry>
-
- </variablelist>
-
- <para os="m">Many users are accustomed to using <command>vi</command>
+ <para os="l">Many users are accustomed to using <command>vi</command>
instead of <command>vim</command>. Some programs, such as
<command>vigr</command> and <command>vipw</command>, also use
<command>vi</command>. Create a symlink to permit execution of
<command>vim</command> when users habitually enter <command>vi</command>
and allow programs that use <command>vi</command> to work:</para>
-<screen os="n"><userinput>ln -sv vim /usr/bin/vi</userinput></screen>
+<screen os="m"><userinput>ln -sv vim /usr/bin/vi</userinput></screen>
- <para os="o">If an X Window System is going to be installed on the CLFS
+ <para os="n">If an X Window System is going to be installed on the CLFS
system, you may want to recompile Vim after installing X. Vim
comes with a GUI version of the editor that requires X and some
additional libraries to be installed. For more information, refer to the
diff --git a/BOOK/final-system/multilib/vim.xml b/BOOK/final-system/multilib/vim.xml
index c9824a1..7739f74 100644
--- a/BOOK/final-system/multilib/vim.xml
+++ b/BOOK/final-system/multilib/vim.xml
@@ -89,10 +89,6 @@
href="../common/vim.xml"
xpointer="xpointer(//*[@os='n'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/vim.xml"
- xpointer="xpointer(//*[@os='o'])"/>
-
</sect2>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
commit 750bc5d1f6997ab84db8e4077789e27524496a15
Author: Chris Staub <chris at beaker67.com>
Date: Tue Aug 5 04:38:44 2014 -0400
Revert "Use correct xinclude for temp-system vim"
This reverts commit 5b192dc0160f6160c772662371ec12f2101fd755.
diff --git a/BOOK/temp-system/common/vim.xml b/BOOK/temp-system/common/vim.xml
index f6a6742..1d9bf82 100644
--- a/BOOK/temp-system/common/vim.xml
+++ b/BOOK/temp-system/common/vim.xml
@@ -119,9 +119,9 @@ EOF</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/vim.xml"
- xpointer="xpointer(//*[@os='m'])"/>
+ xpointer="xpointer(//*[@os='l'])"/>
-<screen os="n"><userinput>ln -sv vim /tools/bin/vi</userinput></screen>
+<screen os="m"><userinput>ln -sv vim /tools/bin/vi</userinput></screen>
<para os="tv1">Create a temporary vimrc to make it function more the way you may
expect it to. This is explained more in the final system:</para>
commit 237a20aac5fb52b62b49e815127a7dca38168cc8
Author: Chris Staub <chris at beaker67.com>
Date: Tue Aug 5 04:37:10 2014 -0400
Revert "Slight addition to command explanation for vim"
This reverts commit da399efe3326c6a1b794759dd0e9d32b2714a44e.
diff --git a/BOOK/final-system/common/vim.xml b/BOOK/final-system/common/vim.xml
index 62042a6..bf351a9 100644
--- a/BOOK/final-system/common/vim.xml
+++ b/BOOK/final-system/common/vim.xml
@@ -74,9 +74,7 @@
<para>Tells Vim to install its documentation into
<filename class="directory">/usr/share/doc/vim-&vim-version;</filename>
instead of
- <filename class="directory">/usr/share/vim/vim&vim-version2;/doc</filename>,
- for better consistency with the documentation location for other
- packages.</para>
+ <filename class="directory">/usr/share/vim/vim&vim-version2;/doc</filename>.</para>
</listitem>
</varlistentry>
-----------------------------------------------------------------------
Summary of changes:
BOOK/final-system/common/vim.xml | 37 ++++++++++++-------------------
BOOK/final-system/multilib/vim.xml | 4 +++
BOOK/general.ent | 2 +-
BOOK/introduction/common/changelog.xml | 10 ++++++++
BOOK/temp-system/common/vim.xml | 8 ++++--
5 files changed, 34 insertions(+), 27 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list