diff -pruN 3.38.1-1/debian/changelog 3.38.1-1ubuntu1/debian/changelog
--- 3.38.1-1/debian/changelog	2020-10-07 12:28:14.000000000 +0000
+++ 3.38.1-1ubuntu1/debian/changelog	2020-10-07 13:03:58.000000000 +0000
@@ -1,3 +1,19 @@
+gnome-user-docs (3.38.1-1ubuntu1) groovy; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/{control*,rules,gnome-user-docs.install}:
+      + Split into language specific binary packages.
+      + Add dh_missing check as we split the packages.
+    - debian/{control*,rules}:
+      + Don't install certain files and depend on ubuntu-docs.
+    - debian/rules:
+      + Don't strip translated pages.
+      + Don't run dh_translations.
+  * debian/rules:
+    - net-install-flash.page dropped upstream so don't try to remove it
+
+ -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Wed, 07 Oct 2020 15:03:58 +0200
+
 gnome-user-docs (3.38.1-1) unstable; urgency=medium
 
   * Team upload
@@ -6,12 +22,32 @@ gnome-user-docs (3.38.1-1) unstable; urg
 
  -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Wed, 07 Oct 2020 14:28:14 +0200
 
+gnome-user-docs (3.38.0-1ubuntu1) groovy; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/{control*,rules,gnome-user-docs.install}:
+      + Split into language specific binary packages.
+      + Add dh_missing check as we split the packages.
+    - debian/{control*,rules}:
+      + Don't install certain files and depend on ubuntu-docs.
+    - debian/rules:
+      + Don't strip translated pages.
+      + Don't run dh_translations.
+
+ -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Fri, 25 Sep 2020 19:07:00 +0200
+
 gnome-user-docs (3.38.0-1) unstable; urgency=medium
 
   * New upstream release
 
  -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Sun, 13 Sep 2020 19:27:38 +0200
 
