Alan Mortensen · Stephan Woidowski · Milo Casagrande · Baurzhan Muftakhidinov · Balázs Úr · Carlos Garnacho
--- a/NEWS
+++ b/NEWS
+==============
+Version 3.38.0
+==============
+- Translation updates
+
 ===============
 Version 3.37.92
 ===============

--- a/debian/changelog
+++ b/debian/changelog
+gnome-settings-daemon (3.38.0-1ubuntu1) groovy; urgency=medium
+
+  * Merge with debian, remaining changes:
+    + debian/control.in:
+      - Build-depend on accountsservice
+    + debian/patches:
+      - 45_suppress-printer-may-not-be-connected-notification.patch
+      - 53_sync_input_sources_to_accountsservice.patch
+      - 64_restore_terminal_keyboard_shortcut_schema.patch
+      - correct_logout_action.patch
+        display the logout action on ctrl-alt-del
+      - ubuntu-lid-close-suspend.patch
+        Reimplement support for setting lid close suspend actions
+      - revert-wacom-migration.patch
+      - revert-gsettings-removals.patch
+        Revert gsettings keys that were dropped since 3.8, for u-s-d
+      - revert-mediakeys-dbus-interface-drop.patch
+      - ubuntu_ibus_configs.patch
+      - git_binary_encoding.patch
+      - ubuntu_calculator_snap.patch
+      - ubuntu_vino_handling.patch: restore support to handle vino service
+    + debian/gnome-settings-daemon.install:
+      - Install apport hook
+
+ -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Tue, 15 Sep 2020 15:13:43 +0200
+
+gnome-settings-daemon (3.38.0-1) experimental; urgency=medium
+
+  * Team upload
+  * New upstream stable release
+    - Translation updates
+  * Revert "watch: Find unstable versions"
+  * Continue to upload to experimental for now, so we can batch together
+    this and other core GNOME packages as part of #969321 when mozjs78
+    has passed through NEW
+
+ -- Simon McVittie <smcv@debian.org>  Mon, 14 Sep 2020 11:40:48 +0100
+
 gnome-settings-daemon (3.37.92-1ubuntu1) groovy; urgency=medium

  * Merge with debian, remaining changes:

--- a/debian/patches/53_sync_input_sources_to_accountsservice.patch
+++ b/debian/patches/53_sync_input_sources_to_accountsservice.patch
@@ -9,7 +9,7 @@ Subject: _sync_input_sources_to_accountsservice
 3 files changed, 80 insertions(+), 1 deletion(-)

 diff --git a/meson.build b/meson.build
-index af59200..a2fd67c 100644
+index 5b6f4bc..09fbe40 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -89,6 +89,7 @@ endif

--- a/debian/patches/debian/meson.build-Lower-polkit-requirement.patch
+++ b/debian/patches/debian/meson.build-Lower-polkit-requirement.patch
@@ -10,7 +10,7 @@ Forwarded: not-needed
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/meson.build b/meson.build
-index 65ddb98..af59200 100644
+index 82c4159..5b6f4bc 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -104,7 +104,7 @@ libgeoclue_dep = dependency('libgeoclue-2.0', version: '>= 2.3.1')

--- a/debian/watch
+++ b/debian/watch
 version=4
-https://download.gnome.org/sources/@PACKAGE@/([\d\.]+)/ \
+https://download.gnome.org/sources/@PACKAGE@/([\d\.]+[02468])/ \
 	@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@
--- a/meson.build
+++ b/meson.build
 project(
  'gnome-settings-daemon', 'c',
-  version: '3.37.92',
+  version: '3.38.0',
  license: [ 'GPL2+', 'LGPLv2+' ],
  meson_version: '>= 0.47.0'
 )

--- a/po/da.po
+++ b/po/da.po
--- a/po/de.po
+++ b/po/de.po
--- a/po/hu.po
+++ b/po/hu.po
--- a/po/it.po
+++ b/po/it.po
--- a/po/kk.po
+++ b/po/kk.po