diff -pruN 42.0-1/debian/changelog 42.0-1ubuntu1/debian/changelog --- 42.0-1/debian/changelog 2022-03-21 13:44:05.000000000 +0000 +++ 42.0-1ubuntu1/debian/changelog 2022-04-28 22:24:59.000000000 +0000 @@ -1,15 +1,76 @@ +gnome-user-docs (42.0-1ubuntu1) kinetic; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - debian/{control*,rules}: + + Split into language specific binary packages. + + Don't install certain files and depend on ubuntu-docs. + - debian/rules: + + Install dir: debian/tmp instead of debian/gnome-user-docs + + Don't strip translated pages. + + Don't run dh_translations. + - debian/control*: + + Modify VCS info for Ubuntu + - debian/gbp.conf: + + Set debian-branch ubuntu/master + - debian/patches/update_sharing-desktop.page.patch + + -- Gunnar Hjalmarsson Fri, 29 Apr 2022 00:24:59 +0200 + gnome-user-docs (42.0-1) unstable; urgency=medium * New upstream release -- Jeremy Bicha Mon, 21 Mar 2022 09:44:05 -0400 +gnome-user-docs (41.5-1ubuntu2) jammy; urgency=medium + + * debian/patches/update_sharing-desktop.page.patch: + - Update to the GNOME 42 version to reflect significant changes to + the gnome-remote-desktop and gnome-control-center packages + (LP: #1968518). + + -- Gunnar Hjalmarsson Tue, 12 Apr 2022 21:48:35 +0200 + +gnome-user-docs (41.5-1ubuntu1) jammy; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - debian/{control*,rules}: + + Split into language specific binary packages. + + Don't install certain files and depend on ubuntu-docs. + - debian/rules: + + Install dir: debian/tmp instead of debian/gnome-user-docs + + Don't strip translated pages. + + Don't run dh_translations. + - debian/control*: + + Modify VCS info for Ubuntu + - debian/gbp.conf: + + Set debian-branch ubuntu/master + + -- Gunnar Hjalmarsson Wed, 23 Mar 2022 18:32:46 +0100 + gnome-user-docs (41.5-1) unstable; urgency=medium * New upstream release -- Jeremy Bicha Mon, 21 Mar 2022 09:31:43 -0400 +gnome-user-docs (41.2-1ubuntu1) jammy; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - debian/{control*,rules}: + + Split into language specific binary packages. + + Don't install certain files and depend on ubuntu-docs. + - debian/rules: + + Install dir: debian/tmp instead of debian/gnome-user-docs + + Don't strip translated pages. + + Don't run dh_translations. + - debian/control*: + + Modify VCS info for Ubuntu + - debian/gbp.conf: + + Set debian-branch ubuntu/master + + -- Gunnar Hjalmarsson Sun, 13 Feb 2022 11:57:30 +0100 + gnome-user-docs (41.2-1) unstable; urgency=medium [ Gunnar Hjalmarsson ] @@ -24,18 +85,71 @@ gnome-user-docs (41.2-1) unstable; urgen -- Gunnar Hjalmarsson Sun, 13 Feb 2022 00:11:35 +0100 +gnome-user-docs (41.1-1ubuntu1) jammy; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - debian/{control*,rules,gnome-user-docs.install}: + + Split into language specific binary 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/control*: + + Modify VCS info for Ubuntu + - debian/gbp.conf: + + Set debian-branch ubuntu/master + * debian/rules: + - New language in gnome-help: Korean + + -- Gunnar Hjalmarsson Sun, 05 Dec 2021 15:48:54 +0100 + gnome-user-docs (41.1-1) unstable; urgency=medium * New upstream release -- Jeremy Bicha Sat, 04 Dec 2021 19:30:04 -0500 +gnome-user-docs (41.0-1ubuntu1) jammy; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - debian/{control*,rules,gnome-user-docs.install}: + + Split into language specific binary 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/control*: + + Modify VCS info for Ubuntu + - debian/gbp.conf: + + Set debian-branch ubuntu/master + + -- Gunnar Hjalmarsson Sun, 21 Nov 2021 11:04:43 +0100 + gnome-user-docs (41.0-1) unstable; urgency=medium * New upstream release -- Jeremy Bicha Sat, 18 Sep 2021 19:32:06 -0400 +gnome-user-docs (40.5-1ubuntu1) impish; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - debian/{control*,rules,gnome-user-docs.install}: + + Split into language specific binary 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/control*: + + Modify VCS info for Ubuntu + - debian/gbp.conf: + + Set debian-branch ubuntu/master + + -- Gunnar Hjalmarsson Sat, 25 Sep 2021 19:23:18 +0200 + gnome-user-docs (40.5-1) unstable; urgency=medium * New upstream release @@ -44,6 +158,26 @@ gnome-user-docs (40.5-1) unstable; urgen -- Jeremy Bicha Sat, 18 Sep 2021 18:58:02 -0400 +gnome-user-docs (40.4-1ubuntu1) impish; urgency=medium + + * Merge from Debian unstable (LP: #1667894, LP: #1928017). Remaining + changes: + - debian/{control*,rules,gnome-user-docs.install}: + + Split into language specific binary 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/control*: + + Modify VCS info for Ubuntu + - debian/gbp.conf: + + Set debian-branch ubuntu/master + * debian/control*: Modify VCS info + * debian/gbp.conf: Modify debian-branch + + -- Gunnar Hjalmarsson Sun, 15 Aug 2021 20:00:27 +0200 + gnome-user-docs (40.4-1) unstable; urgency=medium * Team upload @@ -55,6 +189,23 @@ gnome-user-docs (40.4-1) unstable; urgen -- Gunnar Hjalmarsson Sun, 15 Aug 2021 17:12:13 +0200 +gnome-user-docs (40.1-1ubuntu1) impish; urgency=medium + + * Merge from Debian experimental. Remaining changes: + - debian/{control*,rules,gnome-user-docs.install}: + + Split into language specific binary 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, debian/control*: + - New languages: Turkish, Ukrainian + * debian/rules: + - Drop dh_missing override; --fail-missing is default in compat 13 + + -- Gunnar Hjalmarsson Thu, 24 Jun 2021 01:52:07 +0200 + gnome-user-docs (40.1-1) experimental; urgency=medium * Team upload @@ -70,6 +221,28 @@ gnome-user-docs (3.38.2-1) unstable; urg -- Laurent Bigonville Mon, 07 Dec 2020 15:25:00 +0100 +gnome-user-docs (3.38.2+git20210212-0ubuntu1) hirsute; urgency=medium + + * New upstream git (LP: #1904277, LP: #1915256) + + -- Gunnar Hjalmarsson Mon, 15 Feb 2021 00:57:00 +0100 + +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 Wed, 07 Oct 2020 15:03:58 +0200 + gnome-user-docs (3.38.1-1) unstable; urgency=medium * Team upload @@ -78,12 +251,32 @@ gnome-user-docs (3.38.1-1) unstable; urg -- Gunnar Hjalmarsson 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 Fri, 25 Sep 2020 19:07:00 +0200 + gnome-user-docs (3.38.0-1) unstable; urgency=medium * New upstream release -- Gunnar Hjalmarsson 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 Wed, 09 Sep 2020 09:22:26 +0200 + gnome-user-docs (3.36.2-1) unstable; urgency=medium * New upstream release @@ -97,6 +290,38 @@ gnome-user-docs (3.36.1-1) unstable; urg -- Jeremy Bicha 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 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 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 Tue, 17 Mar 2020 22:27:00 +0100 + gnome-user-docs (3.36.0-1) unstable; urgency=medium * New upstream release @@ -116,6 +341,26 @@ gnome-user-docs (3.34.1-1) unstable; urg -- Jeremy Bicha Sat, 01 Feb 2020 21:09:01 -0500 +gnome-user-docs (3.35.92-0ubuntu1) focal; urgency=medium + + * New upstream release + + -- Gunnar Hjalmarsson 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 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 @@ -133,23 +378,47 @@ gnome-user-docs (3.34.0-1) experimental; -- Gunnar Hjalmarsson 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 Tue, 12 Mar 2019 20:26:07 -0400 + -- Gunnar Hjalmarsson 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 Sun, 25 Nov 2018 15:39:15 -0500 + -- Gunnar Hjalmarsson 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 Fri, 05 Oct 2018 14:37:11 -0400 + -- Gunnar Hjalmarsson 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 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 Tue, 11 Sep 2018 16:30:54 +0200 gnome-user-docs (3.30.0-1) unstable; urgency=medium @@ -158,6 +427,12 @@ gnome-user-docs (3.30.0-1) unstable; urg -- Jeremy Bicha 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 Sun, 15 Apr 2018 23:46:00 +0200 + gnome-user-docs (3.28.2-1) unstable; urgency=medium * New upstream release @@ -171,6 +446,25 @@ gnome-user-docs (3.28.1-1) unstable; urg -- Jeremy Bicha 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 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 Sun, 01 Apr 2018 23:25:00 +0200 + gnome-user-docs (3.28.0-1) unstable; urgency=medium * New upstream release @@ -179,6 +473,32 @@ gnome-user-docs (3.28.0-1) unstable; urg -- Jeremy Bicha 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:"' to the format + 'href="apt:"'. + - Include such links also on the HTML version of the pages. + + -- Gunnar Hjalmarsson 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 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 Sat, 17 Mar 2018 16:59:00 +0100 + gnome-user-docs (3.26.2.1-1) unstable; urgency=medium * New usptream release @@ -188,6 +508,14 @@ gnome-user-docs (3.26.2.1-1) unstable; u -- Jeremy Bicha 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 Wed, 06 Dec 2017 20:49:00 +0100 + gnome-user-docs (3.26.2-1) unstable; urgency=medium * New upstream release @@ -200,6 +528,12 @@ gnome-user-docs (3.26.1.1-1) unstable; u -- Jeremy Bicha Wed, 18 Oct 2017 13:38:39 -0400 +gnome-user-docs (3.26.1-0ubuntu1) artful; urgency=medium + + * New upstream release + + -- Gunnar Hjalmarsson Thu, 12 Oct 2017 14:59:00 +0200 + gnome-user-docs (3.26.0.1-1) unstable; urgency=medium * New upstream release @@ -208,12 +542,29 @@ gnome-user-docs (3.26.0.1-1) unstable; u -- Jeremy Bicha Sun, 01 Oct 2017 18:15:17 -0400 +gnome-user-docs (3.26.0.1-0ubuntu1) artful; urgency=medium + + * New upstream release + + -- Gunnar Hjalmarsson Thu, 28 Sep 2017 00:13:00 +0200 + gnome-user-docs (3.26.0-1) unstable; urgency=medium * New upstream release -- Jeremy Bicha 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 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 @@ -228,6 +579,38 @@ gnome-user-docs (3.25.90-1) unstable; ur -- Jeremy Bicha 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 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 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 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 Tue, 11 Apr 2017 13:35:59 -0400 + gnome-user-docs (3.22.0-1) unstable; urgency=medium * New upstream release. diff -pruN 42.0-1/debian/control 42.0-1ubuntu1/debian/control --- 42.0-1/debian/control 2022-03-21 13:44:05.000000000 +0000 +++ 42.0-1ubuntu1/debian/control 2022-04-28 22:24:59.000000000 +0000 @@ -5,22 +5,416 @@ Source: gnome-user-docs Section: doc Priority: optional -Maintainer: Debian GNOME Maintainers -Uploaders: Gunnar Hjalmarsson , Jeremy Bicha , Laurent Bigonville +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: Gunnar Hjalmarsson , Jeremy Bicha , Laurent Bigonville , Michael Biebl , Tim Lunn Build-Depends: debhelper-compat (= 13), dh-sequence-gnome Build-Depends-Indep: yelp-tools, pkg-config Standards-Version: 4.6.0 Rules-Requires-Root: no -Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-user-docs -Vcs-Git: https://salsa.debian.org/gnome-team/gnome-user-docs.git +XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-user-docs +XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-user-docs.git +Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-user-docs/-/tree/ubuntu/master +Vcs-Git: https://salsa.debian.org/gnome-team/gnome-user-docs.git -b ubuntu/master Homepage: https://help.gnome.org/users/ Package: gnome-user-docs Architecture: all Depends: ${misc:Depends}, + ubuntu-docs, yelp Description: GNOME Help Documentation for using the GNOME desktop environment and its components. It covers usage and setup of the core GNOME programs. + +Package: gnome-user-docs-as +Architecture: all +Depends: ${misc:Depends}, + gnome-user-docs (= ${binary:Version}) +Description: GNOME Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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-tr +Architecture: all +Depends: ${misc:Depends}, + gnome-user-docs (= ${binary:Version}) +Description: GNOME Help (Turkish) + 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 Turkish. + +Package: gnome-user-docs-uk +Architecture: all +Depends: ${misc:Depends}, + gnome-user-docs (= ${binary:Version}) +Description: GNOME Help (Ukrainian) + 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 Ukrainian. + +Package: gnome-user-docs-vi +Architecture: all +Depends: ${misc:Depends}, + gnome-user-docs (= ${binary:Version}) +Description: GNOME Help (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 Help (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 42.0-1/debian/control.in 42.0-1ubuntu1/debian/control.in --- 42.0-1/debian/control.in 2022-03-21 13:44:05.000000000 +0000 +++ 42.0-1ubuntu1/debian/control.in 2022-04-28 20:58:57.000000000 +0000 @@ -1,7 +1,8 @@ Source: gnome-user-docs Section: doc Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Build-Depends: debhelper-compat (= 13), dh-sequence-gnome @@ -9,14 +10,407 @@ Build-Depends-Indep: yelp-tools, pkg-config Standards-Version: 4.6.0 Rules-Requires-Root: no -Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-user-docs -Vcs-Git: https://salsa.debian.org/gnome-team/gnome-user-docs.git +XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-user-docs +XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-user-docs.git +Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-user-docs/-/tree/ubuntu/master +Vcs-Git: https://salsa.debian.org/gnome-team/gnome-user-docs.git -b ubuntu/master Homepage: https://help.gnome.org/users/ Package: gnome-user-docs Architecture: all Depends: ${misc:Depends}, + ubuntu-docs, yelp Description: GNOME Help Documentation for using the GNOME desktop environment and its components. It covers usage and setup of the core GNOME programs. + +Package: gnome-user-docs-as +Architecture: all +Depends: ${misc:Depends}, + gnome-user-docs (= ${binary:Version}) +Description: GNOME Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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 Help (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-tr +Architecture: all +Depends: ${misc:Depends}, + gnome-user-docs (= ${binary:Version}) +Description: GNOME Help (Turkish) + 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 Turkish. + +Package: gnome-user-docs-uk +Architecture: all +Depends: ${misc:Depends}, + gnome-user-docs (= ${binary:Version}) +Description: GNOME Help (Ukrainian) + 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 Ukrainian. + +Package: gnome-user-docs-vi +Architecture: all +Depends: ${misc:Depends}, + gnome-user-docs (= ${binary:Version}) +Description: GNOME Help (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 Help (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 42.0-1/debian/gbp.conf 42.0-1ubuntu1/debian/gbp.conf --- 42.0-1/debian/gbp.conf 2022-03-21 13:44:05.000000000 +0000 +++ 42.0-1ubuntu1/debian/gbp.conf 2022-04-28 20:58:57.000000000 +0000 @@ -1,6 +1,6 @@ [DEFAULT] pristine-tar = True -debian-branch = debian/master +debian-branch = ubuntu/master upstream-branch = upstream/latest [buildpackage] diff -pruN 42.0-1/debian/patches/series 42.0-1ubuntu1/debian/patches/series --- 42.0-1/debian/patches/series 2022-03-21 13:44:05.000000000 +0000 +++ 42.0-1ubuntu1/debian/patches/series 2022-04-28 20:58:57.000000000 +0000 @@ -1 +1,2 @@ drop-experimental-style-for-prefs.page.patch +update_sharing-desktop.page.patch diff -pruN 42.0-1/debian/patches/update_sharing-desktop.page.patch 42.0-1ubuntu1/debian/patches/update_sharing-desktop.page.patch --- 42.0-1/debian/patches/update_sharing-desktop.page.patch 1970-01-01 00:00:00.000000000 +0000 +++ 42.0-1ubuntu1/debian/patches/update_sharing-desktop.page.patch 2022-04-28 21:53:33.000000000 +0000 @@ -0,0 +1,291 @@ +From: Gunnar Hjalmarsson +Subject: Update sharing-desktop.page + +This updates sharing-desktop.page to the GNOME 42 version. It's a +concatenation of the upstream commits b02a44c6, 2bd801c8 and 711735f5, +where 2bd801c8 is the one with the significant changes. + +The background is that we ship version 42 of the gnome-remote-desktop +package and that gnome-control-center has been patched with related +changes due to the remote desktop support being moved from VNC to RDP. + +The changes to sharing-desktop.page are not accompanied by translations, +so they will be shown untranslated in Ubuntu 22.04 for all languages. +Please see the Ubuntu bug for the justification. + +Origin: https://gitlab.gnome.org/GNOME/gnome-user-docs/-/commit/2bd801c8 +Bug: https://gitlab.gnome.org/GNOME/gnome-user-docs/-/issues/135 +Bug-Ubuntu: https://launchpad.net/bugs/1968518 +--- + +--- a/gnome-help/C/sharing-desktop.page ++++ b/gnome-help/C/sharing-desktop.page +@@ -1,4 +1,6 @@ + +@@ -7,10 +9,8 @@ + + + +- +- +- + ++ + + + Ekaterina Gerasimova +@@ -31,29 +31,28 @@ + + Share your desktop + +- +- David King +-