+gnome-user-docs (3.37.92-0ubuntu1) groovy; urgency=medium
+
+  * New upstream release (LP: #1884860)
+
+ -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Wed, 09 Sep 2020 09:22:26 +0200
+
 gnome-user-docs (3.36.2-1) unstable; urgency=medium
 
   * New upstream release
@@ -25,6 +61,38 @@ gnome-user-docs (3.36.1-1) unstable; urg
 
  -- Jeremy Bicha <jbicha@debian.org>  Sat, 28 Mar 2020 22:24:06 -0400
 
+gnome-user-docs (3.36.2+git20200704-0ubuntu1) groovy; urgency=medium
+
+  * Latest upstream git (LP: #1886282, LP: #1782857, LP: #1882811)
+  * debian/rules, debian/control*:
+    - New language: Farsi
+  * debian/rules: Don't install shell-apps-auto-start.page as per
+    https://lists.ubuntu.com/archives/ubuntu-desktop/2020-June/006302.html
+
+ -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Sat, 04 Jul 2020 19:33:00 +0200
+
+gnome-user-docs (3.36.1-0ubuntu1) focal; urgency=medium
+
+  * New upstream release (LP: #1870102)
+  * debian/rules, debian/control*:
+    - New language: Lithuanian
+
+ -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Fri, 03 Apr 2020 19:31:00 +0200
+
+gnome-user-docs (3.36.0-1ubuntu1) focal; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/{control*,rules,gnome-user-docs.install}:
+      + Split into language specific binary packages.
+      + Add dh_missing check as we split the packages.
+    - debian/{control*,rules}:
+      + Don't install certain files and depend on ubuntu-docs.
+    - debian/rules:
+      + Don't strip translated pages.
+      + Don't run dh_translations.
+
+ -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Tue, 17 Mar 2020 22:27:00 +0100
+
 gnome-user-docs (3.36.0-1) unstable; urgency=medium
 
   * New upstream release
@@ -44,6 +112,26 @@ gnome-user-docs (3.34.1-1) unstable; urg
 
  -- Jeremy Bicha <jbicha@debian.org>  Sat, 01 Feb 2020 21:09:01 -0500
 
+gnome-user-docs (3.35.92-0ubuntu1) focal; urgency=medium
+
+  * New upstream release
+
+ -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Wed, 04 Mar 2020 00:04:00 +0100
+
+gnome-user-docs (3.34.0-2ubuntu1) eoan; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/{control*,rules,gnome-user-docs.install}:
+      + Split into language specific binary packages.
+      + Add dh_missing check as we split the packages.
+    - debian/{control*,rules}:
+      + Don't install certain files and depend on ubuntu-docs.
+    - debian/rules:
+      + Don't strip translated pages.
+      + Don't run dh_translations.
+
+ -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Wed, 18 Sep 2019 10:23:00 +0200
+
 gnome-user-docs (3.34.0-2) unstable; urgency=medium
 
   * Build-Depend on debhelper-compat 12 and drop debian/compat
@@ -61,23 +149,47 @@ gnome-user-docs (3.34.0-1) experimental;
 
  -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Thu, 12 Sep 2019 04:23:17 +0200
 
-gnome-user-docs (3.32.0-1) experimental; urgency=medium
+gnome-user-docs (3.33.90-0ubuntu1) eoan; urgency=low
 
   * New upstream release
+  * debian/rules:
+    - Don't run dh_translations
 
- -- Jeremy Bicha <jbicha@debian.org>  Tue, 12 Mar 2019 20:26:07 -0400
+ -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Wed, 28 Aug 2019 19:00:00 +0200
 
-gnome-user-docs (3.30.2-1) unstable; urgency=medium
+gnome-user-docs (3.32.0+git20190406-0ubuntu1) disco; urgency=low
 
-  * New upstream release
+  * Latest upstream git (LP: #1823731).
 
- -- Jeremy Bicha <jbicha@debian.org>  Sun, 25 Nov 2018 15:39:15 -0500
+ -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Mon, 08 Apr 2019 17:00:00 +0200
 
-gnome-user-docs (3.30.1-1) unstable; urgency=medium
+gnome-user-docs (3.32.0-0ubuntu1) disco; urgency=low
 
   * New upstream release
 
- -- Jeremy Bicha <jbicha@debian.org>  Fri, 05 Oct 2018 14:37:11 -0400
+ -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Fri, 22 Mar 2019 00:57:00 +0100
+
+gnome-user-docs (3.30.1+git20181009-0ubuntu1) cosmic; urgency=low
+
+  * Latest upstream git (LP: #1797323).
+
+ -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Thu, 11 Oct 2018 09:56:00 +0200
+
+gnome-user-docs (3.30.0-1ubuntu1) cosmic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/{control*,rules,gnome-user-docs.install}:
+      + Split into language specific binary packages.
+      + Add dh_missing check as we splitted the packages.
+    - debian/control*:
+      + Depend on ubuntu-docs.
+    - debian/rules:
+      + Don't strip translated pages.
+  * Clean up old renaming transition from -guide and old breaks/replaces
+    for ubuntu-docs which are not in debian.
+  * Drop unecessary package description diff.
+
+ -- Didier Roche <didrocks@ubuntu.com>  Tue, 11 Sep 2018 16:30:54 +0200
 
 gnome-user-docs (3.30.0-1) unstable; urgency=medium
 
@@ -86,6 +198,12 @@ gnome-user-docs (3.30.0-1) unstable; urg
 
  -- Jeremy Bicha <jbicha@debian.org>  Sun, 09 Sep 2018 10:02:02 -0400
 
+gnome-user-docs (3.28.2+git20180715-0ubuntu1) cosmic; urgency=medium
+
+  * Latest upstream git (LP: #1781816, LP: #1772104, LP: #1771026)
+
+ -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Sun, 15 Apr 2018 23:46:00 +0200
+
 gnome-user-docs (3.28.2-1) unstable; urgency=medium
 
   * New upstream release
@@ -99,6 +217,25 @@ gnome-user-docs (3.28.1-1) unstable; urg
 
  -- Jeremy Bicha <jbicha@debian.org>  Mon, 09 Apr 2018 18:00:58 -0400
 
+gnome-user-docs (3.28.1-0ubuntu1) bionic; urgency=medium
+
+  * New upstream release
+  * debian/rules, debian/control.in:
+    - New language: Croatian
+  * debian/control.in:
+    - Vcs-* fields updated
+
+ -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Tue, 10 Apr 2018 01:50:00 +0200
+
+gnome-user-docs (3.28.0+git20180331-0ubuntu1) bionic; urgency=medium
+
+  * Latest upstream git (LP: #1682548, LP: #1730900) 
+  * debian/rules:
+    - Drop sed() command for controlling the HTML build (moved to build
+      script in the ubuntu-docs branch).
+
+ -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Sun, 01 Apr 2018 23:25:00 +0200
+
 gnome-user-docs (3.28.0-1) unstable; urgency=medium
 
   * New upstream release
@@ -107,6 +244,32 @@ gnome-user-docs (3.28.0-1) unstable; urg
 
  -- Jeremy Bicha <jbicha@debian.org>  Wed, 14 Mar 2018 13:53:17 -0400
 
+gnome-user-docs (3.28.0-0ubuntu3) bionic; urgency=medium
+
+  * debian/rules:
+    - Convert links of type 'action="install:<package>"' to the format
+      'href="apt:<package>"'.
+    - Include such links also on the HTML version of the pages.
+
+ -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Wed, 21 Mar 2018 22:55:00 +0100
+
+gnome-user-docs (3.28.0-0ubuntu2) bionic; urgency=medium
+
+  * debian/control.in, debian/rules:
+    - Separate package for Korean (LP: #1756569)
+    - Start installing keyboard-layouts.page - previous Ubuntu delta
+      has been committed upstream.
+
+ -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Tue, 20 Mar 2018 04:46:00 +0100
+
+gnome-user-docs (3.28.0-0ubuntu1) bionic; urgency=medium
+
+  * New upstream release (LP: #1656071)
+  * debian/rules:
+    - New Korean translation of system-admin-guide
+
+ -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Sat, 17 Mar 2018 16:59:00 +0100
+
 gnome-user-docs (3.26.2.1-1) unstable; urgency=medium
 
   * New usptream release
@@ -116,6 +279,14 @@ gnome-user-docs (3.26.2.1-1) unstable; u
 
  -- Jeremy Bicha <jbicha@debian.org>  Fri, 15 Dec 2017 18:04:00 -0500
 
+gnome-user-docs (3.26.2.1-0ubuntu1) bionic; urgency=medium
+
+  * New upstream release (LP: #1736786)
+  * debian/control.in:
+    - Bump Standards-Version to 4.1.2
+
+ -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Wed, 06 Dec 2017 20:49:00 +0100
+
 gnome-user-docs (3.26.2-1) unstable; urgency=medium
 
   * New upstream release
@@ -128,6 +299,12 @@ gnome-user-docs (3.26.1.1-1) unstable; u
 
  -- Jeremy Bicha <jbicha@debian.org>  Wed, 18 Oct 2017 13:38:39 -0400
 
+gnome-user-docs (3.26.1-0ubuntu1) artful; urgency=medium
+
+  * New upstream release
+
+ -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Thu, 12 Oct 2017 14:59:00 +0200
+
 gnome-user-docs (3.26.0.1-1) unstable; urgency=medium
 
   * New upstream release
@@ -136,12 +313,29 @@ gnome-user-docs (3.26.0.1-1) unstable; u
 
  -- Jeremy Bicha <jbicha@debian.org>  Sun, 01 Oct 2017 18:15:17 -0400
 
+gnome-user-docs (3.26.0.1-0ubuntu1) artful; urgency=medium
+
+  * New upstream release
+
+ -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Thu, 28 Sep 2017 00:13:00 +0200
+
 gnome-user-docs (3.26.0-1) unstable; urgency=medium
 
   * New upstream release
 
  -- Jeremy Bicha <jbicha@debian.org>  Tue, 12 Sep 2017 14:46:46 -0400
 
+gnome-user-docs (3.26.0-0ubuntu1) artful; urgency=medium
+
+  * New upstream release
+  * debian/rules, debian/control.in:
+    - New languages: Polish, Portuguese (Portugal), Romanian
+  * debian/control.in:
+    - Bump Standards-Version to 4.1.0
+    - Priority for gnome-user-guide change from 'extra' to 'optional'
+
+ -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Thu, 21 Sep 2017 21:27:00 +0200
+
 gnome-user-docs (3.25.90-2) unstable; urgency=medium
 
   * Add missing Breaks/Replaces for package rename
@@ -156,6 +350,38 @@ gnome-user-docs (3.25.90-1) unstable; ur
 
  -- Jeremy Bicha <jbicha@ubuntu.com>  Tue, 29 Aug 2017 16:45:24 -0400
 
+gnome-user-docs (3.24.2-0ubuntu2) artful; urgency=medium
+
+  * debian/rules, debian/control.in:
+    - Name the binary package(s) gnome-user-docs instead of
+      gnome-user-guide (LP: #1691867).
+    - Split into language specific binary packages (LP: #1691872).
+    - Don't strip translated pages (LP: #1689321).
+
+ -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Fri, 19 May 2017 23:31:00 +0200
+
+gnome-user-docs (3.24.2-0ubuntu1) artful; urgency=medium
+
+  * New upstream release (LP: #1690609)
+
+ -- Tim Lunn <tim@feathertop.org>  Sun, 14 May 2017 10:10:29 +1000
+
+gnome-user-docs (3.24.0-0ubuntu2) artful; urgency=medium
+
+  * debian/rules:
+    - Don't install certain files - modified versions of most of them
+      are installed by ubuntu-docs instead (LP: #1687928).
+  * debian/control.in:
+    - Depend on ubuntu-docs.
+
+ -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Wed, 03 May 2017 14:12:00 +0200
+
+gnome-user-docs (3.24.0-0ubuntu1) zesty; urgency=medium
+
+  * New upstream release (LP: #1681896)
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Tue, 11 Apr 2017 13:35:59 -0400
+
 gnome-user-docs (3.22.0-1) unstable; urgency=medium
 
   * New upstream release.
@@ -652,3 +878,4 @@ gnome2-user-docs (1.90-1) unstable; urge
   * Initial release.
 
  -- Christian Marillat <marillat@debian.org>  Thu, 30 May 2002 16:48:27 +0200
+
diff -pruN 3.38.1-1/debian/control 3.38.1-1ubuntu1/debian/control
--- 3.38.1-1/debian/control	2020-10-07 12:28:14.000000000 +0000
+++ 3.38.1-1ubuntu1/debian/control	2020-10-07 13:03:58.000000000 +0000
@@ -5,8 +5,9 @@
 Source: gnome-user-docs
 Section: doc
 Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Jeremy Bicha <jbicha@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Uploaders: Jeremy Bicha <jbicha@debian.org>, Michael Biebl <biebl@debian.org>
 Build-Depends: debhelper-compat (= 13),
                dh-sequence-gnome
 Build-Depends-Indep: yelp-tools,
@@ -20,6 +21,7 @@ Homepage: https://help.gnome.org/users/
 Package: gnome-user-docs
 Architecture: all
 Depends: ${misc:Depends},
+         ubuntu-docs (>= 18.04.1~),
          yelp (>= 3)
 Breaks: gnome-user-guide (<< 3.25.90)
 Replaces: gnome-user-guide (<< 3.25.90)
@@ -38,3 +40,373 @@ Description: GNOME user's guide (transit
  .
  This package is here to ensure smooth upgrades. It can be removed when
  you see fit.
+
+Package: gnome-user-docs-as
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Assamese)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Assamese.
+
+Package: gnome-user-docs-ca
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Catalan)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Catalan.
+
+Package: gnome-user-docs-cs
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Czech)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Czech.
+
+Package: gnome-user-docs-da
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Danish)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Danish.
+
+Package: gnome-user-docs-de
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (German)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in German.
+
+Package: gnome-user-docs-el
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Greek)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Greek.
+
+Package: gnome-user-docs-es
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Spanish)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Spanish.
+
+Package: gnome-user-docs-fa
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Farsi)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Farsi.
+
+Package: gnome-user-docs-fi
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Finnish)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Finnish.
+
+Package: gnome-user-docs-fr
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (French)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in French.
+
+Package: gnome-user-docs-gl
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Galician)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Galician.
+
+Package: gnome-user-docs-gu
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Gujarati)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Gujarati.
+
+Package: gnome-user-docs-he
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Hebrew)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Hebrew.
+
+Package: gnome-user-docs-hi
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Hindi)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Hindi.
+
+Package: gnome-user-docs-hr
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Croatian)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Croatian.
+
+Package: gnome-user-docs-hu
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Hungarian)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Hungarian.
+
+Package: gnome-user-docs-id
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Indonesian)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Indonesian.
+
+Package: gnome-user-docs-it
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Italian)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Italian.
+
+Package: gnome-user-docs-ja
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Japanese)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Japanese.
+
+Package: gnome-user-docs-kn
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Kannada)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Kannada.
+
+Package: gnome-user-docs-ko
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Korean)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Korean.
+
+Package: gnome-user-docs-lt
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Lithuanian)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Lithuanian.
+
+Package: gnome-user-docs-lv
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Latvian)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Latvian.
+
+Package: gnome-user-docs-mr
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Marathi)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Marathi.
+
+Package: gnome-user-docs-nl
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Dutch)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Dutch.
+
+Package: gnome-user-docs-pa
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Punjabi)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Punjabi.
+
+Package: gnome-user-docs-pl
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Polish)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Polish.
+
+Package: gnome-user-docs-pt
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Portuguese)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Portuguese.
+
+Package: gnome-user-docs-ro
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Romanian)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Romanian.
+
+Package: gnome-user-docs-ru
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Russian)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Russian.
+
+Package: gnome-user-docs-sl
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Slovenian)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Slovenian.
+
+Package: gnome-user-docs-sr
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Serbian)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Serbian.
+
+Package: gnome-user-docs-sv
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Swedish)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Swedish.
+
+Package: gnome-user-docs-ta
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Tamil)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Tamil.
+
+Package: gnome-user-docs-te
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Telugu)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Telugu.
+
+Package: gnome-user-docs-vi
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Vietnamese)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Vietnamese.
+
+Package: gnome-user-docs-zh-hans
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Simplified Chinese)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Simplified Chinese.
diff -pruN 3.38.1-1/debian/control.in 3.38.1-1ubuntu1/debian/control.in
--- 3.38.1-1/debian/control.in	2020-10-07 12:28:14.000000000 +0000
+++ 3.38.1-1ubuntu1/debian/control.in	2020-10-07 12:43:17.000000000 +0000
@@ -1,7 +1,8 @@
 Source: gnome-user-docs
 Section: doc
 Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper-compat (= 13),
                dh-sequence-gnome
