From aaed96447b95c9d111351a261d4f3109b66cb2cd Mon Sep 17 00:00:00 2001
From: Fernando de Oliveira <fernando@linuxfromscratch.org>
Date: Thu, 10 Apr 2014 22:43:19 +0000
Subject: [PATCH] ffmpeg-2.2.1, git-1.9.2, iso-codes-3.52, xfburn-0.5.2 and
 gnome-calculator-3.12.1.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@12947 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                             | 10 +++++-----
 general/genutils/iso-codes.xml          |  6 +++---
 general/prog/git.xml                    | 13 ++++++++-----
 gnome/applications/gnome-calculator.xml |  9 +++++----
 introduction/welcome/changelog.xml      | 26 +++++++++++++++++++++++++
 multimedia/videoutils/ffmpeg.xml        |  8 ++++----
 xfce/apps/xfburn.xml                    | 10 +++++-----
 7 files changed, 56 insertions(+), 26 deletions(-)

diff --git a/general.ent b/general.ent
index 8e5eb07e7b..757f7e1726 100644
--- a/general.ent
+++ b/general.ent
@@ -227,7 +227,7 @@ export -f as_root</userinput></screen>
 <!ENTITY icu-version                  "&icu-major;.&icu-minor;"><!-- .&icu-patch;-->
 <!ENTITY icu-dl-version               "&icu-major;_&icu-minor;"><!-- _&icu-patch;-->
 
-<!ENTITY iso-codes-version            "3.51">
+<!ENTITY iso-codes-version            "3.52">
 <!ENTITY JS-version                   "17.0.0">
 <!ENTITY JS2-version                  "24.2.0">
 <!ENTITY json-c-version               "0.11">
@@ -380,7 +380,7 @@ export -f as_root</userinput></screen>
 <!ENTITY gcc-version                  "4.8.2">
 <!ENTITY gc-version                   "7.4.0">
 <!ENTITY gdb-version                  "7.7">
-<!ENTITY git-version                  "1.9.1">
+<!ENTITY git-version                  "1.9.2">
 <!ENTITY guile-version                "2.0.11">
 <!ENTITY librep-version               "0.92.3">
 <!ENTITY llvm-version                 "3.4">
@@ -650,7 +650,7 @@ export -f as_root</userinput></screen>
 <!ENTITY evince-version               "3.12.0">
 <!ENTITY file-roller-version          "3.12.0">
 <!ENTITY gedit-version                "3.12.0">
-<!ENTITY gnome-calculator-version     "3.12.0">
+<!ENTITY gnome-calculator-version     "3.12.1">
 <!ENTITY gnome-nettool-version        "3.8.1">
 <!ENTITY gnome-screenshot-version     "3.12.0">
 <!ENTITY gnome-system-monitor-version "3.12.0">
@@ -691,7 +691,7 @@ export -f as_root</userinput></screen>
 <!ENTITY mousepad-version             "0.3.0">
 <!ENTITY vte2-version                 "0.28.2">
 <!ENTITY xfce4-terminal-version       "0.6.3">
-<!ENTITY xfburn-version               "0.5.0">
+<!ENTITY xfburn-version               "0.5.2">
 <!ENTITY ristretto-version            "0.6.3">
 <!ENTITY libunique-version            "1.1.6">
 <!ENTITY xfce4-mixer-version          "4.10.0">
@@ -830,7 +830,7 @@ export -f as_root</userinput></screen>
 <!ENTITY pnmixer-version              "0.5.1">
 
 <!-- Chapter 40 -->
-<!ENTITY ffmpeg-version               "2.2">
+<!ENTITY ffmpeg-version               "2.2.1">
 <!ENTITY mplayer-version              "1.1.1">
 <!ENTITY xine-ui-version              "0.99.8">
 <!ENTITY transcode-version            "1.1.7">
diff --git a/general/genutils/iso-codes.xml b/general/genutils/iso-codes.xml
index 78b5beb6b6..08b79b2a3c 100644
--- a/general/genutils/iso-codes.xml
+++ b/general/genutils/iso-codes.xml
@@ -9,10 +9,10 @@
 -->
   <!ENTITY iso-codes-download-http "http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-&iso-codes-version;.tar.xz">
   <!ENTITY iso-codes-download-ftp  " ">
