Author: bdubbs Date: 2012-03-02 14:51:35 -0700 (Fri, 02 Mar 2012) New Revision: 9567
Modified: trunk/BOOK/general.ent trunk/BOOK/general/prog/git.xml trunk/BOOK/introduction/welcome/changelog.xml Log: Update to git-1.7.9.2 Modified: trunk/BOOK/general/prog/git.xml =================================================================== --- trunk/BOOK/general/prog/git.xml 2012-03-02 14:39:49 UTC (rev 9566) +++ trunk/BOOK/general/prog/git.xml 2012-03-02 21:51:35 UTC (rev 9567) @@ -7,10 +7,10 @@ <!ENTITY git-download-http "http://git-core.googlecode.com/files/git-&git-version;.tar.gz";> <!ENTITY git-download-ftp " "> - <!ENTITY git-md5sum "d94314eb49622a945b22595b36b7fc47"> + <!ENTITY git-md5sum "f2f0fc821ab074862c4a96de3f4cefbe"> <!ENTITY git-size "3.4 MB"> - <!ENTITY git-buildsize "140 MB"> - <!ENTITY git-time "0.7 SBU"> + <!ENTITY git-buildsize "153 MB"> + <!ENTITY git-time "3.0 SBU (including tests)"> ]> <sect1 id="git" xreflabel="git-&git-version;"> @@ -70,27 +70,23 @@ <itemizedlist spacing="compact"> <listitem> <para><ulink - url="http://git-core.googlecode.com/files/git-manpages-&git-version;.2.tar.gz";> - http://git-core.googlecode.com/files/git-manpages-&git-version;.2.tar.gz</ulink> + url="http://git-core.googlecode.com/files/git-manpages-&git-version;.tar.gz";> + http://git-core.googlecode.com/files/git-manpages-&git-version;.tar.gz</ulink> (only needed if you've not installed asciidoc)</para> </listitem> <listitem> <para><ulink - url="http://git-core.googlecode.com/files/git-htmldocs-&git-version;.2.tar.gz";> - http://git-core.googlecode.com/files/git-htmldocs-&git-version;.2.tar.gz</ulink> + url="http://git-core.googlecode.com/files/git-htmldocs-&git-version;.tar.gz";> + http://git-core.googlecode.com/files/git-htmldocs-&git-version;.tar.gz</ulink> and other docs (only needed if you've not installed asciidoc and xmlto).</para> </listitem> </itemizedlist> <bridgehead renderas="sect3">Git Dependencies</bridgehead> - <bridgehead renderas="sect4">Required</bridgehead> - <para role="required"> - <xref linkend="python2"/> - </para> - <bridgehead renderas="sect4">Recommended</bridgehead> <para role="recommended"> + <xref linkend="python2"/> <xref linkend="curl"/> (needed to use <application>Git</application> over http, https, ftp or ftps) </para> @@ -119,7 +115,7 @@ <para>Install <application>Git</application> by running the following commands:</para> -<screen><userinput>./configure --prefix=/usr --with-gitconfig=/etc/gitconfig && +<screen><userinput>./configure --prefix=/usr --with-gitconfig=/etc/gitconfig && make</userinput></screen> <para>If you have installed <ulink @@ -150,48 +146,56 @@ <para>If you created the html docs, install them as the <systemitem class="username">root</systemitem> user:</para> -<screen role="root"><userinput>make htmldir=/usr/share/doc/git-&git-version; install-html && -mkdir -p /usr/share/doc/git-&git-version;/man-pages/{html,text} && -mv /usr/share/doc/git-&git-version;/{git*.txt,man-pages/text} && -mv /usr/share/doc/git-&git-version;/{git*.,index.,man-pages/}html && -mkdir /usr/share/doc/git-&git-version;/technical/{html,text} && -mv /usr/share/doc/git-&git-version;/technical/{*.txt,text} && -mv /usr/share/doc/git-&git-version;/technical/{*.,}html && -mkdir /usr/share/doc/git-&git-version;/howto/{html,text} && -mv /usr/share/doc/git-&git-version;/howto/{*.txt,text} && -mv /usr/share/doc/git-&git-version;/howto/{*.,}html</userinput></screen> +<screen role="root"><userinput>make htmldir=/usr/share/doc/git-&git-version; install-html && +mkdir -p /usr/share/doc/git-&git-version;/man-pages/{html,text} && +mv /usr/share/doc/git-&git-version;/{git*.txt,man-pages/text} && +mv /usr/share/doc/git-&git-version;/{git*.,index.,man-pages/}html && +mkdir /usr/share/doc/git-&git-version;/technical/{html,text} && +mv /usr/share/doc/git-&git-version;/technical/{*.txt,text} && +mv /usr/share/doc/git-&git-version;/technical/{*.,}html && +mkdir /usr/share/doc/git-&git-version;/howto/{html,text} && +mv /usr/share/doc/git-&git-version;/howto/{*.txt,text} && +mv /usr/share/doc/git-&git-version;/howto/{*.,}html</userinput></screen> <para>Alternatively, If you downloaded the man pages untar them as the <systemitem class="username">root</systemitem> user:</para> -<screen role="root"><userinput>tar xf ../git-manpages-&git-version;.2.tar.gz -C /usr/share/man --no-same-owner</userinput></screen> +<screen role="root"><userinput>tar -xf ../git-manpages-&git-version;.tar.gz -C /usr/share/man --no-same-owner</userinput></screen> <para>If you downloaded the html docs untar them as the <systemitem class="username">root</systemitem> user:</para> -<screen role="root"><userinput>mkdir -p /usr/share/doc/git-&git-version;/man-pages/{html,text} && -tar -xf ../git-htmldocs-&git-version;.2.tar.gz \ - -C /usr/share/doc/git-&git-version; --no-same-owner && -mv /usr/share/doc/git-&git-version;/{git*.txt,man-pages/text} && -mv /usr/share/doc/git-&git-version;/{git*.,index.,man-pages/}html && -mkdir /usr/share/doc/git-&git-version;/technical/{html,text} && -mv /usr/share/doc/git-&git-version;/technical/{*.txt,text} && -mv /usr/share/doc/git-&git-version;/technical/{*.,}html && -mkdir /usr/share/doc/git-&git-version;/howto/{html,text} && -mv /usr/share/doc/git-&git-version;/howto/{*.txt,text} && -mv /usr/share/doc/git-&git-version;/howto/{*.,}html</userinput></screen> +<screen role="root"><userinput>mkdir -p /usr/share/doc/git-&git-version;/man-pages/{html,text} && + +tar -xf ../git-htmldocs-&git-version;.tar.gz \ + -C /usr/share/doc/git-&git-version; --no-same-owner && + +mv /usr/share/doc/git-&git-version;/{git*.txt,man-pages/text} && +mv /usr/share/doc/git-&git-version;/{git*.,index.,man-pages/}html && +mkdir /usr/share/doc/git-&git-version;/technical/{html,text} && +mv /usr/share/doc/git-&git-version;/technical/{*.txt,text} && +mv /usr/share/doc/git-&git-version;/technical/{*.,}html && +mkdir /usr/share/doc/git-&git-version;/howto/{html,text} && +mv /usr/share/doc/git-&git-version;/howto/{*.txt,text} && +mv /usr/share/doc/git-&git-version;/howto/{*.,}html</userinput></screen> </sect2> <sect2 role="commands"> <title>Command Explanations</title> - <para><option>--with-gitconfig=/etc/gitconfig</option>: This sets + <para><option>--with-gitconfig=/etc/gitconfig</option>: This sets <filename>/etc/gitconfig</filename> as the file that stores the default, system wide, <application>Git</application> settings.</para> - <para><command>tar xf ../git-manpages-&git-version;.2.tar.gz -C + <para><option>--without-python</option>: Use this option if python is + not installed.</para> + + <para><option>--with-libpcre</option>: Use this option if PCRE is + installed.</para> + + <para><command>tar -xf ../git-manpages-&git-version;.tar.gz -C /usr/share/man --no-same-owner</command>: This untars - <filename>git-manpages-&git-version;.2.tar.gz</filename>. The + <filename>git-manpages-&git-version;.tar.gz</filename>. The <option>-C</option> option makes tar change directory to <filename class="directory">/usr/share/man</filename> before it starts to decompress the docs. The <option>--no-same-owner</option> option stops tar Modified: trunk/BOOK/general.ent =================================================================== --- trunk/BOOK/general.ent 2012-03-02 14:39:49 UTC (rev 9566) +++ trunk/BOOK/general.ent 2012-03-02 21:51:35 UTC (rev 9567) @@ -356,7 +356,7 @@ <!ENTITY gcc-version "4.5.1"> <!ENTITY gcc3-version "3.3.6"> <!ENTITY gdb-version "7.3.1"> -<!ENTITY git-version "1.7.9"> +<!ENTITY git-version "1.7.9.2"> <!ENTITY guile-version "2.0.3"> <!ENTITY icedtea6-version "1.9.7"> <!ENTITY jdk-version "6 Update 18"> Modified: trunk/BOOK/introduction/welcome/changelog.xml =================================================================== --- trunk/BOOK/introduction/welcome/changelog.xml 2012-03-02 14:39:49 UTC (rev 9566) +++ trunk/BOOK/introduction/welcome/changelog.xml 2012-03-02 21:51:35 UTC (rev 9567) @@ -45,6 +45,9 @@ <para>March 2nd, 2012</para> <itemizedlist> <listitem> + <para>[bdubbs] - Update to git-1.7.9.2.</para> + </listitem> + <listitem> <para>[abenton] - Openssl 1.0.0g.</para> </listitem> </itemizedlist> -- http://linuxfromscratch.org/mailman/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