The controls for sharing with specific networks, under the Networks +- section needs to be explained, perhaps as a separate page.

+- +- +- Michael Hill +-

Networks section added without explanatory details.

+- + + Andre Klapper +

GNOME 42 moved from VNC to RDP in https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/1205

+

TODO: See also https://gitlab.gnome.org/GNOME/gnome-user-docs/-/issues/135

+ ++ ++ Michael Hill ++

Referencing Pascal Nowack's comments on #135 (above) and the RDP setup ++ guide, https://gitlab.gnome.org/-/snippets/1778, particularly his comment of ++ 2022-02-26.

++

TODO: Add Connections, the GNOME client, to the Connecting: Linux ++ section when it's ready for RDP.

++ + +

You can let other people view and control your desktop from another +- computer with a desktop viewing application. Configure Screen +- Sharing to allow others to access your desktop and set the security ++ computer with a desktop viewing application. Configure Remote ++ Desktop to allow others to access your desktop and set the security + preferences.

+ + +

You must have the GNOME Remote Desktop package installed for +- Screen Sharing to be visible.

++ Remote Desktop to be visible.

+ + + +@@ -60,66 +64,60 @@ + + +

Open the Activities +- overview and start typing Settings.

++ overview and start typing Sharing.

+ + +-

Click on Settings.