-  <!ENTITY iso-codes-md5sum        "c73f0bdfaddbec22779b9fcae970fe85">
+  <!ENTITY iso-codes-md5sum        "0f3f6ce16b3cf4b92538b8255e0dfa92">
   <!ENTITY iso-codes-size          "3.5 MB">
   <!ENTITY iso-codes-buildsize     "107 MB">
-  <!ENTITY iso-codes-time          "0.1 SBU">
+  <!ENTITY iso-codes-time          "0.2 SBU (additional 0.1 SBU for the tests)">
 ]>
 
 <sect1 id="iso-codes" xreflabel="ISO Codes-&iso-codes-version;">
@@ -91,7 +91,7 @@
 make</userinput></screen>
 
     <para>
-      This package does not come with a test suite.
+      To test the results, issue: <command>make check</command>.
     </para>
 
     <para>
diff --git a/general/prog/git.xml b/general/prog/git.xml
index 25dc1230f4..3047b05cbd 100644
--- a/general/prog/git.xml
+++ b/general/prog/git.xml
@@ -8,10 +8,11 @@
 
   <!ENTITY git-download-http "&git-root;/git-&git-version;.tar.xz">
   <!ENTITY git-download-ftp  " ">
-  <!ENTITY git-md5sum        "d65ca55041898c226e532425fc673035">
+  <!ENTITY git-md5sum        "437c32078b5b5b229f1c10f6474eae78">
   <!ENTITY git-size          "3.3 MB">
-  <!ENTITY git-buildsize     "218 MB (additional 1 MB for the tests, 13 MB with downloaded docs or man pages, or 23 MB building docs and man pages)">
-  <!ENTITY git-time          "0.7 SBU (additional 7.6 SBU for tests or 2.6 SBU for docs and man build)">
+  <!ENTITY git-buildsize     "218 MB (additional 13 MB for downloaded docs and man pages, or 24 MB building docs and man pages)">
+  <!ENTITY git-time          "0.7 SBU (additional 7.9 SBU for tests or 3.1 SBU for docs and man build)
+">
 ]>
 
 <sect1 id="git" xreflabel="git-&git-version;">
@@ -87,14 +88,16 @@
         <para>
           <ulink url="&git-root;/git-manpages-&git-version;.tar.xz">
           &git-root;/git-manpages-&git-version;.tar.xz</ulink>
