Bug#305053: [PATCH] don't create a slave link for non-existing man pages

[Holger Detering]

Package: java-package
Version: 0.28
Followup-For: Bug #305053

Here is a patch that solves the dangling symlink issue both for Sun's
JRE and SDK.  The key idea is to not create slave links for non-existing
man pages.

I've tested this with Sun's jdk-1_5_0_09-linux-i586.bin and
jre-1_5_0_09-linux-i586.bin (1.5.0+update09).

Holger

---8<---
diff -Naur java-package-0.28/sun-j2re1.5/install java-package-0.28-patched/sun-j2re1.5/install
--- java-package-0.28/sun-j2re1.5/install	2006-06-20 17:36:09.000000000 +0200
+++ java-package-0.28-patched/sun-j2re1.5/install	2006-10-20 11:07:28.000000000 +0200
@@ -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
diff -Naur java-package-0.28/sun-j2sdk1.5/install java-package-0.28-patched/sun-j2sdk1.5/install
--- java-package-0.28/sun-j2sdk1.5/install	2006-06-20 17:36:12.000000000 +0200
+++ java-package-0.28-patched/sun-j2sdk1.5/install	2006-10-20 11:09:27.000000000 +0200
@@ -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
--->8---