Changeset e520fdef


Ignore:
Timestamp:
08/25/2014 06:24:23 PM (8 years ago)
Author:
Krejzi <krejzi@…>
Branches:
7.6-blfs, 7.6-systemd, kde5-14269, kde5-14686, systemd-13485
Children:
c81a79a
Parents:
c09d94a
Message:

Merge + fix a bit latest changes from trunk.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@14071 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • general/prog/openjdk.xml

    rc09d94a re520fdef  
    272272    <bridgehead renderas="sect4">Optional</bridgehead>
    273273    <para role="optional">
     274      <xref linkend="icedtea-web"/> (to obtain icon file for the
     275      <command>policytool</command> menu entry),
    274276      <xref linkend="libxslt"/>,
    275277      <xref linkend="lsb-release"/>,
     
    390392chown -R root:root /opt/OpenJDK-&openjdk-version;</userinput></screen>
    391393
    392 <!-- Can't find the icon anywhere.
    393     <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>
    394 
    395 <screen role="root"><userinput>cat &gt;&gt; /usr/share/applications/openjdk-7-policytool.desktop &lt;&lt; "EOF" &amp;&amp;
     394    <para>If desired, you may install a <filename class="extension">.desktop</filename>
     395    file so <command>policytool</command> can be accessed from a desktop menu. First,
     396    you need to obtain an icon from the <xref linkend="icedtea-web"/>
     397    tarball:</para>
     398
     399<screen role="root"><userinput>tar -xf icedtea-web-&icedtea-web-version;.tar.gz     \
     400        icedtea-web-&icedtea-web-version;/javaws.png \
     401        --strip-components=1</userinput></screen>
     402
     403    <para>Now, as <systemitem class="username">root</systemitem> user:</para>
     404
     405<screen role="root"><userinput>cat ;&gt; /usr/share/applications/openjdk-7-policytool.desktop &lt;&lt; "EOF" &amp;&amp;
    396406<literal>[Desktop Entry]
    397407Name=OpenJDK Java 7 Policy Tool
     
    406416EOF
    407417
    408 install -v -Dm0644 javaws.png /usr/share/pixmaps/javaws.png &amp;&amp;</userinput></screen> -->
     418install -v -Dm644 javaws.png /usr/share/pixmaps/javaws.png</userinput></screen>
     419
     420    <para>The choice of pt_BR is just an example. You can delete those lines
     421    or replace them by corresponding ones in your locale, e.g. fr_FR, with the
     422    "Name[fr_FR]" and "Comment[fr_FR]" values given by your translations.</para>
    409423
    410424  </sect2>
     
    462476      the <systemitem class="username">root</systemitem> user:</para>
    463477
    464 <screen role="root"><userinput>ln -v -nsf OpenJDK-&openjdk-version;-bin /opt/jdk</userinput></screen>
     478<screen role="root"><userinput>ln -sfv OpenJDK-&openjdk-version;-bin /opt/jdk</userinput></screen>
    465479
    466480      <para>The information below assumes your system is set up using the
  • introduction/welcome/changelog.xml

    rc09d94a re520fdef  
    4545-->
    4646    <listitem>
     47      <para>August 25th, 2014</para>
     48      <itemizedlist>
     49        <listitem>
     50          <para>[fernando] - OpenJDK-1.7.0.65/IcedTea-2.5.1: fix desktop file
     51          instructions, hopefully. Sorry for the mess.</para>
     52        </listitem>
     53        <listitem>
     54          <para>[krejzi] - Archived WebKitGTK+-1.10.2.</para>
     55        </listitem>
     56        <listitem>
     57          <para>[krejzi] - Archived Xulrunner-31.0.</para>
     58        </listitem>
     59        <listitem>
     60          <para>[krejzi] - Updated to grilo-0.2.11.</para>
     61        </listitem>
     62        <listitem>
     63          <para>[krejzi] - Updated to libfm-1.2.2.1.</para>
     64        </listitem>
     65        <listitem>
     66          <para>[krejzi] - Updated to pcmanfm-1.2.1.</para>
     67        </listitem>
     68        <listitem>
     69          <para>[krejzi] - Updated to tracker-1.0.3.</para>
     70        </listitem>
     71      </itemizedlist>
     72    </listitem>
     73
     74    <listitem>
    4775      <para>August 24th, 2014</para>
    4876      <itemizedlist>
     
    6593        <listitem>
    6694          <para>[ken] - Make TeX Live use system gc for asymptote.</para>
    67         </listitem>
    68         <listitem>
    69           <para>[krejzi] - Archived WebKitGTK+-1.10.2.</para>
    70         </listitem>
    71         <listitem>
    72           <para>[krejzi] - Archived Xulrunner-31.0.</para>
    73         </listitem>
    74         <listitem>
    75           <para>[krejzi] - Updated to grilo-0.2.11.</para>
    76         </listitem>
    77         <listitem>
    78           <para>[krejzi] - Updated to libfm-1.2.2.1.</para>
    79         </listitem>
    80         <listitem>
    81           <para>[krejzi] - Updated to pcmanfm-1.2.1.</para>
    82         </listitem>
    83         <listitem>
    84           <para>[krejzi] - Updated to tracker-1.0.3.</para>
    8595        </listitem>
    8696        <listitem>
Note: See TracChangeset for help on using the changeset viewer.