[pkg-java] r4913 - in trunk/java-package: debian lib sun-j2sdk1.6

[mkoch at alioth.debian.org]

Author: mkoch
Date: 2007-11-29 23:11:03 +0000 (Thu, 29 Nov 2007)
New Revision: 4913

Modified:
   trunk/java-package/debian/README.Debian
   trunk/java-package/debian/changelog
   trunk/java-package/lib/sun-j2sdk.sh
   trunk/java-package/sun-j2sdk1.6/install
Log:
java-package (0.38) unstable; urgency=low

  * Mention SUN JDK 6 in REAME.Debian. Closes: #448258.
  * Fixed typo when creating version number for SUN JDK 6. Closes: #451935.
  * Fix handling of symlinks for ControlPanel, HtmlConverter and java-rmi.cgi
    from SUN JDK 6. Closes: #448351.

 -- Michael Koch <konqueror at gmx.de>  Fri, 30 Nov 2007 00:03:50 +0100



Modified: trunk/java-package/debian/README.Debian
===================================================================
--- trunk/java-package/debian/README.Debian	2007-11-29 22:06:54 UTC (rev 4912)
+++ trunk/java-package/debian/README.Debian	2007-11-29 23:11:03 UTC (rev 4913)
@@ -10,13 +10,14 @@
 Supported packages currently include:
 
  * Sun (http://java.sun.com):
-   - The J2SE Development Kit (JDK), version 1.4 to 1.5.0 (= 5.0), tested up
-     to and including JDK 5.0 (= 1.5) Update 1, but should work with later
+   - The J2SE Development Kit (JDK), version 1.4, 1.5.0 (= 5.0) or 6 tested up
+     to and including JDK 6 Update 3, but should work with later
      patch releases too. 1.4 is tested up until 1.4.2_06
    - The same applies for the J2SE Runtime Environment (JRE)
-   - Packaging of J2SE API Javadoc is also support for 1.3 through 1.5.0
+   - Packaging of J2SE API Javadoc is also support for 1.3 through 6
 
    Download: 
+   1.6: http://java.sun.com/javase/downloads/index.jsp
    1.5: http://java.sun.com/j2se/1.5.0/download.jsp
    1.4: http://java.sun.com/j2se/1.4.2/download.html
    

Modified: trunk/java-package/debian/changelog
===================================================================
--- trunk/java-package/debian/changelog	2007-11-29 22:06:54 UTC (rev 4912)
+++ trunk/java-package/debian/changelog	2007-11-29 23:11:03 UTC (rev 4913)
@@ -1,3 +1,12 @@
+java-package (0.38) unstable; urgency=low
+
+  * Mention SUN JDK 6 in REAME.Debian. Closes: #448258.
+  * Fixed typo when creating version number for SUN JDK 6. Closes: #451935.
+  * Fix handling of symlinks for ControlPanel, HtmlConverter and java-rmi.cgi
+    from SUN JDK 6. Closes: #448351.
+
+ -- Michael Koch <konqueror at gmx.de>  Fri, 30 Nov 2007 00:03:50 +0100
+
 java-package (0.37) unstable; urgency=low
 
   * Added libstdc++5 to Recommends of generated package. Closes: #446334.

Modified: trunk/java-package/lib/sun-j2sdk.sh
===================================================================
--- trunk/java-package/lib/sun-j2sdk.sh	2007-11-29 22:06:54 UTC (rev 4912)
+++ trunk/java-package/lib/sun-j2sdk.sh	2007-11-29 23:11:03 UTC (rev 4913)
@@ -89,7 +89,7 @@
 	    found=true
 	    ;;
 	"jdk-6u"[0-9]"-linux-amd64.bin") # SUPPORTED
-	    j2se_version=1.6.0+update${archive_name6:1}${revision}
+	    j2se_version=1.6.0+update${archive_name:6:1}${revision}
 	    j2se_expected_min_size=130
 	    found=true
 	    ;;

Modified: trunk/java-package/sun-j2sdk1.6/install
===================================================================
--- trunk/java-package/sun-j2sdk1.6/install	2007-11-29 22:06:54 UTC (rev 4912)
+++ trunk/java-package/sun-j2sdk1.6/install	2007-11-29 23:11:03 UTC (rev 4913)
@@ -15,15 +15,24 @@
 	--slave "/usr/share/man/man1/$program.1.gz" "$program.1.gz" \
 	"$j2se_base/man/man1/$program.1.gz"
 }
+
+# alternative <program> without man page
+function program_alternative_no_man() {
+    local program="$1"
+    update-alternatives \
+        --install "/usr/bin/$program" "$program" \
+        "$j2se_base/bin/$program" "$priority"
+}
+
 # kinit, klist, and ktab not installed at this
 # time; handling of /etc/krb5.conf not addressed
 # JRE-specific alternatives with JDKs cannot be 
 # handled by our current approach
 program_alternative appletviewer
 program_alternative apt
-program_alternative ControlPanel
+program_alternative_no_man ControlPanel
 program_alternative extcheck
-program_alternative HtmlConverter
+program_alternative_no_man HtmlConverter
 program_alternative idlj
 program_alternative jar
 program_alternative jarsigner
@@ -32,7 +41,7 @@
 program_alternative javadoc
 program_alternative javah
 program_alternative javap
-program_alternative java-rmi.cgi
+program_alternative_no_man java-rmi.cgi
 program_alternative javaws
 program_alternative jconsole
 program_alternative jdb