diff -pruN 0.2.20080216.2-10/debian/65-fonts-arphic-uming.conf 0.2.20080216.2-10ubuntu2/debian/65-fonts-arphic-uming.conf
--- 0.2.20080216.2-10/debian/65-fonts-arphic-uming.conf	1970-01-01 00:00:00.000000000 +0000
+++ 0.2.20080216.2-10ubuntu2/debian/65-fonts-arphic-uming.conf	2013-02-05 15:13:05.000000000 +0000
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+    <alias>
+        <family>serif</family>
+        <prefer>
+            <family>AR PL UMing CN</family>
+            <family>AR PL UMing HK</family>
+            <family>AR PL UMing TW</family>
+        </prefer>
+    </alias>
+    <alias>
+        <family>sans-serif</family>
+        <prefer>
+            <family>AR PL UMing CN</family>
+            <family>AR PL UMing HK</family>
+            <family>AR PL UMing TW</family>
+        </prefer>
+    </alias>
+    <alias>
+        <family>monospace</family>
+        <prefer>
+            <family>AR PL UMing CN</family>
+            <family>AR PL UMing HK</family>
+            <family>AR PL UMing TW</family>
+        </prefer>
+    </alias>
+</fontconfig>
diff -pruN 0.2.20080216.2-10/debian/changelog 0.2.20080216.2-10ubuntu2/debian/changelog
--- 0.2.20080216.2-10/debian/changelog	2017-10-22 22:12:29.000000000 +0000
+++ 0.2.20080216.2-10ubuntu2/debian/changelog	2019-06-28 04:53:00.000000000 +0000
@@ -1,3 +1,20 @@
+fonts-arphic-uming (0.2.20080216.2-10ubuntu2) eoan; urgency=low
+
+  * debian/fonts-arphic-uming.links:
+    - Disable 64-arphic-uming.conf by dropping the symlink to it, since
+      the file isn't compatible with the 69-language-selector-zh-*.conf
+      files (LP: #1834561).
+
+ -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Fri, 28 Jun 2019 06:53:00 +0200
+
+fonts-arphic-uming (0.2.20080216.2-10ubuntu1) disco; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Return AR PL Uming for generics (serif/sans-serif/monospace) 
+    - Remove /etc/fonts/conf.avail/gbp.conf which was shipped inadvertantly.
+
+ -- Ubuntu Merge-o-Matic <mom@ubuntu.com>  Tue, 17 Apr 2018 18:45:53 +0000
+
 fonts-arphic-uming (0.2.20080216.2-10) unstable; urgency=medium
 
   * Team upload.
@@ -33,6 +50,27 @@ fonts-arphic-uming (0.2.20080216.2-8) un
 
  -- Hideki Yamane <henrich@debian.org>  Mon, 25 Sep 2017 20:51:09 +0900
 
+fonts-arphic-uming (0.2.20080216.2-7ubuntu3) bionic; urgency=medium
+
+  * Don't call dh_installchangelogs on a package that doesn't exist. Fixes
+    FTBFS.
+
+ -- Iain Lane <iain@orangesquash.org.uk>  Tue, 17 Apr 2018 11:57:32 +0100
+
+fonts-arphic-uming (0.2.20080216.2-7ubuntu2) trusty; urgency=low
+
+  * Remove /etc/fonts/conf.avail/gbp.conf which was shipped inadvertantly.
+    (LP: #1254129)
+
+ -- Iain Lane <iain@orangesquash.org.uk>  Sat, 23 Nov 2013 17:19:06 +0000
+
+fonts-arphic-uming (0.2.20080216.2-7ubuntu1) trusty; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Return AR PL Uming for generics (serif/sans-serif/monospace) 
+
+ -- Iain Lane <iain.lane@canonical.com>  Fri, 22 Nov 2013 12:15:58 +0000
+
 fonts-arphic-uming (0.2.20080216.2-7) unstable; urgency=low
 
   * Properly remove obsolete configuration file
@@ -76,6 +114,32 @@ fonts-arphic-uming (0.2.20080216.2-5) un
 
  -- Christian Perrier <bubulle@debian.org>  Wed, 14 Aug 2013 07:27:24 +0200
 
+fonts-arphic-uming (0.2.20080216.2-4ubuntu4) raring; urgency=low
+
+  * Return AR PL Uming for generics (serif/sans-serif/monospace) 
+
+ -- Iain Lane <iain.lane@canonical.com>  Tue, 05 Feb 2013 14:50:22 +0000
+
+fonts-arphic-uming (0.2.20080216.2-4ubuntu3) raring; urgency=low
+
+  * Missed a <test>. 
+
+ -- Iain Lane <iain.lane@canonical.com>  Fri, 25 Jan 2013 16:44:05 +0000
+
+fonts-arphic-uming (0.2.20080216.2-4ubuntu2) raring; urgency=low
+
+  * Fix disjunction syntax properly. You must duplicate the <match> elements
+    and vary the <test>s inside them. Duplicating <test> means conjunction.
+
+ -- Iain Lane <iain.lane@canonical.com>  Fri, 25 Jan 2013 11:37:19 +0000
+
+fonts-arphic-uming (0.2.20080216.2-4ubuntu1) quantal; urgency=low
+
+  * Add single_alias_test_tags.patch: Avoid multiple values in an alias and
+    test tags, as they are not supported by current fontconfig. (LP: #1034928)
+
+ -- Radu Stoica <radumstoica@gmail.com>  Mon, 10 Sep 2012 11:49:15 +0200
+
 fonts-arphic-uming (0.2.20080216.2-4) unstable; urgency=low
 
   * Team upload.
diff -pruN 0.2.20080216.2-10/debian/control 0.2.20080216.2-10ubuntu2/debian/control
--- 0.2.20080216.2-10/debian/control	2017-10-22 22:12:29.000000000 +0000
+++ 0.2.20080216.2-10ubuntu2/debian/control	2018-04-17 18:45:52.000000000 +0000
@@ -2,7 +2,8 @@ Source: fonts-arphic-uming
 Build-Depends: debhelper (>= 10)
 Section: fonts
 Priority: optional
-Maintainer: Debian Fonts Task Force <pkg-fonts-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Fonts Task Force <pkg-fonts-devel@lists.alioth.debian.org>
 Uploaders: Arne Goetje <arne@ubuntu.com>, Christian Perrier <bubulle@debian.org>
 Standards-Version: 4.1.1
 Homepage: https://www.freedesktop.org/wiki/Software/CJKUnifonts
diff -pruN 0.2.20080216.2-10/debian/fonts-arphic-uming.links 0.2.20080216.2-10ubuntu2/debian/fonts-arphic-uming.links
--- 0.2.20080216.2-10/debian/fonts-arphic-uming.links	2017-10-22 22:12:29.000000000 +0000
+++ 0.2.20080216.2-10ubuntu2/debian/fonts-arphic-uming.links	2019-06-28 04:43:25.000000000 +0000
@@ -1,5 +1,5 @@
 etc/fonts/conf.avail/25-arphic-uming-render.conf etc/fonts/conf.d/25-arphic-uming-render.conf
 etc/fonts/conf.avail/35-arphic-uming-aliases.conf etc/fonts/conf.d/35-arphic-uming-aliases.conf
 etc/fonts/conf.avail/41-arphic-uming.conf etc/fonts/conf.d/41-arphic-uming.conf
-etc/fonts/conf.avail/64-arphic-uming.conf etc/fonts/conf.d/64-arphic-uming.conf
 etc/fonts/conf.avail/90-arphic-uming-embolden.conf etc/fonts/conf.d/90-arphic-uming-embolden.conf
+etc/fonts/conf.avail/65-fonts-arphic-uming.conf etc/fonts/conf.d/65-fonts-arphic-uming.conf
diff -pruN 0.2.20080216.2-10/debian/install 0.2.20080216.2-10ubuntu2/debian/install
--- 0.2.20080216.2-10/debian/install	2017-10-22 22:12:29.000000000 +0000
+++ 0.2.20080216.2-10ubuntu2/debian/install	2018-04-17 18:45:52.000000000 +0000
@@ -1,2 +1,3 @@
 *.conf etc/fonts/conf.avail
+debian/*.conf etc/fonts/conf.avail
 *.ttc usr/share/fonts/truetype/arphic
diff -pruN 0.2.20080216.2-10/debian/rules 0.2.20080216.2-10ubuntu2/debian/rules
--- 0.2.20080216.2-10/debian/rules	2017-10-22 22:12:29.000000000 +0000
+++ 0.2.20080216.2-10ubuntu2/debian/rules	2018-04-17 18:45:53.000000000 +0000
@@ -7,5 +7,9 @@ override_dh_installdocs:
 	dh_installdocs
 	find debian/fonts-arphic-uming -name .svn -print0 | xargs --null rm --recursive --force
 
+override_dh_install:
+	dh_install
+	rm debian/fonts-arphic-uming/etc/fonts/conf.avail/gbp.conf
+
 override_dh_installchangelogs:
 	dh_installchangelogs -p fonts-arphic-uming FONTLOG