+- +- +-

Click on Sharing in the sidebar to open the panel.

++

Click on Sharing to open the panel.

+ + +

If the Sharing switch in the top-right of the window is set +- to off, switch it to on.

++ to off, click to switch it on.

+ +

If the text below Computer Name allows + you to edit it, you can change + the name your computer displays on the network.

 + + +-

Select Screen Sharing.

++

Click Remote Desktop.

+ + +-

To let others view your desktop, switch the Screen Sharing ++

To let others view your desktop, set the Remote Desktop + switch to on. This means that other people will be able to attempt to + connect to your computer and view what’s on your screen.

+ + +-

To let others interact with your desktop, ensure that Allow +- connections to control the screen is checked. This may allow the +- other person to move your mouse, run applications, and browse files on +- your computer, depending on the security settings which you are currently +- using.

++

To let others interact with your desktop, set the ++ Remote Control switch to on. This may allow the other person to ++ move your mouse, run applications, and browse files on your computer, ++ depending on the security settings which you are currently using.

+ + + +
+ Security + +-

It is important that you consider the full extent of what each security +- option means before changing it.

+- ++

The Authentication section displays the login credentials to be ++ used in the client software on the connecting device.

+ + +- New connections must ask for access +-

If you want to be able to choose whether to allow someone to access +- your desktop, enable New connections must ask for access. If +- you disable this option, you will not be asked whether you want to allow +- someone to connect to your computer.

