From daafc4cfb784b7fe894f3876a0d76e6800df86b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20=C5=BDivkovi=C4=87?= <igor@linuxfromscratch.org>
Date: Tue, 23 Dec 2014 15:36:54 +0000
Subject: [PATCH] Update to git-2.2.1.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@15251 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        | 2 +-
 general/prog/git.xml               | 8 ++++----
 introduction/welcome/changelog.xml | 6 +++++-
 packages.ent                       | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/general.ent b/general.ent
index e9ed81197e..ce6810a386 100644
--- a/general.ent
+++ b/general.ent
@@ -6,7 +6,7 @@
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "December 23nd, &year;">
+<!ENTITY releasedate  "December 23rd, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development] -->
diff --git a/general/prog/git.xml b/general/prog/git.xml
index 9be0d65470..f5d1f5ea1b 100644
--- a/general/prog/git.xml
+++ b/general/prog/git.xml
@@ -8,10 +8,10 @@
 
   <!ENTITY git-download-http "&git-root;/git-&git-version;.tar.xz">
   <!ENTITY git-download-ftp  "ftp://ftp.kernel.org/pub/software/scm/git/git-&git-version;.tar.xz">
-  <!ENTITY git-md5sum        "5c9d20582297f8f24606fe49f515b584">
-  <!ENTITY git-size          "3.5 MB">
-  <!ENTITY git-buildsize     "218 MB (additional 13 MB for downloaded docs and man pages, or 27 MB building docs and man pages)">
-  <!ENTITY git-time          " 0.8 SBU and additional 2.2 SBU for tests (using parallelism=4) or 2.9 SBU for docs and man build">
+  <!ENTITY git-md5sum        "43e01f9d96ba8c11611e0eef0d9f9f28">
+  <!ENTITY git-size          "3.4 MB">
+  <!ENTITY git-buildsize     "0.3 GB (additional 13 MB for downloaded docs and man pages, or 27 MB building docs and man pages)">
+  <!ENTITY git-time          "0.7 SBU and additional 2.2 SBU for tests (using parallelism=4) or 2.9 SBU for docs and man build">
 ]>
 
 <sect1 id="git" xreflabel="git-&git-version;">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index b558c84067..b56b3b9422 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -45,8 +45,12 @@
 -->
 
     <listitem>
-      <para>December 23nd, 2014</para>
+      <para>December 23rd, 2014</para>
       <itemizedlist>
+        <listitem>
+          <para>[igor] - Update to git-2.2.1. Fixes
+          <ulink url="&blfs-ticket-root;5961">#5961</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[fernando] - Fix URLs: Libdvdread-5.0.0, Libdvdnav-5.0.1
           and libxklavier-5.4.</para>
diff --git a/packages.ent b/packages.ent
index 013ad230a1..ca2e788291 100644
--- a/packages.ent
+++ b/packages.ent
@@ -257,7 +257,7 @@
 <!ENTITY gcc-version                  "4.9.2">
 <!ENTITY gc-version                   "7.4.2">
 <!ENTITY gdb-version                  "7.8.1">
-<!ENTITY git-version                  "2.2.0">
+<!ENTITY git-version                  "2.2.1">
 <!ENTITY guile-version                "2.0.11">
 <!ENTITY librep-version               "0.92.4">
 <!ENTITY llvm-version                 "3.5.0">