[pkg-java] r11989 - in trunk/java-common: debian debian-java-faq

[Niels Thykier]

Author: nthykier-guest
Date: 2010-04-05 09:42:47 +0000 (Mon, 05 Apr 2010)
New Revision: 11989

Modified:
   trunk/java-common/debian-java-faq/debian-java-faq.sgml
   trunk/java-common/debian/changelog
Log:
Updated to java-faq to match the online version.

Modified: trunk/java-common/debian/changelog
===================================================================
--- trunk/java-common/debian/changelog	2010-04-04 16:11:22 UTC (rev 11988)
+++ trunk/java-common/debian/changelog	2010-04-05 09:42:47 UTC (rev 11989)
@@ -6,6 +6,7 @@
     Policy.
     - Java libraries are no longer required to depend on a JVM
     (Closes: #227587)
+  * Updated to java-faq to match the online version.
 
  -- Niels Thykier <niels at thykier.net>  Fri, 26 Mar 2010 21:44:45 +0100
 

Modified: trunk/java-common/debian-java-faq/debian-java-faq.sgml
===================================================================
--- trunk/java-common/debian-java-faq/debian-java-faq.sgml	2010-04-04 16:11:22 UTC (rev 11988)
+++ trunk/java-common/debian-java-faq/debian-java-faq.sgml	2010-04-05 09:42:47 UTC (rev 11989)
@@ -643,13 +643,27 @@
 
 <p>In November 2006 Sun announced that Java would be open sourced under the GPL
 and provided source for the javac compiler and HotSpot virtual machine. 
-Sun published their Java sources under the name OpenJDK. Some 4% are missing
-from the sources, for which Sun has not the copyright themselves. The remainder
-of the JDK source will be published in 2007. Debian has a roadmap to publish
+Sun published their Java sources under the name OpenJDK.
+A small part, initially some 4% and by 2008 down to 1%, mainly in the Class
+library, is missing from the sources, because Sun does not hold the
+copyright themselves.
+
+<p>Debian has a roadmap to publish
 all of Sun's opensource Java technologies as described in the <url
 id="https://penta.debconf.org/~joerg/events/126.en.html" name="Debconf7 talk:
 OpenJDK and the Free Java Packaging Roadmap">.
+The current version of the roadmap is at the
+<url id="http://wiki.debian.org/Java/RoadMap" name="Debian Java Wiki">.
 
+<chapt id="debian-java-lenny">Status of Java in Debian GNU/Linux 5.0 (Lenny)
+
+<p>The <em>Lenny</em> release was the first one to provide Sun's OpenJDK
+environment (see <ref id="openjdk">).
+
+<p>A more up-to-date status of Java in the current Debian release is
+available at the
+<url id="http://wiki.debian.org/Java" name="Debian Java Wiki">.
+
 <chapt>Java Development
 <p>
 <sect>What full-fledged Java development platforms are available in Debian?
@@ -672,6 +686,9 @@
 currently testing) and Debian <em>sid</em>, also as packages in the
 <em>non-free</em>.
 
+<item>Sun's OpenJDK 6 jdk, available since the Debian 5.0 <em>lenny</em>
+release in the <em>main</em> section.
+
 </list>
 
 <p>Previous release of Debian included an installer package for IBM's Java
@@ -734,9 +751,9 @@
 
 <sect1 id="java56">Java 5 and 6
 
-<p>There are binary packages available for the Java 5 platform
-for both Debian 'lenny' (currently, the <em>testing</em> distribution) and
-Debian Sid, and binary packages for Java 6. These packages are available in the
+<p>There are binary packages available for the Java 5 and Java 6 platforms
+since the Debian 5.0 ('lenny') release.
+These packages are available in the
 <em>non-free</em> section, so you have to configure your apt sources appropiately. If
 you have the following in your <file>/etc/apt/sources.list</file>:
 
@@ -789,7 +806,7 @@
 update-java-alternatives -s java-1.5.0-sun 
 </example>
 
-<sect1>Sun's OpenJDK
+<sect1 id="openjdk">Sun's OpenJDK
 
 <p>Sun adopted in november 2006 the GPL library for almost all of the virtual
 machine and GPL v2 + the <em>Classpath exception</em><footnote>This is similar
@@ -799,9 +816,21 @@
 project"></footnote>for the class libraries and those parts of the virtual
 machine that expose public APIs.
 
-<p>As a consequence, the free OpenJDK code might be available in Debian in next
-releases.
+<p>As a consequence, the free OpenJDK code is available in Debian since the
+5.0 (lenny) release.</p>
 
+<p>You can install the Java development kit:
+
+<example>
+apt-get install openjdk-6-jdk
+</example>
+
+or the Java runtime environment:
+
+<example>
+apt-get install openjdk-6-jre
+</example>
+
 <p>For more information see <url id="http://www.sun.com/software/opensource/java/faq.jsp" name="Free and Open Source Java">.
 
 <sect1>Java 2 SE (aka JDK1.2)