+- +-

This option is enabled by default.

+- ++ User Name ++

Use the suggested value or enter your own.

+ + +- Require a Password +-

To require other people to use a password when connecting to your +- desktop, enable Require a Password. If you do not use this +- option, anyone can attempt to view your desktop.

+- +-

This option is disabled by default, but you should enable it and set +- a secure password.

+- ++ Password ++

Use the suggested value or enter your own.

++ ++

Click the button next to each entry if you want to place it in the ++ clipboard.

++ ++ ++ ++ Verify Encryption ++

Click the Verify Encryption button to display the ++ encryption fingerprint. Compare it with the value displayed by the client ++ when connecting: they should be identical.

+ ++ + ++ + +
+ +-
+- Networks ++
++ Connecting ++ ++

The How to Connect section displays the ++ Device Name and Remote Desktop Address that can be used ++ on the connecting computer. Click the button next to each entry if you want to ++ place it in the clipboard. A connection can also be made using your ++ IP address.

++

When the other computer is successfully connected to your desktop, you ++ will see the Screen is being shared icon, ++ ++ in your system status area.

++
++ ++
++ Clients + +-

The Networks section lists the networks to which you are +- currently connected. Use the switch next to each to choose where your +- desktop can be shared.

++

To connect to your desktop from another computer, the following clients are ++ known to work.