@@ -16,6 +17,7 @@ Homepage: https://help.gnome.org/users/
 Package: gnome-user-docs
 Architecture: all
 Depends: ${misc:Depends},
+         ubuntu-docs (>= 18.04.1~),
          yelp (>= 3)
 Breaks: gnome-user-guide (<< 3.25.90)
 Replaces: gnome-user-guide (<< 3.25.90)
@@ -34,3 +36,373 @@ Description: GNOME user's guide (transit
  .
  This package is here to ensure smooth upgrades. It can be removed when
  you see fit.
+
+Package: gnome-user-docs-as
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Assamese)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Assamese.
+
+Package: gnome-user-docs-ca
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Catalan)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Catalan.
+
+Package: gnome-user-docs-cs
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Czech)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Czech.
+
+Package: gnome-user-docs-da
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Danish)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Danish.
+
+Package: gnome-user-docs-de
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (German)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in German.
+
+Package: gnome-user-docs-el
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Greek)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Greek.
+
+Package: gnome-user-docs-es
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Spanish)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Spanish.
+
+Package: gnome-user-docs-fa
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Farsi)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Farsi.
+
+Package: gnome-user-docs-fi
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Finnish)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Finnish.
+
+Package: gnome-user-docs-fr
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (French)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in French.
+
+Package: gnome-user-docs-gl
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Galician)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Galician.
+
+Package: gnome-user-docs-gu
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Gujarati)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Gujarati.
+
+Package: gnome-user-docs-he
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Hebrew)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Hebrew.
+
+Package: gnome-user-docs-hi
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Hindi)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Hindi.
+
+Package: gnome-user-docs-hr
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Croatian)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Croatian.
+
+Package: gnome-user-docs-hu
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Hungarian)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Hungarian.
+
+Package: gnome-user-docs-id
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Indonesian)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Indonesian.
+
+Package: gnome-user-docs-it
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Italian)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Italian.
+
+Package: gnome-user-docs-ja
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Japanese)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Japanese.
+
+Package: gnome-user-docs-kn
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Kannada)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Kannada.
+
+Package: gnome-user-docs-ko
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Korean)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Korean.
+
+Package: gnome-user-docs-lt
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Lithuanian)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Lithuanian.
+
+Package: gnome-user-docs-lv
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Latvian)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Latvian.
+
+Package: gnome-user-docs-mr
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Marathi)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Marathi.
+
+Package: gnome-user-docs-nl
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Dutch)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Dutch.
+
+Package: gnome-user-docs-pa
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Punjabi)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Punjabi.
+
+Package: gnome-user-docs-pl
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Polish)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Polish.
+
+Package: gnome-user-docs-pt
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Portuguese)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Portuguese.
+
+Package: gnome-user-docs-ro
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Romanian)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Romanian.
+
+Package: gnome-user-docs-ru
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Russian)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Russian.
+
+Package: gnome-user-docs-sl
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Slovenian)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Slovenian.
+
+Package: gnome-user-docs-sr
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Serbian)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Serbian.
+
+Package: gnome-user-docs-sv
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Swedish)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Swedish.
+
+Package: gnome-user-docs-ta
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Tamil)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Tamil.
+
+Package: gnome-user-docs-te
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Telugu)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Telugu.
+
+Package: gnome-user-docs-vi
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Vietnamese)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Vietnamese.
+
+Package: gnome-user-docs-zh-hans
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-docs (= ${binary:Version})
+Description: GNOME user docs (Simplified Chinese)
+ Documentation for using the GNOME desktop environment and its components.
+ It covers usage and setup of the core GNOME programs.
+ .
+ This package contains the documentation in Simplified Chinese.
diff -pruN 3.38.1-1/debian/gnome-user-docs.install 3.38.1-1ubuntu1/debian/gnome-user-docs.install
--- 3.38.1-1/debian/gnome-user-docs.install	2020-10-07 12:28:14.000000000 +0000
+++ 3.38.1-1ubuntu1/debian/gnome-user-docs.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr
diff -pruN 3.38.1-1/debian/rules 3.38.1-1ubuntu1/debian/rules
--- 3.38.1-1/debian/rules	2020-10-07 12:28:14.000000000 +0000
+++ 3.38.1-1ubuntu1/debian/rules	2020-10-07 12:54:20.000000000 +0000
@@ -1,12 +1,48 @@
 #!/usr/bin/make -f
 
