diff -pruN 3.38.0-1/debian/changelog 3.38.0-1ubuntu1/debian/changelog
--- 3.38.0-1/debian/changelog	2020-09-14 10:07:30.000000000 +0000
+++ 3.38.0-1ubuntu1/debian/changelog	2020-09-17 13:12:20.000000000 +0000
@@ -1,3 +1,16 @@
+gsettings-desktop-schemas (3.38.0-1ubuntu1) groovy; urgency=medium
+
+   * Merge with debian, remaining changes:
+    - Add patches to revert dropped settings still used by Unity:
+      + git_revert_background_key_removal.patch
+      + git_revert_menu_icon_key_removal.patch
+      + git_revert_notifications_key_removal.patch
+      + git_revert_scroll_method_removal.patch
+    - Add key for lock on suspend:
+      + ubuntu_lock-on-suspend.patch
+
+ -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Thu, 17 Sep 2020 15:12:20 +0200
+
 gsettings-desktop-schemas (3.38.0-1) experimental; urgency=medium
 
   * Team upload
@@ -22,6 +35,20 @@ gsettings-desktop-schemas (3.38.0-1) exp
 
  -- Simon McVittie <smcv@debian.org>  Mon, 14 Sep 2020 11:07:30 +0100
 
+gsettings-desktop-schemas (3.37.2-1ubuntu1) groovy; urgency=medium
+
+  * Merge with debian, remaining changes:
+    - Add patches to revert dropped settings still used by Unity:
+      + git_revert_background_key_removal.patch
+      + git_revert_menu_icon_key_removal.patch
+      + git_revert_notifications_key_removal.patch
+      + git_revert_scroll_method_removal.patch
+    - Add key for lock on suspend:
+      + ubuntu_lock-on-suspend.patch
+  * debian/patches: Refreshed
+
+ -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Wed, 26 Aug 2020 14:23:03 +0200
+
 gsettings-desktop-schemas (3.37.2-1) experimental; urgency=medium
 
   * New upstream release:
@@ -34,6 +61,19 @@ gsettings-desktop-schemas (3.37.2-1) exp
 
  -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Wed, 26 Aug 2020 14:19:28 +0200
 
+gsettings-desktop-schemas (3.37.1-1ubuntu1) groovy; urgency=medium
+
+  * Merge with debian, remaining changes:
+    - Add patches to revert dropped settings still used by Unity:
+      + git_revert_background_key_removal.patch
+      + git_revert_menu_icon_key_removal.patch
+      + git_revert_notifications_key_removal.patch
+      + git_revert_scroll_method_removal.patch
+    - Add key for lock on suspend:
+      + ubuntu_lock-on-suspend.patch
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Fri, 07 Aug 2020 16:23:50 +0200
+
 gsettings-desktop-schemas (3.37.1-1) experimental; urgency=medium
 
   * New upstream release
@@ -59,6 +99,12 @@ gsettings-desktop-schemas (3.35.91-1) ex
 
  -- Iain Lane <laney@debian.org>  Thu, 27 Feb 2020 11:21:38 +0000
 
+gsettings-desktop-schemas (3.35.91-0ubuntu1) focal; urgency=medium
+
+  * New upstream release
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Thu, 20 Feb 2020 09:18:15 +1300
+
 gsettings-desktop-schemas (3.34.0-2) unstable; urgency=medium
 
   * Team upload.
@@ -66,6 +112,19 @@ gsettings-desktop-schemas (3.34.0-2) uns
 
  -- Andreas Henriksson <andreas@fatal.se>  Mon, 30 Sep 2019 13:08:27 +0200
 
