Changed default-jdk-doc to arch any (Closes: #801257)

4 files changed, 13 insertions, 8 deletions

diff --git a/debian/changelog b/debian/changelog
index e2e8c35..e1a2298 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ java-common (0.54) UNRELEASED; urgency=medium
   * Team upload.
   * Use OpenJDK 8 on mips, mipsel and mips64el.
   * The Java Policy and the FAQ have been moved to the new java-policy package.
+  * default-jdk-doc is now architecture dependent (Closes: #801257)
   * update-java-alternatives now supports bash completion (Closes: #777550)
   * The output of update-java-alternatives --list is now aligned vertically
   * Removed the unused classpath-from-jars-1 example
diff --git a/debian/control b/debian/control
index 3fed2c3..87fed1a 100644
--- a/debian/control
+++ b/debian/control
@@ -54,14 +54,14 @@ Description: Standard Java or Java compatible Development Kit
  ${jdk} for ${jre:arch}.
 
 Package: default-jdk-doc
-Architecture: all
+Architecture: any
 Section: doc
 Depends: ${doc}, ${misc:Depends}
 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}.
+ ${doc} for ${jre:arch}.
 
 Package: gcj-native-helper
 Architecture: any
diff --git a/debian/default-jdk-doc.lintian-overrides b/debian/default-jdk-doc.lintian-overrides
new file mode 100644
index 0000000..07362b5
--- /dev/null
+++ b/debian/default-jdk-doc.lintian-overrides
@@ -0,0 +1,4 @@
+# default-jdk-doc targets the documentation of the default JDK which is architecture dependent (#801257)
+default-jdk-doc: documentation-package-not-architecture-independent
+
+default-jdk-doc: debian-changelog-file-missing-or-wrong-name
diff --git a/debian/rules b/debian/rules
index 42bdfa2..04d7750 100755
--- a/debian/rules
+++ b/debian/rules
@@ -119,7 +119,9 @@ ifneq (,$(p_jre))
 	dh_testroot -a
 	dh_install -a
 	dh_installdocs -pdefault-jre-headless
+	dh_installdocs -pdefault-jdk-doc
 	dh_installchangelogs -pdefault-jre-headless
+	dh_installchangelogs -pdefault-jdk-doc
 	dh_link -pdefault-jre-headless \
 		usr/lib/jvm/$(jvmdir) usr/lib/jvm/default-java
 	for p in default-jre-headless default-jre default-jdk gcj-native-helper; do \
@@ -128,6 +130,8 @@ ifneq (,$(p_jre))
 	  ln -sf $$t debian/$$p/usr/share/doc/$$p; \
 	  t=$$p; \
 	done
+	dh_link -pdefault-jdk-doc /usr/share/doc/$(p_doc)/api usr/share/doc/default-jre-headless/api
+	dh_link -pdefault-jdk-doc /usr/share/doc/$(p_doc)/api usr/share/doc/default-jdk-doc/api
 	dh_lintian -a
 	dh_compress -a
 	dh_fixperms -a
@@ -137,6 +141,7 @@ ifneq (,$(p_jre))
 		'-Vjre=$(p_jre)' \
 		'-Vjhl=$(p_jhl)' \
 		'-Vjdk=$(p_jdk)' \
+		'-Vdoc=$(p_doc)' \
 		'-Vjdk:builddep=$(jdk_build_dep)' \
 		'-Vjre:arch=$(DEB_HOST_ARCH)' \
 		'-Vjre:version=$(v_jre)' \
@@ -154,9 +159,6 @@ binary-indep: build-indep install-indep
 	dh_testdir -i
 	dh_testroot -i
 	dh_install -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
 	dh_installmenu -i
 	dh_installman -i
@@ -166,9 +168,7 @@ binary-indep: build-indep install-indep
 	dh_compress -i
 	dh_fixperms -i
 	dh_installdeb -i
-	dh_gencontrol -i -- \
-		'-Vdoc=$(p_doc)' \
-		'-Vjdk=$(p_jdk)'
+	dh_gencontrol -i
 	dh_md5sums -i
 	dh_builddeb -i