++ ++ ++ From Linux: ++ ++

Remmina, a GTK client, is available as a package in ++ most distributions, and also as a ++ flatpak. ++ Use default settings, particularly Color depth 'Automatic' ++ in the connection profile settings.

++ ++

xfreerdp is a command line client available as a ++ package in most distributions. The option /network:auto ++ should be passed to the client on the command line.

++ ++ ++ ++ ++ From Microsoft Windows: ++ ++

mstsc is the built-in Windows client. Default ++ settings are recommended.

++ ++ ++ ++ ++ From Linux, Windows, or macOS: ++ ++

Thincast is a proprietary client. The Linux version ++ is available as a flatpak. ++ Default settings are recommended.

++ ++ ++ ++ +
+ +
+@@ -151,25 +197,36 @@ + + + +-

Open the Activities +- overview and start typing Settings.

++

Click the system menu on the right side of the top bar.

+ + +-

Click on Settings.

++

Click Screen is being shared.

+ + +-

Click on Sharing in the sidebar to open the panel.

++

Click Turn off.

+ ++ ++ ++
++ ++
++ Advanced Topics ++ ++ + +-

Screen Sharing will show as Active. Click on +- it.

++ Command line configuration ++

The grdctl utility allows you to configure your host ++ settings in a console window. For usage details, type ++ grdctl --help.

+ + +-

Toggle the switch at the top to off.

++ H.264 ++

H.264 video encoding heavily reduces bandwidth. ++ GNOME Remote Desktop will use H.264 when: the graphics pipeline ++ is used (a requirement of the protocol), the client supports it, and ++ NVENC (NVIDIA's encoder) is available.

+ +- +- ++ +
+ +- + diff -pruN 42.0-1/debian/rules 42.0-1ubuntu1/debian/rules --- 42.0-1/debian/rules 2022-03-21 13:44:05.000000000 +0000 +++ 42.0-1ubuntu1/debian/rules 2022-04-28 20:58:57.000000000 +0000 @@ -1,11 +1,43 @@ #!/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 ko lv lt mr nl pa pl pt pt_BR ro ru sl sr sr@latin sv te tr uk vi ta zh_CN + execute_before_dh_install: # modify install links (https://bugs.debian.org/938994) - for d in $(CURDIR)/debian/gnome-user-docs/usr/share/help/*/gnome-help; do \ + 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 + 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 + +override_dh_translations: