Merge lp:~ebourg/openjdk/icedtea-web into lp:~openjdk/openjdk/icedtea-web

[Emmanuel Bourg]

Added icedtea-8-plugin for OpenJDK 8 (Closes: #751173)

Unmerged revisions

33. By Emmanuel Bourg on 2014-07-07

Added icedtea-8-plugin for OpenJDK 8 (Closes: #751173)

=== added file 'PLUGIN8.overrides.in'
--- PLUGIN8.overrides.in	1970-01-01 00:00:00 +0000
+++ PLUGIN8.overrides.in	2014-07-07 23:02:04 +0000
@@ -0,0 +1,2 @@
+# empty directories for plugin alternatives
+@pkg_plugin8@ binary: package-contains-empty-directory
 
=== added file 'PLUGIN8.postinst.in'
--- PLUGIN8.postinst.in	1970-01-01 00:00:00 +0000
+++ PLUGIN8.postinst.in	2014-07-07 23:02:04 +0000
@@ -0,0 +1,54 @@
+#!/bin/sh -e
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
+multiarch=@multiarch@
+priority=@priority8@
+browser_dirs="@browser_dirs@"
+PLUGIN=@plugin_name@
+basedir=/@base8dir@
+old_basedir=/usr/lib/jvm/java-8/openjdk
+PLUGINPTH=$basedir/jre/lib/@archdir@/$PLUGIN
+OLD_PLUGINPTH=$old_basedir/jre/lib/@archdir@/$PLUGIN
+
+case "$1" in
+    configure)
+	for browser_dir in $browser_dirs; do
+	    if [ $browser_dir = xulrunner-addons ]; then
+		browser=xulrunner-1.9
+	    else
+		browser=$browser_dir
+	    fi
+
+	    if [ -n "$multiarch" ] && [ "$DPKG_MAINTSCRIPT_ARCH" != $(dpkg --print-architecture) ]; then
+		priority=$(expr $priority - 1)
+	    fi
+
+            if [ -n "$multiarch" ] && [ -n "$2" ]; then
+                if [ -n "$(update-alternatives --list $browser-javaplugin.so 2>/dev/null | grep ^$old_basedir/)" ]; then
+		    update-alternatives --remove $browser-javaplugin.so $OLD_PLUGINPTH || true
+                fi
+	    fi
+
+            if [ -z "$(update-alternatives --list $browser-javaplugin.so 2>/dev/null | grep ^$basedir/)" ]; then
+		update-alternatives --quiet --install \
+		    /usr/lib/$browser_dir/plugins/libjavaplugin.so \
+		    $browser-javaplugin.so \
+		    $PLUGINPTH \
+		    $priority
+	    elif [ $priority -gt 1070 ]; then
+		oldp=$(update-alternatives --query $browser-javaplugin.so | awk -v b=$basedir '/^Alternative:/ && $2~b {p=1} /^Priority:/ && p {print $2; exit}')
+		if [ -n "$oldp" ] && [ "$oldp" -le 1070 ]; then
+		  update-alternatives --quiet --install \
+		    /usr/lib/$browser_dir/plugins/libjavaplugin.so \
+		    $browser-javaplugin.so \
+		    $PLUGINPTH \
+		    $priority
+		fi
+	    fi
+	done
+esac
+
+#DEBHELPER#
+
+exit 0
 
=== added file 'PLUGIN8.prerm.in'
--- PLUGIN8.prerm.in	1970-01-01 00:00:00 +0000
+++ PLUGIN8.prerm.in	2014-07-07 23:02:04 +0000
@@ -0,0 +1,18 @@
+#!/bin/sh -e
+
+browser_dirs="@browser_dirs@"
+PLUGIN=@plugin_name@
+PLUGINPTH=/@base8dir@/jre/lib/@archdir@/$PLUGIN
+
+for browser_dir in $browser_dirs; do
+    if [ $browser_dir = xulrunner-addons ]; then
+        browser=xulrunner-1.9
+    else
+        browser=$browser_dir
+    fi
+    update-alternatives --quiet --remove \
+	$browser-javaplugin.so \
+	$PLUGINPTH
+done
+
+#DEBHELPER#
 
=== modified file 'changelog'
--- changelog	2014-06-30 13:26:14 +0000
+++ changelog	2014-07-07 23:02:04 +0000
@@ -1,3 +1,9 @@
+icedtea-web (1.5-3) UNRELEASED; urgency=medium
+
+  * Added icedtea-8-plugin for OpenJDK 8 (Closes: #751173)
+
+ -- Emmanuel Bourg <[e-mail]>  Mon, 07 Jul 2014 22:09:27 +0200
+
 icedtea-web (1.5-2) unstable; urgency=medium
 
   * Build-depend on iceweasel-dev. Closes: #752838.
 
=== modified file 'control'
--- control	2014-06-30 13:26:14 +0000
+++ control	2014-07-07 23:02:04 +0000
@@ -63,3 +63,18 @@
  IcedTeaPlugin is a web browser plugin to execute Java applets, supporting
  LiveConnect/JavaScript. It is targeted for xulrunner-1.9 and compatible
  browsers that support the NPAPI.
+
+Package: icedtea-8-plugin
+Section: web
+Architecture: amd64 armel armhf arm64 hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390 s390x sparc
+Multi-Arch: same
+Depends: openjdk-8-jre, icedtea-netx (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Conflicts: icedtea-gcjwebplugin (<< 1.0-1ubuntu4), icedtea6-plugin (<< 6b21.2~pre1-1~), icedtea-plugin (<< 1.2~pre1-1~)
+Xb-Npp-Description: IcedTea Java Web Browser Plugin for OpenJDK 8 (execution of applets on web pages)
+Xb-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384, 92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a, aa5ca914-c309-495d-91cf-3141bbb04115
+Xb-Npp-Name: The IcedTea Web Browser Plugin
+Xb-Npp-MimeType: application/x-java-vm, application/x-java-applet, application/x-java-applet;version=1.1, application/x-java-applet;version=1.1.1, application/x-java-applet;version=1.1.2, application/x-java-applet;version=1.1.3, application/x-java-applet;version=1.2, application/x-java-applet;version=1.2.1, application/x-java-applet;version=1.2.2, application/x-java-applet;version=1.3, application/x-java-applet;version=1.3.1, application/x-java-applet;version=1.4, application/x-java-applet;version=1.4.1, application/x-java-applet;version=1.4.2, application/x-java-applet;version=1.5, application/x-java-applet;version=1.6, application/x-java-applet;version=1.8, application/x-java-applet;jpi-version=1.8.0_00, application/x-java-bean, application/x-java-bean;version=1.1, application/x-java-bean;version=1.1.1, application/x-java-bean;version=1.1.2, application/x-java-bean;version=1.1.3, application/x-java-bean;version=1.2, application/x-java-bean;version=1.2.1, application/x-java-bean;version=1.2.2, application/x-java-bean;version=1.3, application/x-java-bean;version=1.3.1, application/x-java-bean;version=1.4, application/x-java-bean;version=1.4.1, application/x-java-bean;version=1.4.2, application/x-java-bean;version=1.5, application/x-java-bean;version=1.6, application/x-java-bean;version=1.8, application/x-java-bean;jpi-version=1.8.0_00
+Description: web browser plugin based on OpenJDK and IcedTea to execute Java applets
+ IcedTeaPlugin is a web browser plugin to execute Java applets, supporting
+ LiveConnect/JavaScript. It is targeted for xulrunner-1.9 and compatible
+ browsers that support the NPAPI.
 
=== added file 'control.8'
--- control.8	1970-01-01 00:00:00 +0000
+++ control.8	2014-07-07 23:02:04 +0000
@@ -0,0 +1,15 @@
+
+Package: icedtea-8-plugin
+Section: web
+Architecture: amd64 armel armhf arm64 hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390 s390x sparc
+Multi-Arch: same
+Depends: openjdk-8-jre, icedtea-netx (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Conflicts: icedtea-gcjwebplugin (<< 1.0-1ubuntu4), icedtea6-plugin (<< 6b21.2~pre1-1~), icedtea-plugin (<< 1.2~pre1-1~)
+Xb-Npp-Description: IcedTea Java Web Browser Plugin for OpenJDK 8 (execution of applets on web pages)
+Xb-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384, 92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a, aa5ca914-c309-495d-91cf-3141bbb04115
+Xb-Npp-Name: The IcedTea Web Browser Plugin
+Xb-Npp-MimeType: application/x-java-vm, application/x-java-applet, application/x-java-applet;version=1.1, application/x-java-applet;version=1.1.1, application/x-java-applet;version=1.1.2, application/x-java-applet;version=1.1.3, application/x-java-applet;version=1.2, application/x-java-applet;version=1.2.1, application/x-java-applet;version=1.2.2, application/x-java-applet;version=1.3, application/x-java-applet;version=1.3.1, application/x-java-applet;version=1.4, application/x-java-applet;version=1.4.1, application/x-java-applet;version=1.4.2, application/x-java-applet;version=1.5, application/x-java-applet;version=1.6, application/x-java-applet;version=1.8, application/x-java-applet;jpi-version=1.8.0_00, application/x-java-bean, application/x-java-bean;version=1.1, application/x-java-bean;version=1.1.1, application/x-java-bean;version=1.1.2, application/x-java-bean;version=1.1.3, application/x-java-bean;version=1.2, application/x-java-bean;version=1.2.1, application/x-java-bean;version=1.2.2, application/x-java-bean;version=1.3, application/x-java-bean;version=1.3.1, application/x-java-bean;version=1.4, application/x-java-bean;version=1.4.1, application/x-java-bean;version=1.4.2, application/x-java-bean;version=1.5, application/x-java-bean;version=1.6, application/x-java-bean;version=1.8, application/x-java-bean;jpi-version=1.8.0_00
+Description: web browser plugin based on OpenJDK and IcedTea to execute Java applets
+ IcedTeaPlugin is a web browser plugin to execute Java applets, supporting
+ LiveConnect/JavaScript. It is targeted for xulrunner-1.9 and compatible
+ browsers that support the NPAPI.
 
=== modified file 'icedtea-netx.postinst.in'
--- icedtea-netx.postinst.in	2012-09-06 14:00:47 +0000
+++ icedtea-netx.postinst.in	2014-07-07 23:02:04 +0000
@@ -9,6 +9,9 @@
 priority7=@priority7@
 base7dir=/@base7dir@
 man7dir=$base7dir/jre/man
+priority8=@priority8@
+base8dir=/@base8dir@
+man8dir=$base8dir/jre/man
 tools='javaws itweb-settings'
 srcext=1.gz
 dstext=1.gz
@@ -40,6 +43,7 @@
     if [ -n "$multiarch" ] && [ "$DPKG_MAINTSCRIPT_ARCH" != $(dpkg --print-architecture) ]; then
         priority=$(expr $priority - 1)
         priority7=$(expr $priority7 - 1)
+        priority8=$(expr $priority8 - 1)
     fi
 
     for i in $tools; do
@@ -85,6 +89,33 @@
 	    update-alternatives --set $i $basedir/jre/bin/$i
 	fi
     done
+
+    for i in $tools; do
+        unset slave1 || true
+        if [ -e $man8dir/man1/$i.$srcext ]; then
+            slave1="--slave \
+                /usr/share/man/man1/$i.$dstext \
+                $i.$dstext \
+                $man8dir/man1/$i.$srcext"
+        fi
+        update-alternatives \
+            --install \
+            /usr/bin/$i \
+            $i \
+            $base8dir/jre/bin/$i \
+            $priority8 \
+            $slave1
+
+	# 7's priority is higher, but 7 is not installed, set it to 8
+	if [ $priority7 -gt $priority8 ] && [ ! -f $base8dir/jre/bin/$i ]; then
+	    update-alternatives --set $i $base8dir/jre/bin/$i
+	fi
+
+	# 8's priority is higher, but 8 is not installed, set it to 7
+	if [ $priority8 -gt $priority7 ] && [ ! -f $base7dir/jre/bin/$i ]; then
+	    update-alternatives --set $i $base7dir/jre/bin/$i
+	fi
+    done
     fi
 esac
 
 
=== modified file 'rules'
--- rules	2014-06-30 13:26:14 +0000
+++ rules	2014-07-07 23:02:04 +0000
@@ -32,7 +32,7 @@
 # for simplicity build the plugin for 7 for multiarch setup only,
 # anything else requires backports.
 ifneq (,$(DEB_HOST_MULTIARCH))
-  jre_versions += 7
+  jre_versions += 7 8
 endif
 
 ifneq (,$(wildcard /usr/bin/dpkg-buildflags))
@@ -62,6 +62,7 @@
     default_plugin_version = 7
   endif
 endif
+is8_default = no
 
 # dependency package for older releases
 ifeq (,$(filter $(distrel),hardy intrepid jaunty karmic lucid maverick natty oneiric precise quantal raring lenny etch squeeze wheezy))
@@ -75,18 +76,21 @@
 ifneq (,$(DEB_HOST_MULTIARCH))
   jdk_home = $(TOP)/java-6-openjdk-$(DEB_HOST_ARCH)
   jdk7_home = $(TOP)/java-7-openjdk-$(DEB_HOST_ARCH)
+  jdk8_home = $(TOP)/java-8-openjdk-$(DEB_HOST_ARCH)
 else
   jdk_home = $(TOP)/java-6-openjdk
   jdk7_home = $(TOP)/java-7-openjdk
 endif
 basedir = $(jdk_home)
 base7dir = $(jdk7_home)
+base8dir = $(jdk8_home)
 vendor = IcedTea
 shortver = 6
 last_npp_version = 6b18~pre2-2
 priority = 1061
 # not yet higher than for 6
 priority7 = $(if $(filter yes, $(is7_default)),1071,1060)
+priority8 = $(if $(filter yes, $(is8_default)),1081,1070)
 plugin_name = IcedTeaPlugin.so
 
 ifneq (,$(filter $(DEB_HOST_ARCH), alpha hppa sparc64)$(filter $(distrel), dapper))
@@ -125,7 +129,10 @@
 endif
 
 
-ifeq ($(is7_default),yes)
+ifeq ($(is8_default),yes)
+  bd_openjdk = openjdk-8-jdk,
+  jdk_default_home = $(jdk8_home)
+else ifeq ($(is7_default),yes)
   bd_openjdk = openjdk-7-jdk,
   jdk_default_home = $(jdk7_home)
 else
@@ -133,10 +140,12 @@
   jdk_default_home = $(jdk_home)
 endif
 
-ifeq ($(default_plugin_version),7)
-  netx_depends = openjdk-7-jre | openjdk-6-jre (>= 6b23~pre10~)
+ifeq ($(default_plugin_version),8)
+  netx_depends = openjdk-8-jre | openjdk-7-jre | openjdk-6-jre (>= 6b23~pre10~)
+else ifeq ($(default_plugin_version),7)
+  netx_depends = openjdk-7-jre | openjdk-8-jre | openjdk-6-jre (>= 6b23~pre10~)
 else
-  netx_depends = openjdk-6-jre (>= 6b23~pre10~) | openjdk-7-jre
+  netx_depends = openjdk-6-jre (>= 6b23~pre10~) | openjdk-7-jre | openjdk-8-jre
 endif
 
 ifneq (,$(DEB_HOST_MULTIARCH))
@@ -156,6 +165,7 @@
 
 java_launcher = /$(basedir)/bin/java
 java7_launcher = /$(base7dir)/bin/java
+java8_launcher = /$(base8dir)/bin/java
 ifeq ($(distribution),Ubuntu)
   ifeq (,$(filter $(distrel),karmic jaunty intrepid hardy gutsy feisty edgy dapper))
     java_launcher = cautious-launcher %f /$(basedir)/bin/java
@@ -181,10 +191,12 @@
 p_comm = icedtea-netx-common
 p_plug = icedtea-6-plugin
 p_plug7 = icedtea-7-plugin
+p_plug8 = icedtea-8-plugin
 d_netx = debian/$(p_netx)
 d_comm = debian/$(p_comm)
 d_plug = debian/$(p_plug)
 d_plug7 = debian/$(p_plug7)
+d_plug8 = debian/$(p_plug8)
 
 debian/control: debian/control.in debian/rules
 	@cp -p debian/control debian/control.old
@@ -197,6 +209,7 @@
 	     $(if $(DEB_HOST_MULTIARCH),debian/control.common) \
 	     $(if $(filter 6, $(jre_versions)),debian/control.6) \
 	     $(if $(filter 7, $(jre_versions)),debian/control.7) \
+	     $(if $(filter 8, $(jre_versions)),debian/control.8) \
 	     $(if $(nopkgs),,debian/control.compat) \
 	     $(if $(DEB_HOST_MULTIARCH),,| grep -v '^Multi-Arch:') \
 		  > debian/control
@@ -215,6 +228,7 @@
 	  case "$$f" in \
 	    debian/PLUGIN.*.in) f2=$$(echo $$f | sed 's/PLUGIN/$(p_plug)/;s/\.in$$//');; \
 	    debian/PLUGIN7.*.in) f2=$$(echo $$f | sed 's/PLUGIN7/$(p_plug7)/;s/\.in$$//');; \
+	    debian/PLUGIN8.*.in) f2=$$(echo $$f | sed 's/PLUGIN8/$(p_plug8)/;s/\.in$$//');; \
 	    *) f2=$$(echo $$f | sed 's/JB/$(basename)/;s/\.in$$//'); \
 	  esac; \
 	  sed \
