New default-java-plugin package depending on icedtea-<n>-plugin (Closes: #678381)

3 files changed, 26 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index 7a21e58..dc5eeae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ java-common (0.54) UNRELEASED; urgency=medium
 
   * Team upload.
   * Use OpenJDK 8 on mips, mipsel and mips64el.
+  * Added a new default-java-plugin package depending on the right plugin
+    package for the current architecture, typically icedtea-<n>-plugin.
+    default-java-plugin provides icedtea-plugin (Closes: #678381).
   * The Java Policy and the FAQ have been moved to the new java-policy package.
   * default-jdk-doc is now architecture dependent (Closes: #801257)
   * gcj-native-helper no longer depends on default-jdk
diff --git a/debian/control b/debian/control
index 4012b0a..ec82243 100644
--- a/debian/control
+++ b/debian/control
@@ -63,6 +63,16 @@ Description: Standard Java or Java compatible Development Kit (documentation)
  or Java compatible development kit recommended for Debian, which is
  ${doc} for ${jre:arch}.
 
+Package: default-java-plugin
+Architecture: any
+Depends: default-jre (= ${binary:Version}), ${plugin}, ${misc:Depends}
+Provides: icedtea-plugin
+Description: Default Java Plugin for running applets and Java Web Start applications
+ This dependency package points to the default Java Plugin recommended
+ for the ${jre:arch} architecture. The Java Plugin adds the ability to run
+ Java applets from a web browser and launch Java Web Start applications using
+ the Java Network Launch Protocol (JNLP).
+
 Package: gcj-native-helper
 Architecture: any
 Depends: gcj-jdk, ${misc:Depends}
diff --git a/debian/rules b/debian/rules
index fc5ae01..60211e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,7 @@ p_jre		= openjdk-$(java_default_version)-jre
 p_jhl		= openjdk-$(java_default_version)-jre-headless
 p_jdk		= openjdk-$(java_default_version)-jdk
 p_doc		= openjdk-$(java_default_version)-doc
+p_plugin	= icedtea-$(java_default_version)-web
 dversion	= 2:1.$(java_default_version)-$(release)
 jvmdir		= java-1.$(java_default_version).0-openjdk$(if $(DEB_HOST_MULTIARCH),-$(DEB_HOST_ARCH))
 
@@ -22,6 +23,7 @@ ifeq (5, $(java_default_version))
   p_jhl		= gcj-jre-headless
   p_jdk		= gcj-jdk
   p_doc		= openjdk-8-doc
+  p_plugin	=
   jvmdir	= java-gcj
 endif
 
@@ -48,8 +50,9 @@ override_dh_installdocs:
 
 	# Install the changelog and copyright once in default-jre-headless and use links for the other packages
 	dh_installdocs -pdefault-jre-headless
-	dh_link -pdefault-jre       /usr/share/doc/default-jre-headless /usr/share/doc/default-jre
-	dh_link -pdefault-jdk       /usr/share/doc/default-jre          /usr/share/doc/default-jdk
+	dh_link -pdefault-jre         /usr/share/doc/default-jre-headless /usr/share/doc/default-jre
+	dh_link -pdefault-jdk         /usr/share/doc/default-jre          /usr/share/doc/default-jdk
+	dh_link -pdefault-java-plugin /usr/share/doc/default-jre          /usr/share/doc/default-java-plugin
 
 	dh_installdocs -pdefault-jdk-doc
 	dh_installdocs -pgcj-native-helper
@@ -57,7 +60,7 @@ override_dh_installdocs:
 override_dh_gencontrol:
 	dh_gencontrol -i
 ifneq (,$(p_jre))
-	dh_gencontrol -a -- \
+	dh_gencontrol -a --no-package=default-java-plugin -- \
 		-v$(dversion) \
 		'-Vjre=$(p_jre)' \
 		'-Vjhl=$(p_jhl)' \
@@ -68,9 +71,15 @@ ifneq (,$(p_jre))
 		'-Vjhl:provides=$(jhl_provides)' \
 		'-Vjdk:provides=$(jdk_provides)'
 endif
+ifneq (,$(p_plugin))
+	dh_gencontrol -pdefault-java-plugin -- -v$(dversion) -Vplugin=$(p_plugin) -Vjre:arch=$(DEB_HOST_ARCH)
+endif
 
 override_dh_builddeb:
 	dh_builddeb -i
 ifneq (,$(p_jre))
-	dh_builddeb -a
+	dh_builddeb -a --no-package=default-java-plugin
+endif
+ifneq (,$(p_plugin))
+	dh_builddeb -pdefault-java-plugin
 endif