[pkg-java] r3876 - in trunk/java-package: debian sun-j2re1.5 sun-j2sdk1.5

[mkoch at alioth.debian.org]

Author: mkoch
Date: 2007-07-18 20:29:39 +0000 (Wed, 18 Jul 2007)
New Revision: 3876

Modified:
   trunk/java-package/debian/changelog
   trunk/java-package/sun-j2re1.5/install
   trunk/java-package/sun-j2sdk1.5/install
Log:
* Fix dangling links for SUN Java 5. Closes: #305053.


Modified: trunk/java-package/debian/changelog
===================================================================
--- trunk/java-package/debian/changelog	2007-07-18 20:22:22 UTC (rev 3875)
+++ trunk/java-package/debian/changelog	2007-07-18 20:29:39 UTC (rev 3876)
@@ -1,8 +1,9 @@
 java-package (0.32) UNRELEASED; urgency=low
 
   * Added support for iceweasel. Closes: #433445.
+  * Fix dangling links for SUN Java 5. Closes: #305053.
 
- -- Michael Koch <konqueror at gmx.de>  Wed, 18 Jul 2007 21:30:29 +0200
+ -- Michael Koch <konqueror at gmx.de>  Wed, 18 Jul 2007 22:27:25 +0200
 
 java-package (0.31) unstable; urgency=low
 

Modified: trunk/java-package/sun-j2re1.5/install
===================================================================
--- trunk/java-package/sun-j2re1.5/install	2007-07-18 20:22:22 UTC (rev 3875)
+++ trunk/java-package/sun-j2re1.5/install	2007-07-18 20:29:39 UTC (rev 3876)
@@ -16,9 +16,17 @@
 	"$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
-program_alternative ControlPanel
+program_alternative_no_man ControlPanel
 program_alternative java
 program_alternative javaws
 program_alternative keytool

Modified: trunk/java-package/sun-j2sdk1.5/install
===================================================================
--- trunk/java-package/sun-j2sdk1.5/install	2007-07-18 20:22:22 UTC (rev 3875)
+++ trunk/java-package/sun-j2sdk1.5/install	2007-07-18 20:29:39 UTC (rev 3876)
@@ -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