Ignore:
Timestamp:
08/25/2014 06:24:23 PM (10 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

File:
1 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
Note: See TracChangeset for help on using the changeset viewer.