+gsettings-desktop-schemas (3.34.0-1ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian. Remaining changes:
+    - Add patches to revert dropped settings still used by Unity:
+      + git_revert_background_key_removal.patch
+      + git_revert_notifications_key_removal.patch
+      + git_revert_menu_icon_key_removal.patch
+      + legacy-scroll-key.patch
+    - Add ubuntu_lock-on-suspend.patch:
+      + Add key for lock on suspend
+
+ -- Iain Lane <iain.lane@canonical.com>  Tue, 10 Sep 2019 14:18:03 +0100
+
 gsettings-desktop-schemas (3.34.0-1) experimental; urgency=medium
 
   * Team upload
@@ -81,6 +140,19 @@ gsettings-desktop-schemas (3.33.90-1) ex
 
  -- Tim Lunn <tim@feathertop.org>  Tue, 13 Aug 2019 22:15:09 +1000
 
+gsettings-desktop-schemas (3.33.1-1ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian. Remaining changes:
+    - Add patches to revert dropped settings still used by Unity:
+      + git_revert_background_key_removal.patch
+      + git_revert_notifications_key_removal.patch
+      + git_revert_menu_icon_key_removal.patch
+      + legacy-scroll-key.patch
+    - Add ubuntu_lock-on-suspend.patch:
+      + Add key for lock on suspend
+
+ -- Iain Lane <iain.lane@canonical.com>  Thu, 18 Jul 2019 17:13:24 +0100
+
 gsettings-desktop-schemas (3.33.1-1) experimental; urgency=medium
 
   * New upstream release
@@ -98,6 +170,19 @@ gsettings-desktop-schemas (3.32.0-1) exp
 
  -- Iain Lane <laney@debian.org>  Wed, 13 Mar 2019 09:47:21 +0000
 
+gsettings-desktop-schemas (3.31.91-1ubuntu1) disco; urgency=medium
+
+  * Sync with Debian. Remaining changes:
+    - Add patches to revert dropped settings still used by Unity:
+      + git_revert_background_key_removal.patch
+      + git_revert_notifications_key_removal.patch
+      + git_revert_menu_icon_key_removal.patch
+      + legacy-scroll-key.patch
+    - Add ubuntu_lock-on-suspend.patch:
+      + Add key for lock on suspend
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Wed, 06 Mar 2019 02:25:58 -0500
+
 gsettings-desktop-schemas (3.31.91-1) experimental; urgency=medium
 
   * New upstream release
@@ -112,6 +197,34 @@ gsettings-desktop-schemas (3.31.91-1) ex
 
  -- Jeremy Bicha <jbicha@debian.org>  Wed, 06 Mar 2019 02:13:02 -0500
 
+gsettings-desktop-schemas (3.31.0.2-2ubuntu3) disco; urgency=medium
+
+  * Add Restore-peripherals-display-keys.patch:
+    - Add 2 dummy keys for renamed gsettings keys to give us more
+      time to fix their users (LP: #1812143)
+  * Revert "Add Breaks: mutter << 3.31.4"
+
+ -- Jeremy Bicha <jbicha@debian.org>  Thu, 24 Jan 2019 12:43:44 -0500
+
+gsettings-desktop-schemas (3.31.0.2-2ubuntu2) disco; urgency=medium
+
+  * Add Breaks: mutter << 3.31.4 (LP: #1812143)
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Tue, 22 Jan 2019 11:57:32 -0500
+
+gsettings-desktop-schemas (3.31.0.2-2ubuntu1) disco; urgency=medium
+
+  * Sync with Debian. Remaining changes:
+    - Add patches to revert dropped settings still used by Unity:
+      + git_revert_background_key_removal.patch
+      + git_revert_notifications_key_removal.patch
+      + git_revert_menu_icon_key_removal.patch
+      + legacy-scroll-key.patch
+    - Add ubuntu_lock-on-suspend.patch:
+      + Add key for lock on suspend
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Wed, 16 Jan 2019 11:59:14 -0500
+
 gsettings-desktop-schemas (3.31.0.2-2) experimental; urgency=medium
 
   * Update meson-Use-configure_file-to-create-pkgconfig.patch:
@@ -132,6 +245,22 @@ gsettings-desktop-schemas (3.31.0.2-1) e
 
  -- Jeremy Bicha <jbicha@debian.org>  Wed, 16 Jan 2019 06:49:18 -0500
 
+gsettings-desktop-schemas (3.28.1-1ubuntu1) cosmic; urgency=medium
+
+  * Sync with Debian. Remaining changes:
+    - Add git_revert_background_key_removal.patch:
+      + Don't remove background key.
+    - Add git_revert_notifications_key_removal.patch:
+      + Don't drop this, it's still used by u-c-c.
+    - Add git_revert_menu_icon_key_removal.patch:
+      + These are still needed in 3.8.
+    - Add ubuntu_lock-on-suspend.patch:
+      + Add key for lock on suspend.
+    - Add legacy-scroll-key.patch:
+      + Keep old scroll method key
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Sat, 22 Sep 2018 21:19:25 -0400
+
 gsettings-desktop-schemas (3.28.1-1) unstable; urgency=medium
 
   * New upstream release
@@ -139,6 +268,22 @@ gsettings-desktop-schemas (3.28.1-1) uns
 
  -- Jeremy Bicha <jbicha@debian.org>  Sat, 22 Sep 2018 21:07:57 -0400
 
+gsettings-desktop-schemas (3.28.0-1ubuntu1) bionic; urgency=medium
+
+  * Sync with Debian. Remaining changes:
+    - Add git_revert_background_key_removal.patch:
+      + Don't remove background key.
+    - Add git_revert_notifications_key_removal.patch:
+      + Don't drop this, it's still used by u-c-c.
+    - Add git_revert_menu_icon_key_removal.patch:
+      + These are still needed in 3.8.
+    - Add ubuntu_lock-on-suspend.patch:
+      + Add key for lock on suspend.
+    - Add legacy-scroll-key.patch:
+      + Keep old scroll method key
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Fri, 13 Apr 2018 14:37:59 -0400
+
 gsettings-desktop-schemas (3.28.0-1) unstable; urgency=medium
 
   * New upstream release
@@ -151,6 +296,22 @@ gsettings-desktop-schemas (3.27.92-1) un
 
  -- Tim Lunn <tim@feathertop.org>  Wed, 07 Mar 2018 20:27:27 +1100
 
+gsettings-desktop-schemas (3.27.90-1ubuntu1) bionic; urgency=medium
+
+  * Sync with Debian. Remaining changes:
+    - Add git_revert_background_key_removal.patch:
+      + Don't remove background key.
+    - Add git_revert_notifications_key_removal.patch:
+      + Don't drop this, it's still used by u-c-c.
+    - Add git_revert_menu_icon_key_removal.patch:
+      + These are still needed in 3.8.
+    - Add ubuntu_lock-on-suspend.patch:
+      + Add key for lock on suspend.
+    - Add legacy-scroll-key.patch:
+      + Keep old scroll method key
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Tue, 13 Feb 2018 10:43:18 -0500
+
 gsettings-desktop-schemas (3.27.90-1) unstable; urgency=medium
 
   * New upstream release
diff -pruN 3.38.0-1/debian/control 3.38.0-1ubuntu1/debian/control
--- 3.38.0-1/debian/control	2020-09-14 10:07:30.000000000 +0000
+++ 3.38.0-1ubuntu1/debian/control	2020-09-17 13:12:20.000000000 +0000
@@ -5,7 +5,8 @@
 Source: gsettings-desktop-schemas
 Section: gnome
 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: Iain Lane <laney@debian.org>, Jeremy Bicha <jbicha@debian.org>, Laurent Bigonville <bigon@debian.org>, Tim Lunn <tim@feathertop.org>
 Build-depends: debhelper-compat (= 13),
                dh-sequence-gir,
@@ -14,8 +15,10 @@ Build-depends: debhelper-compat (= 13),
                libgirepository1.0-dev (>= 1.31.0),
                meson (>= 0.50.0)
 Standards-Version: 4.5.0
-Vcs-Browser: https://salsa.debian.org/gnome-team/gsettings-desktop-schemas
-Vcs-Git: https://salsa.debian.org/gnome-team/gsettings-desktop-schemas.git
+XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gsettings-desktop-schemas.git
+XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gsettings-desktop-schemas
+Vcs-Git: https://salsa.debian.org/gnome-team/gsettings-desktop-schemas.git -b ubuntu/master
+Vcs-Browser: https://salsa.debian.org/gnome-team/gsettings-desktop-schemas/tree/ubuntu/master
 Homepage: https://www.gnome.org/
 
 Package: gsettings-desktop-schemas
diff -pruN 3.38.0-1/debian/control.in 3.38.0-1ubuntu1/debian/control.in
--- 3.38.0-1/debian/control.in	2020-09-14 10:07:30.000000000 +0000
+++ 3.38.0-1ubuntu1/debian/control.in	2020-09-17 13:12:20.000000000 +0000
@@ -1,7 +1,8 @@
 Source: gsettings-desktop-schemas
 Section: gnome
 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-gir,
@@ -10,8 +11,10 @@ Build-depends: debhelper-compat (= 13),
                libgirepository1.0-dev (>= 1.31.0),
                meson (>= 0.50.0)
 Standards-Version: 4.5.0
-Vcs-Browser: https://salsa.debian.org/gnome-team/gsettings-desktop-schemas
-Vcs-Git: https://salsa.debian.org/gnome-team/gsettings-desktop-schemas.git
+XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gsettings-desktop-schemas.git
+XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gsettings-desktop-schemas
+Vcs-Git: https://salsa.debian.org/gnome-team/gsettings-desktop-schemas.git -b ubuntu/master
+Vcs-Browser: https://salsa.debian.org/gnome-team/gsettings-desktop-schemas/tree/ubuntu/master
 Homepage: https://www.gnome.org/
 
 Package: gsettings-desktop-schemas
diff -pruN 3.38.0-1/debian/gbp.conf 3.38.0-1ubuntu1/debian/gbp.conf
--- 3.38.0-1/debian/gbp.conf	2020-09-14 10:07:30.000000000 +0000
+++ 3.38.0-1ubuntu1/debian/gbp.conf	2020-09-17 13:12:20.000000000 +0000
@@ -1,6 +1,7 @@
 [DEFAULT]
 pristine-tar = True
-debian-branch = debian/master
+debian-branch = ubuntu/master
+debian-tag = ubuntu/%(version)s
 upstream-branch = upstream/latest
 upstream-vcs-tag = %(version)s
 
diff -pruN 3.38.0-1/debian/patches/git_revert_background_key_removal.patch 3.38.0-1ubuntu1/debian/patches/git_revert_background_key_removal.patch
--- 3.38.0-1/debian/patches/git_revert_background_key_removal.patch	1970-01-01 00:00:00.000000000 +0000
+++ 3.38.0-1ubuntu1/debian/patches/git_revert_background_key_removal.patch	2020-09-17 13:12:20.000000000 +0000
@@ -0,0 +1,29 @@
+From: Tim Lunn <tim@feathertop.org>
+Date: Wed, 20 Mar 2013 22:51:35 +1100
+Subject: [PATCH] Revert "schemas: Remove unused "draw-background" key"
+
+This reverts commit a59b45e766a2b3732b3bd2473ee5fbe7607a7f75.
+---
+ schemas/org.gnome.desktop.background.gschema.xml.in | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/schemas/org.gnome.desktop.background.gschema.xml.in b/schemas/org.gnome.desktop.background.gschema.xml.in
+index f421b16..60a138f 100644
+--- a/schemas/org.gnome.desktop.background.gschema.xml.in
++++ b/schemas/org.gnome.desktop.background.gschema.xml.in
+@@ -1,6 +1,15 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <schemalist gettext-domain="gsettings-desktop-schemas">
+   <schema id="org.gnome.desktop.background" path="/org/gnome/desktop/background/">
++    <key name="draw-background" type="b">
++      <default>true</default>
++      <summary>Draw Desktop Background</summary>
++      <description>
++        Have GNOME draw the desktop background.
++
++        DEPRECATED: This key is deprecated and ignored.
++      </description>
++    </key>
+     <key name="picture-options" enum="org.gnome.desktop.GDesktopBackgroundStyle">
+       <default>'zoom'</default>
+       <summary>Picture Options</summary>
diff -pruN 3.38.0-1/debian/patches/git_revert_menu_icon_key_removal.patch 3.38.0-1ubuntu1/debian/patches/git_revert_menu_icon_key_removal.patch
--- 3.38.0-1/debian/patches/git_revert_menu_icon_key_removal.patch	1970-01-01 00:00:00.000000000 +0000
+++ 3.38.0-1ubuntu1/debian/patches/git_revert_menu_icon_key_removal.patch	2020-09-17 13:12:20.000000000 +0000
@@ -0,0 +1,95 @@
+From: Tim Lunn <tim@feathertop.org>
+Date: Sat, 28 Sep 2013 06:05:39 +1000
+Subject: [PATCH] Revert "schemas: Remove settings for deprecated
+ gtk-settings"
+
+This reverts commit 7d48c4ed64bb5f42f1a8a781f06f534903e78d70.
+---
+ schemas/gsettings-desktop-schemas.convert          |  4 +++
+ schemas/org.gnome.desktop.interface.gschema.xml.in | 38 ++++++++++++++++++++++
+ 2 files changed, 42 insertions(+)
+
+diff --git a/schemas/gsettings-desktop-schemas.convert b/schemas/gsettings-desktop-schemas.convert
+index 4f06ab7..7a746e0 100644
+--- a/schemas/gsettings-desktop-schemas.convert
++++ b/schemas/gsettings-desktop-schemas.convert
+@@ -34,6 +34,8 @@ enable-animations = /desktop/gnome/interface/enable_animations
+ #menus-have-tearoff = /desktop/gnome/interface/menus_have_tearoff
+ #can-change-accels = /desktop/gnome/interface/can_change_accels
+ #toolbar-style = /desktop/gnome/interface/toolbar_style
++#menus-have-icons = /desktop/gnome/interface/menus_have_icons
++#buttons-have-icons = /desktop/gnome/interface/buttons_have_icons
+ #menubar-detachable = /desktop/gnome/interface/menubar_detachable
+ #toolbar-detachable = /desktop/gnome/interface/toolbar_detachable
+ #toolbar-icons-size = /desktop/gnome/interface/toolbar_icons_size
+@@ -54,6 +56,8 @@ gtk-im-module = /desktop/gnome/interface/gtk-im-module
+ document-font-name = /desktop/gnome/interface/document_font_name
+ monospace-font-name = /desktop/gnome/interface/monospace_font_name
+ menubar-accel = /desktop/gnome/interface/menubar_accel
++show-input-method-menu = /desktop/gnome/interface/show_input_method_menu
++show-unicode-menu = /desktop/gnome/interface/show_unicode_menu
+ cursor-size = /desktop/gnome/peripherals/mouse/cursor_size
+ gtk-color-palette = /desktop/gnome/gtk-color-palette
+ # Disabled as we want users to use the default new theme colors
+diff --git a/schemas/org.gnome.desktop.interface.gschema.xml.in b/schemas/org.gnome.desktop.interface.gschema.xml.in
+index e395325..bd15d14 100644
+--- a/schemas/org.gnome.desktop.interface.gschema.xml.in
++++ b/schemas/org.gnome.desktop.interface.gschema.xml.in
+@@ -39,6 +39,20 @@
+         and “text”.
+       </description>
+     </key>
++    <key name="menus-have-icons" type="b">
++      <default>false</default>
++      <summary>Menus Have Icons</summary>
++      <description>
++        Whether menus may display an icon next to a menu entry.
++      </description>
++    </key>
++    <key name="buttons-have-icons" type="b">
++      <default>false</default>
++      <summary>Buttons Have Icons</summary>
++      <description>
++        Whether buttons may display an icon in addition to the button text.
++      </description>
++    </key>
+     <key name="menubar-detachable" type="b">
+       <default>false</default>
+       <summary>Menubar Detachable</summary>
+@@ -177,6 +191,22 @@
+         Keyboard shortcut to open the menu bars.
+       </description>
+     </key>
++    <key name="show-input-method-menu" type="b">
++      <default>true</default>
++      <summary>Show the 'Input Methods' menu</summary>
++      <description>
++        Whether the context menus of entries and text views should offer to
++        change the input method.
++      </description>
++    </key>
++    <key name="show-unicode-menu" type="b">
++      <default>true</default>
++      <summary>Show the 'Unicode Control Character' menu</summary>
++      <description>
++        Whether the context menus of entries and text views should offer to
++        insert control characters.
++      </description>
++    </key>
+     <key name="cursor-theme" type="s">
+       <default>'Adwaita'</default>
+       <summary>Cursor theme</summary>
+@@ -273,5 +303,13 @@
+         If true, pressing a key will highlight the current pointer location on screen.
+       </description>
+     </key>
++    <key name="automatic-mnemonics" type="b">
++      <default>true</default>
++      <summary>Only show mnemonics on when the Alt key is pressed</summary>
++      <description>
++        Whether mnemonics should be automatically shown and hidden when the user
++        presses the Alt key.
++      </description>
++    </key>
+   </schema>
+ </schemalist>
diff -pruN 3.38.0-1/debian/patches/git_revert_notifications_key_removal.patch 3.38.0-1ubuntu1/debian/patches/git_revert_notifications_key_removal.patch
--- 3.38.0-1/debian/patches/git_revert_notifications_key_removal.patch	1970-01-01 00:00:00.000000000 +0000
+++ 3.38.0-1ubuntu1/debian/patches/git_revert_notifications_key_removal.patch	2020-09-17 13:12:20.000000000 +0000
@@ -0,0 +1,33 @@
+From: Giovanni Campagna <gcampagna@src.gnome.org>
+Date: Thu, 31 Jan 2013 12:43:50 +0000
+Subject: Remove a deprecated key
+
+This key has been around for little enough that it is probably safe
+to remove, and removing it reduces confusion in users and developers.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=692944
+---
+ schemas/org.gnome.desktop.screensaver.gschema.xml.in | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/schemas/org.gnome.desktop.screensaver.gschema.xml.in b/schemas/org.gnome.desktop.screensaver.gschema.xml.in
+index 5c2db2a..b43377e 100644
+--- a/schemas/org.gnome.desktop.screensaver.gschema.xml.in
++++ b/schemas/org.gnome.desktop.screensaver.gschema.xml.in
+@@ -21,6 +21,16 @@
+       <summary>Time before locking</summary>
+       <description>The number of seconds after screensaver activation before locking the screen.</description>
+     </key>
++    <key name="show-notifications" type="b">
++      <default>false</default>
++      <summary>Show notifications in the lock screen</summary>
++      <description>
++        Whether notifications are shown in the lock screen or not. This only affects the standard experience.
++
++        DEPRECATED: This key is deprecated and ignored.
++        It has been superseded by org.gnome.desktop.notifications show-in-lock-screen.
++      </description>
++    </key>
+     <key name="show-full-name-in-top-bar" type="b">
+       <default>true</default>
+       <summary>Show full name in the lock screen</summary>
diff -pruN 3.38.0-1/debian/patches/git_revert_scroll_method_removal.patch 3.38.0-1ubuntu1/debian/patches/git_revert_scroll_method_removal.patch
--- 3.38.0-1/debian/patches/git_revert_scroll_method_removal.patch	1970-01-01 00:00:00.000000000 +0000
+++ 3.38.0-1ubuntu1/debian/patches/git_revert_scroll_method_removal.patch	2020-09-17 13:12:20.000000000 +0000
@@ -0,0 +1,43 @@
+From: Robert Ancell <robert.ancell@canonical.com>
+Date: Wed, 18 May 2016 13:38:59 +1200
+Subject: Restore scroll-method key until Unity is ported to not need it
+
+---
+ headers/gdesktop-enums.h                             | 7 +++++++
+ schemas/org.gnome.desktop.peripherals.gschema.xml.in | 5 +++++
+ 2 files changed, 12 insertions(+)
+
+diff --git a/headers/gdesktop-enums.h b/headers/gdesktop-enums.h
+index 2ab6643..260bb79 100644
+--- a/headers/gdesktop-enums.h
++++ b/headers/gdesktop-enums.h
+@@ -162,6 +162,13 @@ typedef enum
+     G_DESKTOP_LOCATION_ACCURACY_LEVEL_EXACT
+ } GDesktopLocationAccuracyLevel;
+ 
++typedef enum
++{
++  G_DESKTOP_TOUCHPAD_SCROLL_METHOD_DISABLED,
++  G_DESKTOP_TOUCHPAD_SCROLL_METHOD_EDGE_SCROLLING,
++  G_DESKTOP_TOUCHPAD_SCROLL_METHOD_TWO_FINGER_SCROLLING
++} GDesktopTouchpadScrollMethod;
++
+ typedef enum
+ {
+   G_DESKTOP_TOUCHPAD_HANDEDNESS_RIGHT,
+diff --git a/schemas/org.gnome.desktop.peripherals.gschema.xml.in b/schemas/org.gnome.desktop.peripherals.gschema.xml.in
+index 014d7f7..09a41b9 100644
+--- a/schemas/org.gnome.desktop.peripherals.gschema.xml.in
++++ b/schemas/org.gnome.desktop.peripherals.gschema.xml.in
+@@ -9,6 +9,11 @@
+     <child name="touchscreen" schema="org.gnome.desktop.peripherals.touchscreen"/>
+   </schema>
+   <schema id="org.gnome.desktop.peripherals.touchpad" path="/org/gnome/desktop/peripherals/touchpad/">
++    <key name="scroll-method" enum="org.gnome.desktop.GDesktopTouchpadScrollMethod">
++      <default>'two-finger-scrolling'</default>
++      <summary>Select the touchpad scroll method</summary>
++      <description>Select the touchpad scroll method. Supported values are: "disabled", "edge-scrolling", "two-finger-scrolling". This is only recognized on Unity.</description>
++    </key>
+     <key name="edge-scrolling-enabled" type="b">
+       <default>false</default>
+       <summary>Whether edge scrolling is enabled</summary>
diff -pruN 3.38.0-1/debian/patches/series 3.38.0-1ubuntu1/debian/patches/series
--- 3.38.0-1/debian/patches/series	2020-09-14 10:07:30.000000000 +0000
+++ 3.38.0-1ubuntu1/debian/patches/series	2020-09-17 13:12:20.000000000 +0000
@@ -1 +1,6 @@
 Restore-peripheral-display-keys.patch
+git_revert_background_key_removal.patch
+git_revert_menu_icon_key_removal.patch
+git_revert_notifications_key_removal.patch
+git_revert_scroll_method_removal.patch
+ubuntu_lock-on-suspend.patch
diff -pruN 3.38.0-1/debian/patches/ubuntu_lock-on-suspend.patch 3.38.0-1ubuntu1/debian/patches/ubuntu_lock-on-suspend.patch
--- 3.38.0-1/debian/patches/ubuntu_lock-on-suspend.patch	1970-01-01 00:00:00.000000000 +0000
+++ 3.38.0-1ubuntu1/debian/patches/ubuntu_lock-on-suspend.patch	2020-09-17 13:12:20.000000000 +0000
@@ -0,0 +1,26 @@
+From: Marc Deslauriers <marc.deslauriers@canonical.com>
+Date: Fri, 9 Mar 2012 15:42:58 +0100
+Subject: Add a new preference to lock the screen when the system suspends.
+
+Forwarded: No, likely a Ubuntu-specific preference
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/938076
+---
+ schemas/org.gnome.desktop.screensaver.gschema.xml.in | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/schemas/org.gnome.desktop.screensaver.gschema.xml.in b/schemas/org.gnome.desktop.screensaver.gschema.xml.in
+index b43377e..4219c72 100644
+--- a/schemas/org.gnome.desktop.screensaver.gschema.xml.in
++++ b/schemas/org.gnome.desktop.screensaver.gschema.xml.in
+@@ -36,6 +36,11 @@
+       <summary>Show full name in the lock screen</summary>
+       <description>Whether the user’s full name is shown in the lock screen or not. This only affects the screen shield, the name is always shown in the unlock dialog.</description>
+     </key>
++    <key name="ubuntu-lock-on-suspend" type="b">
++      <default>true</default>
++      <summary>Lock on suspend</summary>
++      <description>Set this to TRUE to lock the screen when the system suspends.</description>
++    </key>
+     <key name="embedded-keyboard-enabled" type="b">
+       <default>false</default>
+       <summary>Allow embedding a keyboard into the window</summary>