@@ -224,6 +238,7 @@
 	      -e 's,@TOP@,$(TOP),g' \
 	      -e 's,@basedir@,$(basedir),g' \
 	      -e 's,@base7dir@,$(base7dir),g' \
+	      -e 's,@base8dir@,$(base8dir),g' \
 	      -e 's,@jdirname@,$(jdirname),g' \
 	      -e 's/@srcname@/$(srcname)/g' \
 	      -e 's/@jvmarch@/$(jvmarch)/g' \
@@ -231,14 +246,17 @@
 	      -e 's/@tag@/$(tag)/g' \
 	      -e 's/@priority@/$(priority)/g' \
 	      -e 's/@priority7@/$(priority7)/g' \
+	      -e 's/@priority8@/$(priority8)/g' \
 	      -e 's/@mantag@/$(mantag)/g' \
 	      -e 's/@multiarch@/$(DEB_HOST_MULTIARCH)/g' \
 	      -e 's,@plugin_name@,$(plugin_name),g' \
 	      -e 's/@pkg_plugin7@/$(p_plug7)/g' \
+	      -e 's/@pkg_plugin8@/$(p_plug8)/g' \
 	      -e 's,@browser_dirs@,$(browser_plugin_dirs),g' \
 	      -e 's,@last_npp_version@,$(last_npp_version),g' \
 	      -e 's,@java_launcher@,$(java_launcher),g' \
 	      -e 's,@java7_launcher@,$(java7_launcher),g' \
