[pkg-java] r10962 - trunk/java-common/debian

[Matthias Klose]

Author: doko
Date: 2009-11-01 18:39:13 +0000 (Sun, 01 Nov 2009)
New Revision: 10962

Modified:
   trunk/java-common/debian/changelog
   trunk/java-common/debian/control
   trunk/java-common/debian/rules
Log:
  * Build a default-jdk-doc package to make the documentation available
    in a path (/usr/share/doc/default-jdk/api) independent of the depending
    package.


Modified: trunk/java-common/debian/changelog
===================================================================
--- trunk/java-common/debian/changelog	2009-11-01 11:43:30 UTC (rev 10961)
+++ trunk/java-common/debian/changelog	2009-11-01 18:39:13 UTC (rev 10962)
@@ -1,3 +1,11 @@
+java-common (0.34) UNRELEASED; urgency=low
+
+  * Build a default-jdk-doc package to make the documentation available
+    in a path (/usr/share/doc/default-jdk/api) independent of the depending
+    package.
+
+ -- Matthias Klose <doko at debian.org>  Sun, 01 Nov 2009 18:57:06 +0100
+
 java-common (0.33) unstable; urgency=low
 
   [ Matthias Klose ]

Modified: trunk/java-common/debian/control
===================================================================
--- trunk/java-common/debian/control	2009-11-01 11:43:30 UTC (rev 10961)
+++ trunk/java-common/debian/control	2009-11-01 18:39:13 UTC (rev 10962)
@@ -56,6 +56,16 @@
  development kit recommended for this architecture, which is
  ${jdk} for ${jre:arch}.
 
+Package: default-jdk-doc
+Architecture: all
+Section: doc
+Depends: ${doc}
+Suggests: default-jdk
+Description: Standard Java or Java compatible Development Kit (documentation)
+ This package points to the documentation for the Java development kit,
+ or Java compatible development kit recommended for Debian, which is
+ ${doc}.
+
 Package: default-jdk-builddep
 Architecture: any
 Depends: default-jdk (= ${binary:Version}), ${jdk:builddep}

Modified: trunk/java-common/debian/rules
===================================================================
--- trunk/java-common/debian/rules	2009-11-01 11:43:30 UTC (rev 10961)
+++ trunk/java-common/debian/rules	2009-11-01 18:39:13 UTC (rev 10962)
@@ -37,6 +37,8 @@
   jvmdir	= java-6-openjdk
 endif
 
+p_doc		= openjdk-6-doc
+
 jre_provides	= $(call mk_cslist,$(provides),runtime)
 jhl_provides	= $(call mk_cslist,$(provides),runtime-headless)
 jdk_provides	= $(call mk_cslist,$(provides),sdk)
@@ -118,6 +120,9 @@
 	dh_install -i
 #	dh_installdebconf -i
 ###	dh_installdocs -i
+	mkdir -p debian/default-jdk-doc/usr/share/doc/default-jre-headless
+	ln -sf ../$(p_doc)/api debian/default-jdk-doc/usr/share/doc/default-jre-headless/api
+	ln -sf ../$(p_doc)/api debian/default-jdk-doc/usr/share/doc/default-jdk-doc/api
 	dh_installexamples -i
 	dpsch-cvsclean
 	dh_installmenu -i
@@ -127,7 +132,9 @@
 	dh_compress -i
 	dh_fixperms -i
 	dh_installdeb -i
-	dh_gencontrol -i
+	dh_gencontrol -i -- \
+		'-Vdoc=$(p_doc)' \
+		'-Vjdk=$(p_jdk)'
 	dh_md5sums -i
 	dh_builddeb -i