-          (only needed if you've not installed asciidoc and xmlto)
+          (if you prefer the original, not needed if you've installed asciidoc
+          and xmlto and prefer to build them).
         </para>
       </listitem>
       <listitem>
         <para>
           <ulink url="&git-root;/git-htmldocs-&git-version;.tar.xz">
           &git-root;/git-htmldocs-&git-version;.tar.xz</ulink>
-          and other docs (only needed if you've not installed asciidoc).
+          and other docs (if you prefer the original, not needed if you've
+          installed asciidoc and prefer to build them).
         </para>
       </listitem>
     </itemizedlist>
diff --git a/gnome/applications/gnome-calculator.xml b/gnome/applications/gnome-calculator.xml
index 337e0d4730..81d1909ad8 100644
--- a/gnome/applications/gnome-calculator.xml
+++ b/gnome/applications/gnome-calculator.xml
@@ -8,10 +8,10 @@
            "&gnome-download-http;/gnome-calculator/&gnome-minor;/gnome-calculator-&gnome-calculator-version;.tar.xz">
   <!ENTITY gnome-calculator-download-ftp
            "&gnome-download-ftp;/gnome-calculator/&gnome-minor;/gnome-calculator-&gnome-calculator-version;.tar.xz">
-  <!ENTITY gnome-calculator-md5sum        "b137d7f0d979e5eac9a2f11a83612957">
+  <!ENTITY gnome-calculator-md5sum        "fda401b6d19df8c65b295c9d51155d8e">
   <!ENTITY gnome-calculator-size          "1.1 MB">
-  <!ENTITY gnome-calculator-buildsize     "44 MB">
-  <!ENTITY gnome-calculator-time          "0.3 SBU">
+  <!ENTITY gnome-calculator-buildsize     "45 MB">
+  <!ENTITY gnome-calculator-time          "0.4 SBU (additional 0.1 SBU for the tests)">
 ]>
 
 <sect1 id="gnome-calculator" xreflabel="gnome-calculator-&gnome-calculator-version;">
@@ -104,7 +104,8 @@
 make</userinput></screen>
 
     <para>
-      This package does not come with a test suite.
+      To test the results, issue: <command>make -k check</command>. Tests may
+      fail for unknown reasons.
     </para>
 
     <para>
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index eff17cd976..bc770a559d 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,32 @@
 
 -->
 
+    <listitem>
+      <para>April 10th, 2014</para>
+      <itemizedlist>
+       <listitem>
+          <para>[fernando] - gnome-calculator-3.12.1. Fixes
+          <ulink url="&blfs-ticket-root;4934">#4934</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - xfburn-0.5.2. Fixes
+          <ulink url="&blfs-ticket-root;4933">#4933</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - iso-codes-3.52. Fixes
+          <ulink url="&blfs-ticket-root;4891">#4891</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - git-1.9.2. Fixes
+          <ulink url="&blfs-ticket-root;4935">#4935</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - ffmpeg-2.2.1. Fixes
+          <ulink url="&blfs-ticket-root;4932">#4932</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>April 9th, 2014</para>
       <itemizedlist>
diff --git a/multimedia/videoutils/ffmpeg.xml b/multimedia/videoutils/ffmpeg.xml
index 94a75ebe8f..d5363f590e 100644
--- a/multimedia/videoutils/ffmpeg.xml
+++ b/multimedia/videoutils/ffmpeg.xml
@@ -7,10 +7,10 @@
   <!ENTITY ffmpeg-download-http
            "http://ffmpeg.org/releases/ffmpeg-&ffmpeg-version;.tar.bz2">
   <!ENTITY ffmpeg-download-ftp  " ">
-  <!ENTITY ffmpeg-md5sum        "744febca199548c9393b1f1ed05ccdd8">
-  <!ENTITY ffmpeg-size          "6.8 MB">
-  <!ENTITY ffmpeg-buildsize     "110 MB (additional 766 MB for docs and 1.5 GB to run the FATE tests)">
-  <!ENTITY ffmpeg-time          "2.9 SBU (additional 0.9 SBU for docs 12.3 to run the FATE tests, after test files are downloaded)">
+  <!ENTITY ffmpeg-md5sum        "b8a1ee4964c2638f46fcc803ed453818">
+  <!ENTITY ffmpeg-size          "6.7 MB">
+  <!ENTITY ffmpeg-buildsize     "119 MB (additional 757 MB for docs and 1.7 GB to run the FATE tests)">
+  <!ENTITY ffmpeg-time          "3.0 SBU (additional 0.8 SBU for docs and 4.2 SBU to run the FATE tests, after test files are downloaded)">
 ]>
 
 <sect1 id="ffmpeg" xreflabel="FFmpeg-&ffmpeg-version;">
diff --git a/xfce/apps/xfburn.xml b/xfce/apps/xfburn.xml
index cb48f63a7d..6ffcabdd03 100644
--- a/xfce/apps/xfburn.xml
+++ b/xfce/apps/xfburn.xml
@@ -7,10 +7,10 @@
   <!ENTITY xfburn-download-http
            "http://archive.xfce.org/src/apps/xfburn/0.5/xfburn-&xfburn-version;.tar.bz2">
   <!ENTITY xfburn-download-ftp  " ">
-  <!ENTITY xfburn-md5sum        "e84620b9f755623a605f3c8ec2af6431">
-  <!ENTITY xfburn-size          "732 KB">
-  <!ENTITY xfburn-buildsize     "17 MB">
-  <!ENTITY xfburn-time          "0.1 SBU">
+  <!ENTITY xfburn-md5sum        "5a277c76ec9f70900b8b98a2cd500a1d">
+  <!ENTITY xfburn-size          "744 KB">
+  <!ENTITY xfburn-buildsize     "17 MB (additional 1 MB for the tests)">
+  <!ENTITY xfburn-time          "0.1 SBU (additional 0.1 SBU for the tests)">
 ]>
 
 <sect1 id="xfburn" xreflabel="Xfburn-&xfburn-version;">
@@ -104,7 +104,7 @@
 make</userinput></screen>
 
     <para>
-      This package does not come with a test suite.
+      To test the results, issue: <command>make check</command>.
     </para>
 
     <para>