+	      -e 's,@java8_launcher@,$(java8_launcher),g' \
 	    $$f > $$f2; \
 	done
 
@@ -262,10 +280,17 @@
 	cd build7 \
 	  && $(buildflags) ../configure $(CONFIGURE_ARGS) --with-jdk-home=/$(jdk_default_home)
 	touch $@
+configure8-stamp:
+	dh_testdir
+	rm -rf build8
+	mkdir -p build8
+	cd build8 \
+	  && $(buildflags) ../configure $(CONFIGURE_ARGS) --with-jdk-home=/$(jdk_default_home)
+	touch $@
 
 build-arch: build-stamp
 build-indep: build-stamp
-build: build-stamp  $(if $(filter 7,$(jre_versions)),build7-stamp)
+build: build-stamp  $(if $(filter 7,$(jre_versions)),build7-stamp) $(if $(filter 8,$(jre_versions)),build8-stamp)
 build-stamp: configure-stamp
 	dh_testdir
 	$(MAKE) -C build VERSION_DEFS='-DICEDTEA_WEB_JRE="\"/$(jdk_home)\""'
@@ -274,22 +299,27 @@
 	dh_testdir
 	$(MAKE) -C build7 VERSION_DEFS='-DHAVE_JAVA7 -DICEDTEA_WEB_JRE="\"/$(jdk7_home)\""'
 	touch $@
