openjdk team mailing list archive

[Anthony Fok <foka@xxxxxxxxxx>]

Hi Matthias and all:

Thank you for looking at this issue:

> openjdk-9 (9~b179-1) unstable; urgency=medium
>  ...
>  * Fix recommendation of microhei/zenhei font packages. Closes: #868205.

Unfortunately, that does not appear to be actually fixed, as the
latest 9~b181-4 still says:

    Suggests: ..., ttf-wqy-microhei | ttf-wqy-zenhei, ...

Interestingly though, both openjdk-7-jre-headless and
openjdk-8-jre-headless have the correct dependency on
fonts-wqy-microhei and/or fonts-wqy-zenhei fixed back in May 2017
(probably due to Bug#859528), so it is just openjdk-9 now.

Or perhaps you would consider somehow synchronizing the debian
packaging of openjdk-8 and openjdk-9?

Anyhow, attached are my suggested patches.  (One is directly relevant,
and the other two: minor cosmetic fixes.)

Cheers,

Anthony

diff -Nur a/debian/control b/debian/control
--- a/debian/control	2017-08-07 08:33:16.000000000 -0600
+++ b/debian/control	2017-09-07 05:35:29.279708161 -0600
@@ -48,7 +48,7 @@
 Suggests: ${cacao:Recommends}, ${jamvm:Suggests},
   libnss-mdns,
   fonts-dejavu-extra,
-  fonts-ipafont-gothic, fonts-ipafont-mincho, ttf-wqy-microhei | ttf-wqy-zenhei, fonts-indic,
+  fonts-ipafont-gothic, fonts-ipafont-mincho, fonts-wqy-microhei | fonts-wqy-zenhei, fonts-indic,
 Provides: java-runtime-headless, java2-runtime-headless,
   java5-runtime-headless, java6-runtime-headless,
   java7-runtime-headless, java8-runtime-headless,
diff -Nur a/debian/rules b/debian/rules
--- a/debian/rules	2017-08-24 11:10:11.000000000 -0600
+++ b/debian/rules	2017-09-07 05:33:44.024595869 -0600
@@ -136,7 +136,7 @@
   with_docs = disabled for shark
 endif
 
-with_wgy_zenhai = $(if $(filter $(distrel),lenny),,yes)
+with_wqy_zenhai = $(if $(filter $(distrel),lenny),,yes)
 
 arch_map	:= alpha=alpha arm=arm armel=arm armhf=arm arm64=aarch64 amd64=amd64 hppa=parisc i386=i586 m68k=m68k mips=mips mipsel=mipsel mips64=mips64 mips64el=mips64el powerpc=ppc powerpcspe=ppc ppc64=ppc64 ppc64el=ppc64le sparc=sparc sparc64=sparcv9 sh4=sh s390x=s390x ia64=ia64 x32=x32
 
@@ -774,7 +774,7 @@
   cfk_fonts = fonts-nanum,
   cjk_fonts += fonts-ipafont-gothic, fonts-ipafont-mincho,
 endif
-cjk_fonts += $(if $(with_wgy_zenhai),ttf-wqy-microhei | ttf-wqy-zenhei,ttf-arphic-uming),
+cjk_fonts += $(if $(with_wqy_zenhai),fonts-wqy-microhei | fonts-wqy-zenhei,fonts-arphic-uming),
 ifneq (,$(filter $(distrel),squeeze wheezy))
   cjk_fonts += ttf-indic-fonts,
 else ifneq (,$(filter $(distrel), lucid maverick natty oneiric precise quantal raring saucy trusty))

diff -Nur a/debian/font.properties.ja.wgy_zenhai b/debian/font.properties.ja.wgy_zenhai
--- a/debian/font.properties.ja.wgy_zenhai	2015-06-16 03:38:27.000000000 -0600
+++ b/debian/font.properties.ja.wgy_zenhai	1969-12-31 17:00:00.000000000 -0700
@@ -1,244 +0,0 @@
-# @(#)font.properties.ja.linux	1.7 02/03/07
-#
-# Copyright 2002 Sun Microsystems, Inc. All rights reserved.
-#
-
-# Component Font Mappings
-#
-serif.0=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1
-serif.1=-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-serif.2=-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-serif.italic.0=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1
-serif.italic.1=-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-serif.italic.2=-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-serif.bold.0=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1
-serif.bold.1=-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-serif.bold.2=-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-serif.bolditalic.0=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1
-serif.bolditalic.1=-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-serif.bolditalic.2=-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-sansserif.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.1=-kochi-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-sansserif.2=-sazanami-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-sansserif.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.italic.1=-kochi-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-sansserif.italic.2=-sazanami-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-sansserif.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.bold.1=-kochi-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-sansserif.bold.2=-sazanami-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-sansserif.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.bolditalic.1=-kochi-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-sansserif.bolditalic.2=-sazanami-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-monospaced.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.1=-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-monospaced.2=-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-monospaced.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.italic.1=-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-monospaced.italic.2=-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-monospaced.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.bold.1=-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-monospaced.bold.2=-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-monospaced.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.bolditalic.1=-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-monospaced.bolditalic.2=-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-dialog.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.1=-kochi-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialog.2=-sazanami-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-dialog.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.italic.1=-kochi-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialog.italic.2=-sazanami-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-dialog.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.bold.1=-kochi-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialog.bold.2=-sazanami-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-dialog.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.bolditalic.1=-kochi-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialog.bolditalic.2=-sazanami-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-dialoginput.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.1=-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialoginput.2=-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-dialoginput.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.italic.1=-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialoginput.italic.2=-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-dialoginput.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.bold.1=-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialoginput.bold.2=-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-dialoginput.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.bolditalic.1=-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-dialoginput.bolditalic.2=-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-# Missing Glyph Character
-#
-default.char=274f
-
-# Component Font Character Encodings
-#
-fontcharset.serif.0=sun.io.CharToByteISO8859_1
-fontcharset.serif.1=sun.awt.motif.CharToByteX11JIS0208
-fontcharset.serif.2=sun.awt.motif.CharToByteX11JIS0208
-
-fontcharset.sansserif.0=sun.io.CharToByteISO8859_1
-fontcharset.sansserif.1=sun.awt.motif.CharToByteX11JIS0208
-fontcharset.sansserif.2=sun.awt.motif.CharToByteX11JIS0208
-
-fontcharset.monospaced.0=sun.io.CharToByteISO8859_1
-fontcharset.monospaced.1=sun.awt.motif.CharToByteX11JIS0208
-fontcharset.monospaced.2=sun.awt.motif.CharToByteX11JIS0208
-
-fontcharset.dialog.0=sun.io.CharToByteISO8859_1
-fontcharset.dialog.1=sun.awt.motif.CharToByteX11JIS0208
-fontcharset.dialog.2=sun.awt.motif.CharToByteX11JIS0208
-
-fontcharset.dialoginput.0=sun.io.CharToByteISO8859_1
-fontcharset.dialoginput.1=sun.awt.motif.CharToByteX11JIS0208
-fontcharset.dialoginput.2=sun.awt.motif.CharToByteX11JIS0208
-
-# Exclusion Ranges
-#
-
-# XFontSet Information
-#
-fontset.serif.plain=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
--b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1,\
--kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
--sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-fontset.serif.italic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
--b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1,\
--kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
--sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-fontset.serif.bold=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
--b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1,\
--kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
--sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-fontset.serif.bolditalic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
--b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1,\
--kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
--sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-fontset.sansserif.plain=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
--b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--kochi-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
--sazanami-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-fontset.sansserif.italic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
--b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--kochi-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
--sazanami-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-fontset.sansserif.bold=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
--b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--kochi-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
--sazanami-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-fontset.sansserif.bolditalic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
--b&h-lucida-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--kochi-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
--sazanami-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-fontset.monospaced.plain=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
--b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
--sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-fontset.monospaced.italic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
--b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
--sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-fontset.monospaced.bold=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
--b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
--sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-fontset.monospaced.bolditalic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
--b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
--sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-fontset.dialog.italic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
--b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--kochi-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
--sazanami-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-fontset.dialog.bold=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
--b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--kochi-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
--sazanami-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-fontset.dialog.bolditalic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
--b&h-lucida-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--kochi-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
--sazanami-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-fontset.dialog.plain=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
--b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--kochi-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
--sazanami-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-fontset.dialoginput.italic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
--b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
--sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-fontset.dialoginput.bold=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
--b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
--sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-fontset.dialoginput.bolditalic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
--b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
--sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-fontset.dialoginput.plain=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
--b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
--sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
-fontset.default=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
--b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
--sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-
diff -Nur a/debian/font.properties.ja.wqy_zenhai b/debian/font.properties.ja.wqy_zenhai
--- a/debian/font.properties.ja.wqy_zenhai	1969-12-31 17:00:00.000000000 -0700
+++ b/debian/font.properties.ja.wqy_zenhai	2015-06-16 03:38:27.000000000 -0600
@@ -0,0 +1,244 @@
+# @(#)font.properties.ja.linux	1.7 02/03/07
+#
+# Copyright 2002 Sun Microsystems, Inc. All rights reserved.
+#
+
+# Component Font Mappings
+#
+serif.0=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1
+serif.1=-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+serif.2=-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+serif.italic.0=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1
+serif.italic.1=-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+serif.italic.2=-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+serif.bold.0=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1
+serif.bold.1=-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+serif.bold.2=-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+serif.bolditalic.0=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1
+serif.bolditalic.1=-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+serif.bolditalic.2=-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+sansserif.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+sansserif.1=-kochi-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+sansserif.2=-sazanami-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+sansserif.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+sansserif.italic.1=-kochi-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+sansserif.italic.2=-sazanami-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+sansserif.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+sansserif.bold.1=-kochi-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+sansserif.bold.2=-sazanami-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+sansserif.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+sansserif.bolditalic.1=-kochi-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+sansserif.bolditalic.2=-sazanami-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+monospaced.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+monospaced.1=-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+monospaced.2=-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+monospaced.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+monospaced.italic.1=-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+monospaced.italic.2=-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+monospaced.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+monospaced.bold.1=-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+monospaced.bold.2=-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+monospaced.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+monospaced.bolditalic.1=-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+monospaced.bolditalic.2=-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+dialog.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+dialog.1=-kochi-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialog.2=-sazanami-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+dialog.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+dialog.italic.1=-kochi-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialog.italic.2=-sazanami-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+dialog.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+dialog.bold.1=-kochi-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialog.bold.2=-sazanami-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+dialog.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+dialog.bolditalic.1=-kochi-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialog.bolditalic.2=-sazanami-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+dialoginput.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+dialoginput.1=-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialoginput.2=-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+dialoginput.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+dialoginput.italic.1=-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialoginput.italic.2=-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+dialoginput.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+dialoginput.bold.1=-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialoginput.bold.2=-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+dialoginput.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+dialoginput.bolditalic.1=-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialoginput.bolditalic.2=-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+# Missing Glyph Character
+#
+default.char=274f
+
+# Component Font Character Encodings
+#
+fontcharset.serif.0=sun.io.CharToByteISO8859_1
+fontcharset.serif.1=sun.awt.motif.CharToByteX11JIS0208
+fontcharset.serif.2=sun.awt.motif.CharToByteX11JIS0208
+
+fontcharset.sansserif.0=sun.io.CharToByteISO8859_1
+fontcharset.sansserif.1=sun.awt.motif.CharToByteX11JIS0208
+fontcharset.sansserif.2=sun.awt.motif.CharToByteX11JIS0208
+
+fontcharset.monospaced.0=sun.io.CharToByteISO8859_1
+fontcharset.monospaced.1=sun.awt.motif.CharToByteX11JIS0208
+fontcharset.monospaced.2=sun.awt.motif.CharToByteX11JIS0208
+
+fontcharset.dialog.0=sun.io.CharToByteISO8859_1
+fontcharset.dialog.1=sun.awt.motif.CharToByteX11JIS0208
+fontcharset.dialog.2=sun.awt.motif.CharToByteX11JIS0208
+
+fontcharset.dialoginput.0=sun.io.CharToByteISO8859_1
+fontcharset.dialoginput.1=sun.awt.motif.CharToByteX11JIS0208
+fontcharset.dialoginput.2=sun.awt.motif.CharToByteX11JIS0208
+
+# Exclusion Ranges
+#
+
+# XFontSet Information
+#
+fontset.serif.plain=\
+-sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
+-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1,\
+-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
+-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+fontset.serif.italic=\
+-sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
+-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1,\
+-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
+-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+fontset.serif.bold=\
+-sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
+-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1,\
+-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
+-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+fontset.serif.bolditalic=\
+-sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
+-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1,\
+-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
+-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+fontset.sansserif.plain=\
+-sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
+-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-kochi-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
+-sazanami-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+fontset.sansserif.italic=\
+-sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
+-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-kochi-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
+-sazanami-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+fontset.sansserif.bold=\
+-sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
+-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-kochi-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
+-sazanami-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+fontset.sansserif.bolditalic=\
+-sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
+-b&h-lucida-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-kochi-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
+-sazanami-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+fontset.monospaced.plain=\
+-sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
+-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+fontset.monospaced.italic=\
+-sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
+-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+fontset.monospaced.bold=\
+-sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
+-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+fontset.monospaced.bolditalic=\
+-sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
+-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+fontset.dialog.italic=\
+-sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
+-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-kochi-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
+-sazanami-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+fontset.dialog.bold=\
+-sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
+-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-kochi-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
+-sazanami-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+fontset.dialog.bolditalic=\
+-sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
+-b&h-lucida-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-kochi-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
+-sazanami-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+fontset.dialog.plain=\
+-sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-kochi-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
+-sazanami-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+fontset.dialoginput.italic=\
+-sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
+-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+fontset.dialoginput.bold=\
+-sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
+-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+fontset.dialoginput.bolditalic=\
+-sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
+-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+fontset.dialoginput.plain=\
+-sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
+-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
+fontset.default=\
+-sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-kochi-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0,\
+-sazanami-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+
diff -Nur a/debian/rules b/debian/rules
--- a/debian/rules	2017-08-24 11:10:11.000000000 -0600
+++ b/debian/rules	2017-09-07 05:33:44.024595869 -0600
@@ -1690,7 +1690,7 @@
 
 	: # TODO: why do we provide a custom font.properties.ja?
 	: # cp -p debian/font.properties.ja $(d_jbin)/$(etcdir)/.
-#	cp debian/font.properties.wgy_zenhai \
+#	cp debian/font.properties.wqy_zenhai \
 #		$(d)/$(etcdir)/font.properties.ja
 
 

diff -Nur a/debian/control b/debian/control
--- a/debian/control	2017-08-07 08:33:16.000000000 -0600
+++ b/debian/control	2017-09-07 05:35:29.279708161 -0600
@@ -6,12 +6,12 @@
 Build-Depends: debhelper (>= 9.20141010), dpkg-dev (>= 1.17.14),
   quilt, m4, lsb-release, zip, unzip,
   sharutils, gawk, cpio, pkg-config, procps, wdiff, fastjar (>= 2:0.96-0ubuntu2),
-  autoconf, automake, autotools-dev, ant, ant-optional, 
+  autoconf, automake, autotools-dev, ant, ant-optional,
   g++-6,
   openjdk-8-jdk (>= 8u91-b14-2) [s390x], openjdk-8-jdk | openjdk-9-jdk,
   libxtst-dev, libxi-dev, libxt-dev, libxaw7-dev, libxrender-dev, libcups2-dev, libasound2-dev, liblcms2-dev, libfreetype6-dev (>= 2.2.1), libgtk2.0-dev, libxinerama-dev, libkrb5-dev, xsltproc, libpcsclite-dev, libgtk-3-dev, libelf-dev,
-  libffi-dev, 
-  zlib1g-dev, libattr1-dev, libpng-dev, libjpeg-dev, libgif-dev,  
+  libffi-dev,
+  zlib1g-dev, libattr1-dev, libpng-dev, libjpeg-dev, libgif-dev,
   libnss3-dev (>= 2:3.17.1),
   mauve, jtreg (>= 4.2-b03-1~), xvfb, xauth, xfonts-base, libgl1-mesa-dri [!x32], twm | metacity, twm | dbus-x11, x11-xkb-utils,
   time, openjdk-8-jdk-headless <cross>,
@@ -148,14 +148,14 @@
  This package contains the debugging symbols.
 
 Package: openjdk-9-jre-zero
-Architecture: amd64 i386 arm64 armhf ppc64 ppc64el sparc64 s390x kfreebsd-amd64 kfreebsd-i386 
+Architecture: amd64 i386 arm64 armhf ppc64 ppc64el sparc64 s390x kfreebsd-amd64 kfreebsd-i386
 Multi-Arch: same
 Priority: extra
 Pre-Depends: ${dpkg:Depends}
 Depends: openjdk-9-jre-headless (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Provides: ${zerovm:Provides}
 Description: Alternative JVM for OpenJDK, using Zero/Shark
- The package provides an alternative runtime using the Zero VM and the 
+ The package provides an alternative runtime using the Zero VM and the
  Shark Just In Time Compiler (JIT).  Built on architectures in addition
  to the Hotspot VM as a debugging aid for those architectures which don't
  have a Hotspot VM.