From 5a78947574412df395d7045c6bf3146fe32310b5 Mon Sep 17 00:00:00 2001
From: Fernando de Oliveira <fernando@linuxfromscratch.org>
Date: Mon, 25 Aug 2014 13:12:27 +0000
Subject: [PATCH] OpenJDK-1.7.0.65/IcedTea-2.5.1: fix desktop file
 instructions, hopefully. Sorry for the mess.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@14060 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  4 ++--
 general/prog/openjdk.xml           | 14 ++++++++++++--
 introduction/welcome/changelog.xml | 10 ++++++++++
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/general.ent b/general.ent
index b7b33cb2d9..b4b471c6b5 100644
--- a/general.ent
+++ b/general.ent
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "24">                   <!-- Always 2 digits -->
+<!ENTITY day          "25">                   <!-- Always 2 digits -->
 <!ENTITY month        "08">                   <!-- Always 2 digits -->
 <!ENTITY year         "2014">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "August 24th, &year;">
+<!ENTITY releasedate  "August 25th, &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/openjdk.xml b/general/prog/openjdk.xml
index b3a38e02af..246fcd995d 100644
--- a/general/prog/openjdk.xml
+++ b/general/prog/openjdk.xml
@@ -271,6 +271,8 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="icedtea-web"/> (to obtain one icon for the
+      <filename>openjdk-7-policytool.desktop</filename> file),
       <xref linkend="libxslt"/>,
       <xref linkend="lsb-release"/>,
       <xref linkend="mercurial"/>,
@@ -389,7 +391,11 @@ rm -f Xvfb.pid</userinput></screen>
 cp -R openjdk.build/j2sdk-image /opt/OpenJDK-&openjdk-version; &amp;&amp;
 chown -R root:root /opt/OpenJDK-&openjdk-version;</userinput></screen>
 
-    <para>If desired, you may install a .desktop file corresponding to an entry in a desktop menu for <command>policytool</command>, as <systemitem class="username">root</systemitem> user:</para>
+    <para>If desired, you may install a .desktop file corresponding to an entry in a desktop menu for <command>policytool</command>. First, you need to obtain an icon from <xref linkend="icedtea-web"/>:</para>
+
+<screen role="root"><userinput>tar -xf icedtea-web-&icedtea-web-version;.tar.gz icedtea-web-&icedtea-web-version;/javaws.png --strip-components=1</userinput></screen>
+
+    <para>Now, as <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>cat &gt;&gt; /usr/share/applications/openjdk-7-policytool.desktop &lt;&lt; "EOF" &amp;&amp;
 <literal>[Desktop Entry]
@@ -404,7 +410,11 @@ Icon=javaws
 Categories=Settings;</literal>
 EOF
 
-install -v -Dm0644 javaws.png /usr/share/pixmaps/javaws.png &amp;&amp;</userinput></screen>
+install -v -Dm0644 javaws.png /usr/share/pixmaps/javaws.png</userinput></screen>
+
+    <para>The choice of pt_BR is just an example. You can delete those lines
+    or replace them by corresponding ones in your locale, e.g. fr_FR, with the
+    "Name[fr_FR]" and "Comment[fr_FR]" values given by your translations.</para>
 
   </sect2>
 
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index e4615b61de..b35012a117 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,16 @@
 
 -->
 
+    <listitem>
+      <para>August 25th, 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[fernando] - OpenJDK-1.7.0.65/IcedTea-2.5.1: fix desktop file
+          instructions, hopefully. Sorry for the mess.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>August 24th, 2014</para>
       <itemizedlist>