+# don't strip translated pages
+export NO_PKG_MANGLE=1
+
 %:
 	dh $@
 
+# Files which should not be installed. Modified versions are
+# installed by the ubuntu-docs package for most of those files.
+DO_NOT_INSTALL = \
+	about-this-guide.page \
+	get-involved.page \
+	help-irc.page \
+	help-mailing-list.page \
+	index.page \
+	more-help.page \
+	shell-apps-auto-start.page \
+	translate.page
+
+# Note: Make sure that LANGUAGES is in sync with the HELP_LINGUAS
+# variable in gnome-help/Makefile.am.
+LANGUAGES = as ca cs da de el fa fi fr es gl gu he hi hr hu id it ja kn lv lt mr nl pa pl pt pt_BR ro ru sl sr sr@latin sv te vi ta zh_CN
+
 override_dh_install:
 	# modify install links (https://bugs.debian.org/938994)
 	for d in $(CURDIR)/debian/tmp/usr/share/help/*/gnome-help; do \
 		cd $$d; \
+		rm $(DO_NOT_INSTALL); \
 		sed -i 's/action="install:/href="apt:/' *.page; \
 	done
-	dh_install
+	for lang in $(LANGUAGES); do \
+		if [ "$$lang" = 'pt_BR' -o "$$lang" = 'sr@latin' -o "$$lang" = 'zh_CN' ]; then \
+			continue; \
+		fi; \
+		dh_movefiles -p gnome-user-docs-$$lang usr/share/help/$$lang; \
+	done
+	dh_movefiles -p gnome-user-docs		usr/share/help/C
+	dh_movefiles -p gnome-user-docs-pt	usr/share/help/pt_BR
+	dh_movefiles -p gnome-user-docs-sr	usr/share/help/sr@latin
+	dh_movefiles -p gnome-user-docs-zh-hans	usr/share/help/zh_CN
+	# Korean translation is present only for system-admin-guide.
+	dh_movefiles -p gnome-user-docs-ko	usr/share/help/ko
+
+override_dh_translations:
+
+override_dh_missing:
+	dh_missing --fail-missing