+build8-stamp: configure8-stamp
+	dh_testdir
+	$(MAKE) -C build8 VERSION_DEFS='-DHAVE_JAVA8 -DICEDTEA_WEB_JRE="\"/$(jdk8_home)\""'
+	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
 	rm -f *-stamp
-	rm -rf build build7
+	rm -rf build build7 build8
 	for f in debian/*.in; do \
 	  case "$$f" in \
 	    debian/PLUGIN.*.in) f2=$$(echo $$f | sed 's/PLUGIN/$(p_plug)/;s/\.in$$//');; \
 	    debian/PLUGIN7.*.in) f2=$$(echo $$f | sed 's/PLUGIN7/$(p_plug7)/;s/\.in$$//');; \
+	    debian/PLUGIN8.*.in) f2=$$(echo $$f | sed 's/PLUGIN8/$(p_plug8)/;s/\.in$$//');; \
 	    *) f2=$$(echo $$f | sed 's/JB/$(basename)/;s/\.in$$//'); \
 	  esac; \
 	  case "$$f2" in debian/control) continue; esac; \
 	  rm -f $$f2; \
 	done
-	rm -rf debian/tmp7
+	rm -rf debian/tmp7 debian/tmp8
 	dh_autoreconf_clean
 	dh_clean
 
@@ -309,6 +339,13 @@
 		$(jdk7_home)/jre/bin \
 		$(jdk7_home)/jre/man/man1
 endif
+ifneq (,$(filter 8, $(jre_versions)))
+	dh_installdirs -p$(p_netx) \
+		$(jdk8_home)/bin \
+		$(jdk8_home)/man/man1 \
+		$(jdk8_home)/jre/bin \
+		$(jdk8_home)/jre/man/man1
+endif
 ifneq (,$(DEB_HOST_MULTIARCH))
 	dh_installdirs -p$(p_comm) \
 		usr/share/applications \
@@ -328,6 +365,7 @@
 		$(foreach d, $(browser_plugin_dirs), usr/lib/$(d)/plugins)
 	$(MAKE) -C build install DESTDIR=$(CURDIR)/$(d_netx)
 	sed -i 's/java-7-openjdk/java-6-openjdk/g' $(d_netx)/usr/bin/*
+	sed -i 's/java-8-openjdk/java-6-openjdk/g' $(d_netx)/usr/bin/*
 
 ifneq (,$(filter 7, $(jre_versions)))
 	dh_installdirs -p$(p_plug7) \
@@ -337,10 +375,20 @@
 	$(MAKE) -C build7 install DESTDIR=$(CURDIR)/debian/tmp7
 	sed -i 's/java-6-openjdk/java-7-openjdk/g' debian/tmp7/usr/bin/*
 endif
+ifneq (,$(filter 8, $(jre_versions)))
+	dh_installdirs -p$(p_plug8) \
+		$(jdk8_home)/jre/lib/$(archdir) \
+		usr/share/icedtea-web \
+		$(foreach d, $(browser_plugin_dirs), usr/lib/$(d)/plugins)
+	$(MAKE) -C build8 install DESTDIR=$(CURDIR)/debian/tmp8
+	sed -i 's/java-6-openjdk/java-8-openjdk/g' debian/tmp8/usr/bin/*
+	sed -i 's/java-7-openjdk/java-8-openjdk/g' debian/tmp8/usr/bin/*
+endif
 
 	# FIXME: split out an icedtea-netx-doc package?
 	rm -rf $(d_netx)/usr/share/doc/icedtea-web
 	rm -rf debian/tmp7/usr/share/doc/icedtea-web
+	rm -rf debian/tmp8/usr/share/doc/icedtea-web
 
 	mv $(d_netx)/usr/bin/javaws $(d_netx)/$(jdk_home)/jre/bin/
 	mv $(d_netx)/usr/share/man/man1/javaws.1 $(d_netx)/$(jdk_home)/jre/man/man1/
@@ -357,6 +405,14 @@
 	mv debian/tmp7/usr/lib/IcedTeaPlugin.so \
 		$(d_plug7)/$(jdk7_home)/jre/lib/$(archdir)/
 endif
+ifneq (,$(filter 8, $(jre_versions)))
+	mv debian/tmp8/usr/bin/javaws $(d_netx)/$(jdk8_home)/jre/bin/
+	mv debian/tmp8/usr/share/man/man1/javaws.1 $(d_netx)/$(jdk8_home)/jre/man/man1/
+	mv debian/tmp8/usr/bin/itweb-settings $(d_netx)/$(jdk8_home)/jre/bin/
+	cp debian/itweb-settings.1 $(d_netx)/$(jdk8_home)/jre/man/man1/
+	mv debian/tmp8/usr/lib/IcedTeaPlugin.so \
+		$(d_plug8)/$(jdk8_home)/jre/lib/$(archdir)/
+endif
 
 	# compress manpages
 	find $(d_netx)/$(jdk_home)/jre/man/man1/ -type f ! -type l | xargs gzip -9v -n
@@ -373,6 +429,13 @@
 	  /$(jdk7_home)/jre/man/man1/javaws.1.gz /$(jdk7_home)/man/man1/javaws.1.gz \
           /$(jdk7_home)/jre/man/man1/itweb-settings.1.gz /$(jdk7_home)/man/man1/itweb-settings.gz
 endif
+ifneq (,$(filter 8, $(jre_versions)))
+	find $(d_netx)/$(jdk8_home)/jre/man/man1/ -type f ! -type l | xargs gzip -9v -n
+	dh_link -p$(p_netx) \
+	  /$(jdk8_home)/jre/bin/javaws /$(jdk8_home)/bin/javaws \
+	  /$(jdk8_home)/jre/man/man1/javaws.1.gz /$(jdk8_home)/man/man1/javaws.1.gz \
+          /$(jdk8_home)/jre/man/man1/itweb-settings.1.gz /$(jdk8_home)/man/man1/itweb-settings.gz
+endif
 
 ifneq (,$(DEB_HOST_MULTIARCH))
 	mv $(d_netx)/usr/share/icedtea-web $(d_comm)/usr/share/