Tom Briden · Rūdolfs Mazurs · Juliano de Souza Camargo · Efstathios Iosifidis · Simon McVittie · Yosef Or Boczko
--- a/NEWS
+++ b/NEWS
+==============
+Version 3.38.1
+==============
+Sound:
+- Update g-v-c dependency. Necessary to support related UCM
+  changes in ALSA and Pulseaudio
+
+Media-keys:
+- Don't throw unnecessary warnings
+
+Print-notification:
+- Disable plugin if CUPS is diabled
+
+- Translation updates
+
 ==============
 Version 3.38.0
 ==============

--- a/debian/changelog
+++ b/debian/changelog
+gnome-settings-daemon (3.38.1-3ubuntu1) hirsute; 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
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Fri, 15 Jan 2021 17:39:51 +0100
+
+gnome-settings-daemon (3.38.1-3) unstable; urgency=medium
+
+  * Team upload
+
+  [ Laurent Bigonville ]
+  * Disable colord support on non-linux architectures
+
+  [ Simon McVittie ]
+  * Update to upstream git commit
+    GNOME_SETTINGS_DAEMON_3_38_1-15-g6018dd49 from the gnome-3-38 branch
+    - Avoid warning about wireless input devices' low battery levels every
+      time they reconnect, which can be frequent
+    - Reduce memory use of gsd-datetime plugin
+    - Unit test fixes
+    - Translation updates
+  * Standards-Version: 4.5.1 (no changes required)
+  * Use upstream/3.38.x git branch.
+    Upstream has branched for GNOME 40.
+  * Mark g-s-d-dev as Multi-Arch: same.
+    Move the pkg-config metadata to /usr/share/pkgconfig to allow for
+    cross-compilation. There is actually nothing architecture-specific in
+    g-s-d-dev itself, but it depends on libglib2.0-dev, so leave it as
+    Architecture: any to get the right transitive dependency.
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 15 Jan 2021 09:56:54 +0000
+
+gnome-settings-daemon (3.38.1-2) unstable; urgency=medium
+
+  * Team upload
+  * d/patches: Update from upstream git commit
+    GNOME_SETTINGS_DAEMON_3_38_1-6-gaffebf89
+    - Fix a crash if a filesystem does not provide atime
+    - If system-wide power management idle action is set to log out,
+      ignore it in the gdm greeter (for which logging out makes no sense)
+    - Silence unnecessary warnings if usbguard is not installed
+    - Translation updates
+
+ -- Simon McVittie <smcv@debian.org>  Mon, 23 Nov 2020 10:14:55 +0000
+
+gnome-settings-daemon (3.38.1-1) unstable; urgency=medium
+
+  * Team upload
+  * New upstream release
+    - Update gnome-volume-control with support for PulseAudio 14
+      (currently only in experimental, a binNMU will be required when
+      it arrives in unstable)
+    - Avoid unnecessary warnings from media-keys plugin
+    - Translation updates
+  * d/p/01_debianize_xrdb.patch: Add DEP-3 metadata
+
+ -- Simon McVittie <smcv@debian.org>  Mon, 02 Nov 2020 10:26:54 +0000
+
+gnome-settings-daemon (3.38.0-2) unstable; urgency=medium
+
+  * Team upload
+  * Release to unstable
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 25 Sep 2020 10:24:13 +0100
+
 gnome-settings-daemon (3.38.0-1ubuntu1) groovy; urgency=medium

  * Merge with debian, remaining changes:

--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends: debhelper-compat (= 12),
               libaccountsservice-dev (>= 0.6.34),
               libasound2-dev [linux-any],
               libcanberra-gtk3-dev,
-               libcolord-dev (>= 1.3.5),
+               libcolord-dev (>= 1.3.5) [linux-any],
               libcups2-dev,
               libfontconfig1-dev,
               libgcr-3-dev (>= 3.7.5),
@@ -56,7 +56,7 @@ Build-Depends: debhelper-compat (= 12),
               xkb-data,
               xserver-xorg-input-wacom [!hurd-any !kfreebsd-any !s390 !s390x],
               xvfb <!nocheck>
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
 XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-settings-daemon.git
 XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-settings-daemon
 Vcs-Git: https://salsa.debian.org/gnome-team/gnome-settings-daemon.git -b ubuntu/master
@@ -120,6 +120,7 @@ Description: daemon handling the GNOME session settings - common files
 Package: gnome-settings-daemon-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libglib2.0-dev (>= 2.56),
         ${misc:Depends},
         ${shlibs:Depends}

--- a/debian/control.in
+++ b/debian/control.in
@@ -13,7 +13,7 @@ Build-Depends: debhelper-compat (= 12),
               libaccountsservice-dev (>= 0.6.34),
               libasound2-dev [linux-any],
               libcanberra-gtk3-dev,
-               libcolord-dev (>= 1.3.5),
+               libcolord-dev (>= 1.3.5) [linux-any],
               libcups2-dev,
               libfontconfig1-dev,
               libgcr-3-dev (>= 3.7.5),
@@ -52,7 +52,7 @@ Build-Depends: debhelper-compat (= 12),
               xkb-data,
               xserver-xorg-input-wacom [!hurd-any !kfreebsd-any !s390 !s390x],
               xvfb <!nocheck>
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
 XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-settings-daemon.git
 XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-settings-daemon
 Vcs-Git: https://salsa.debian.org/gnome-team/gnome-settings-daemon.git -b ubuntu/master
@@ -116,6 +116,7 @@ Description: daemon handling the GNOME session settings - common files
 Package: gnome-settings-daemon-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libglib2.0-dev (>= 2.56),
         ${misc:Depends},
         ${shlibs:Depends}

--- a/debian/gbp.conf
+++ b/debian/gbp.conf
 [DEFAULT]
 pristine-tar = True
 debian-branch = ubuntu/master
-upstream-branch = upstream/latest
+upstream-branch = upstream/3.38.x
 debian-tag=ubuntu/%(version)s

 [buildpackage]

--- a/debian/gnome-settings-daemon-dev.install
+++ b/debian/gnome-settings-daemon-dev.install
 usr/include
-usr/lib/pkgconfig
+usr/lib/pkgconfig/gnome-settings-daemon.pc usr/share/pkgconfig
--- a/debian/patches/64_restore_terminal_keyboard_shortcut_schema.patch
+++ b/debian/patches/64_restore_terminal_keyboard_shortcut_schema.patch
@@ -9,10 +9,10 @@ Subject: _restore_terminal_keyboard_shortcut_schema
 plugins/media-keys/shortcuts-list.h                  |  1 +
 4 files changed, 32 insertions(+)

-diff --git a/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in b/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in
-index fb0c85c..5a05d7f 100644
--- a/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in
-+++ b/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in
+Index: gnome-settings-daemon/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in
+===================================================================
+--- gnome-settings-daemon.orig/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in
+++ gnome-settings-daemon/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in
 @@ -131,6 +131,11 @@
       <summary>Record a short video of the screen</summary>
       <description>Binding to record a short video of the screen</description>
@@ -37,15 +37,14 @@ index fb0c85c..5a05d7f 100644
     <key name="www" type="as">
       <default>['']</default>
       <summary>Launch web browser</summary>
-diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
-index ae5411e..8c38590 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
-+++ b/plugins/media-keys/gsd-media-keys-manager.c
-@@ -1132,6 +1132,22 @@ gnome_session_shutdown_cb (GObject *source_object,
-         }
+Index: gnome-settings-daemon/plugins/media-keys/gsd-media-keys-manager.c
+===================================================================
+--- gnome-settings-daemon.orig/plugins/media-keys/gsd-media-keys-manager.c
+++ gnome-settings-daemon/plugins/media-keys/gsd-media-keys-manager.c
+@@ -1133,6 +1133,22 @@ gnome_session_shutdown_cb (GObject *sour
 }
 
-+static void
+ static void
 +do_terminal_action (GsdMediaKeysManager *manager)
 +{
 +        GSettings *settings;
@@ -61,10 +60,11 @@ index ae5411e..8c38590 100644
 +        g_object_unref (settings);
 +}
 +
- static void
+static void
 gnome_session_shutdown (GsdMediaKeysManager *manager)
 {
-@@ -2689,6 +2705,9 @@ do_action (GsdMediaKeysManager *manager,
+ 	GsdMediaKeysManagerPrivate *priv = GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE (manager);
+@@ -2697,6 +2713,9 @@ do_action (GsdMediaKeysManager *manager,
         case SCREENCAST_KEY:
                 do_screencast_action (manager);
                 break;
@@ -74,7 +74,7 @@ index ae5411e..8c38590 100644
         case WWW_KEY:
                 do_url_action (manager, "http", timestamp);
                 break;
-@@ -3299,6 +3318,7 @@ migrate_keybinding_settings (void)
+@@ -3307,6 +3326,7 @@ migrate_keybinding_settings (void)
                 { "window-screenshot-clip",     "window-screenshot-clip",       map_keybinding },
                 { "area-screenshot-clip",       "area-screenshot-clip",         map_keybinding },
                 { "screencast",                 "screencast",                   map_keybinding },
@@ -82,10 +82,10 @@ index ae5411e..8c38590 100644
                 { "www",                        "www",                          map_keybinding },
                 { "magnifier",                  "magnifier",                    map_keybinding },
                 { "screenreader",               "screenreader",                 map_keybinding },
-diff --git a/plugins/media-keys/media-keys.h b/plugins/media-keys/media-keys.h
-index cc4ea8e..64362a4 100644
--- a/plugins/media-keys/media-keys.h
-+++ b/plugins/media-keys/media-keys.h
+Index: gnome-settings-daemon/plugins/media-keys/media-keys.h
+===================================================================
+--- gnome-settings-daemon.orig/plugins/media-keys/media-keys.h
+++ gnome-settings-daemon/plugins/media-keys/media-keys.h
 @@ -49,6 +49,7 @@ typedef enum {
         WINDOW_SCREENSHOT_CLIP_KEY,
         AREA_SCREENSHOT_CLIP_KEY,
@@ -94,10 +94,10 @@ index cc4ea8e..64362a4 100644
         WWW_KEY,
         PLAY_KEY,
         PAUSE_KEY,
-diff --git a/plugins/media-keys/shortcuts-list.h b/plugins/media-keys/shortcuts-list.h
-index 8ced72d..45f0772 100644
--- a/plugins/media-keys/shortcuts-list.h
-+++ b/plugins/media-keys/shortcuts-list.h
+Index: gnome-settings-daemon/plugins/media-keys/shortcuts-list.h
+===================================================================
+--- gnome-settings-daemon.orig/plugins/media-keys/shortcuts-list.h
+++ gnome-settings-daemon/plugins/media-keys/shortcuts-list.h
 @@ -71,6 +71,7 @@ static struct {
         { WINDOW_SCREENSHOT_CLIP_KEY, "window-screenshot-clip", FALSE, SHELL_ACTION_MODE_NORMAL, META_KEY_BINDING_IGNORE_AUTOREPEAT },
         { AREA_SCREENSHOT_CLIP_KEY, "area-screenshot-clip", FALSE, SHELL_ACTION_MODE_ALL, META_KEY_BINDING_IGNORE_AUTOREPEAT },

--- a/debian/patches/Fix-crashing-when-atime-is-not-present.patch
+++ b/debian/patches/Fix-crashing-when-atime-is-not-present.patch
+From: Jing Wang <99jingw@gmail.com>
+Date: Sat, 10 Oct 2020 16:06:33 -0400
+Subject: Fix crashing when atime is not present
+
+Recent changes to gio omit the atime instead of setting it to an out of
+range value.
+
+Fixes #556, but note this doesn't fix the fact that gio omitted atime
+on a system where atime should have been available.
+
+Origin: upstream, 3.38.2, commit:647c0af7779757b18708a07b7cfc95e6b1bc79f0
+---
+ plugins/housekeeping/gsd-housekeeping-manager.c | 37 +++++++++++++++----------
+ 1 file changed, 23 insertions(+), 14 deletions(-)
+
+diff --git a/plugins/housekeeping/gsd-housekeeping-manager.c b/plugins/housekeeping/gsd-housekeeping-manager.c
+index 40d016a..8ad985c 100644
+--- a/plugins/housekeeping/gsd-housekeeping-manager.c
+++ b/plugins/housekeeping/gsd-housekeeping-manager.c
+@@ -78,7 +78,7 @@ typedef struct {
+ 
+ 
+ typedef struct {
+-        gint64  atime;
+        gint64  time;
+         char   *path;
+         glong   size;
+ } ThumbData;
+@@ -100,11 +100,13 @@ read_dir_for_purge (const char *path, GList *files)
+ {
+         GFile           *read_path;
+         GFileEnumerator *enum_dir;
+        int              cannot_get_time = 0;
+ 
+         read_path = g_file_new_for_path (path);
+         enum_dir = g_file_enumerate_children (read_path,
+                                               G_FILE_ATTRIBUTE_STANDARD_NAME ","
+                                               G_FILE_ATTRIBUTE_TIME_ACCESS ","
+                                              G_FILE_ATTRIBUTE_TIME_MODIFIED ","
+                                               G_FILE_ATTRIBUTE_STANDARD_SIZE,
+                                               G_FILE_QUERY_INFO_NONE,
+                                               NULL,
+@@ -120,28 +122,31 @@ read_dir_for_purge (const char *path, GList *files)
+                                 ThumbData *td;
+                                 GFile     *entry;
+                                 char      *entry_path;
+-                                gint64     atime;
+                                gint64     time;
+ 
+                                 entry = g_file_get_child (read_path, name);
+                                 entry_path = g_file_get_path (entry);
+                                 g_object_unref (entry);
+ 
+-                                // Note that using atime here is no worse than using mtime.
+                                // If atime is available, it should be no worse than mtime.
+                                 // - Even if the file system is mounted with noatime, the atime and
+                                 //   mtime will be set to the same value on file creation.
+                                 // - Since the thumbnailer never edits thumbnails, and instead swaps
+                                 //   in newly created temp files, atime will always be >= mtime.
+-                                // - atime should never be absent, which would cause
+-                                //   g_file_info_get_attribute_int64 to return 0. The presence of
+-                                //   atime is determined by the filters we pass to
+-                                //   g_file_enumerate_children, not the file system atime settings.
+ 
+-                                g_assert (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_TIME_ACCESS));
+-                                atime = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_ACCESS);
+                                if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_TIME_ACCESS)) {
+                                    time = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_ACCESS);
+                                } else if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_TIME_MODIFIED)) {
+                                    time = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED);
+                                } else {
+                                    // Unlikely to get here, but be defensive
+                                    cannot_get_time += 1;
+                                    time = G_MAXINT64;
+                                }
+ 
+                                 td = g_new0 (ThumbData, 1);
+                                 td->path = entry_path;
+-                                td->atime = atime;
+                                td->time = time;
+                                 td->size = g_file_info_get_size (info);
+ 
+                                 files = g_list_prepend (files, td);
+@@ -149,6 +154,10 @@ read_dir_for_purge (const char *path, GList *files)
+                         g_object_unref (info);
+                 }
+                 g_object_unref (enum_dir);
+
+                if (cannot_get_time > 0) {
+                    g_warning ("Could not read atime or mtime on %d files in %s", cannot_get_time, path);
+                }
+         }
+         g_object_unref (read_path);
+ 
+@@ -158,7 +167,7 @@ read_dir_for_purge (const char *path, GList *files)
+ static void
+ purge_old_thumbnails (ThumbData *info, PurgeData *purge_data)
+ {
+-        if ((purge_data->now - info->atime) > purge_data->max_age) {
+        if ((purge_data->now - info->time) > purge_data->max_age) {
+                 g_unlink (info->path);
+                 info->size = 0;
+         } else {
+@@ -167,9 +176,9 @@ purge_old_thumbnails (ThumbData *info, PurgeData *purge_data)
+ }
+ 
+ static int
+-sort_file_atime (ThumbData *file1, ThumbData *file2)
+sort_file_time (ThumbData *file1, ThumbData *file2)
+ {
+-        return file1->atime - file2->atime;
+        return file1->time - file2->time;
+ }
+ 
+ static char **
+@@ -260,7 +269,7 @@ purge_thumbnail_cache (GsdHousekeepingManager *manager)
+ 
+         if ((purge_data.total_size > purge_data.max_size) && (purge_data.max_size >= 0)) {
+                 GList *scan;
+-                files = g_list_sort (files, (GCompareFunc) sort_file_atime);
+                files = g_list_sort (files, (GCompareFunc) sort_file_time);
+                 for (scan = files; scan && (purge_data.total_size > purge_data.max_size); scan = scan->next) {
+                         ThumbData *info = scan->data;
+                         g_unlink (info->path);
--- a/debian/patches/Update-Catalan-translation.patch
+++ b/debian/patches/Update-Catalan-translation.patch
--- a/debian/patches/Update-Friulian-translation.patch
+++ b/debian/patches/Update-Friulian-translation.patch
+From: Fabio Tomat <f.t.public@gmail.com>
+Date: Sun, 18 Oct 2020 14:42:12 +0000
+Subject: Update Friulian translation
+
+Origin: upstream, 3.38.2, commit:e48ac6f519c8353b90d9733e15645dfe5612e656
+---
+ po/fur.po | 112 +++++++++++++++++++++++++-------------------------------------
+ 1 file changed, 45 insertions(+), 67 deletions(-)
+
+diff --git a/po/fur.po b/po/fur.po
+index aaa975c..faed386 100644
+--- a/po/fur.po
+++ b/po/fur.po
+@@ -8,8 +8,8 @@ msgstr ""
+ "Project-Id-Version: gnome-settings-daemon master\n"
+ "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-settings-daemon/"
+ "issues\n"
+-"POT-Creation-Date: 2020-09-03 20:47+0000\n"
+-"PO-Revision-Date: 2020-10-08 19:26+0200\n"
+"POT-Creation-Date: 2020-10-08 17:28+0000\n"
+"PO-Revision-Date: 2020-10-18 16:41+0200\n"
+ "Last-Translator: Fabio Tomat <f.t.public@gmail.com>\n"
+ "Language-Team: Friulian <fur@li.org>\n"
+ "Language: fur\n"
+@@ -366,7 +366,7 @@ msgstr "Etichete boton pal visôr OLED."
+ 
+ #: data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in:89
+ msgid "Label will be rendered to OLED display belonging to the button"
+-msgstr "La etichete che e vegnarà mostrade sul schermi OLED dal boton"
+msgstr "La etichete che e vignarà mostrade sul schermi OLED dal boton"
+ 
+ #: data/org.gnome.settings-daemon.plugins.color.gschema.xml.in:6
+ msgid "The duration a display profile is valid"
+@@ -1666,30 +1666,30 @@ msgstr ""
+ msgid "This computer has only %s disk space remaining."
+ msgstr "Su chest computer a restin nome %s di spazi disc."
+ 
+-#: plugins/media-keys/gsd-media-keys-manager.c:2468
+#: plugins/media-keys/gsd-media-keys-manager.c:2476
+ msgid "Bluetooth disabled"
+ msgstr "Bluetooth disabilitât"
+ 
+-#: plugins/media-keys/gsd-media-keys-manager.c:2471
+#: plugins/media-keys/gsd-media-keys-manager.c:2479
+ msgid "Bluetooth enabled"
+ msgstr "Bluetooth abilitât"
+ 
+-#: plugins/media-keys/gsd-media-keys-manager.c:2475
+#: plugins/media-keys/gsd-media-keys-manager.c:2483
+ msgid "Airplane mode enabled"
+ msgstr "Modalitât avion abilitade"
+ 
+-#: plugins/media-keys/gsd-media-keys-manager.c:2478
+#: plugins/media-keys/gsd-media-keys-manager.c:2486
+ msgid "Airplane mode disabled"
+ msgstr "Modalitât avion disabilitade"
+ 
+-#: plugins/media-keys/gsd-media-keys-manager.c:2507
+#: plugins/media-keys/gsd-media-keys-manager.c:2515
+ msgid "Hardware Airplane Mode"
+ msgstr "Modalitât avion vie hardware abilitade"
+ 
+ #. Translators: this is a filename used for screencast
+ #. * recording, where "%d" and "%t" date and time, e.g.
+ #. * "Screencast from 07-17-2013 10:00:46 PM.webm"
+-#: plugins/media-keys/gsd-media-keys-manager.c:2570
+#: plugins/media-keys/gsd-media-keys-manager.c:2578
+ #, no-c-format
+ msgid "Screencast from %d %t.webm"
+ msgstr "Cature dal scritori di %d %t.webm"
+@@ -1934,7 +1934,7 @@ msgstr "Cjarie batarie dal portatil cuasi esauride"
+ #, c-format
+ msgid "Computer will hibernate very soon unless it is plugged in."
+ msgstr ""
+-"Se nol ven tacât subite ae prese di alimentazion, il computer al vegnarà "
+"Se nol ven tacât subite ae prese di alimentazion, il computer al vignarà "
+ "metût in ibernazion."
+ 
+ #. TRANSLATORS: give the user a ultimatum
+@@ -1942,7 +1942,7 @@ msgstr ""
+ #, c-format
+ msgid "Computer will shutdown very soon unless it is plugged in."
+ msgstr ""
+-"Se nol ven tacât subite ae prese di alimentazion, il computer al vegnarà "
+"Se nol ven tacât subite ae prese di alimentazion, il computer al vignarà "
+ "studât."
+ 
+ #. TRANSLATORS: the UPS is very low
+@@ -2147,7 +2147,7 @@ msgstr "Tiermin session automatic"
+ 
+ #: plugins/power/gsd-power-manager.c:2127
+ msgid "You will soon log out because of inactivity."
+-msgstr "Chi di pôc la session e vegnarà terminade par vie de inativitât."
+msgstr "Chi di pôc la session e vignarà terminade par vie de inativitât."
+ 
+ #: plugins/power/gsd-power-manager.c:2132
+ msgid "Automatic suspend"
+@@ -2156,7 +2156,7 @@ msgstr "Sospension automatiche"
+ #: plugins/power/gsd-power-manager.c:2132
+ #: plugins/power/gsd-power-manager.c:2137
+ msgid "Computer will suspend very soon because of inactivity."
+-msgstr "Chi di pôc il computer al vegnarà sospindût par vie de inativitât."
+msgstr "Chi di pôc il computer al vignarà sospindût par vie de inativitât."
+ 
+ #: plugins/power/gsd-power-manager.c:2137
+ msgid "Automatic hibernation"
+@@ -2448,23 +2448,18 @@ msgstr ""
+ "suspiet."
+ 
+ #: plugins/usb-protection/gsd-usb-protection-manager.c:589
+-#, fuzzy
+-#| msgid "New keyboard detected"
+ msgid "New device detected"
+-msgstr "Gnove tastiere rilevade"
+msgstr "Gnûf dispositîf rilevât"
+ 
+ #: plugins/usb-protection/gsd-usb-protection-manager.c:590
+-#, fuzzy
+-#| msgid ""
+-#| "Either your keyboard has been reconnected or a new one has been plugged "
+-#| "in. If you did not do it, check your system for any suspicious device."
+ msgid ""
+ "Either one of your existing devices has been reconnected or a new one has "
+ "been plugged in. If you did not do it, check your system for any suspicious "
+ "device."
+ msgstr ""
+-"O si à tornât a coneti la tastiere opûr e je stade tacade une gnove. Se nol "
+-"è stât fat, controle che il sisteme nol vedi nissun dispositîf suspiet."
+"O si à tornât a coneti un dai tiei dispositîfs esistents opûr al è stât "
+"tacât un gnûf. Se nol è stât fat, controle che il sisteme nol vedi nissun "
+"dispositîf suspiet."
+ 
+ #: plugins/usb-protection/gsd-usb-protection-manager.c:596
+ msgid "Reconnect USB device"
+@@ -2525,88 +2520,79 @@ msgstr ""
+ 
+ #: plugins/wwan/cc-wwan-errors-private.h:40
+ msgid "Phone failure"
+-msgstr ""
+msgstr "Erôr dal telefon"
+ 
+ #: plugins/wwan/cc-wwan-errors-private.h:41
+-#, fuzzy
+-#| msgid "Not connected?"
+ msgid "No connection to phone"
+-msgstr "No conetude?"
+msgstr "Nissune conession al telefon"
+ 
+ #: plugins/wwan/cc-wwan-errors-private.h:43
+ msgid "Operation not allowed"
+-msgstr ""
+msgstr "Operazion no permetude"
+ 
+ #: plugins/wwan/cc-wwan-errors-private.h:44
+ msgid "Operation not supported"
+-msgstr ""
+msgstr "Operazion no supuartade"
+ 
+ #: plugins/wwan/cc-wwan-errors-private.h:48
+ msgid "SIM not inserted"
+-msgstr ""
+msgstr "Schede SIM no inseride"
+ 
+ #: plugins/wwan/cc-wwan-errors-private.h:49
+ msgid "SIM PIN required"
+-msgstr ""
+msgstr "Necessari codiç PIN de SIM"
+ 
+ #: plugins/wwan/cc-wwan-errors-private.h:50
+ msgid "SIM PUK required"
+-msgstr ""
+msgstr "Necessari codiç PUK de SIM"
+ 
+ #: plugins/wwan/cc-wwan-errors-private.h:51
+ msgid "SIM failure"
+-msgstr ""
+msgstr "Erôr de schede SIM"
+ 
+ #: plugins/wwan/cc-wwan-errors-private.h:52
+ msgid "SIM busy"
+-msgstr ""
+msgstr "Schede SIM ocupade"
+ 
+ #: plugins/wwan/cc-wwan-errors-private.h:53
+ msgid "SIM wrong"
+-msgstr ""
+msgstr "Schede SIM sbaliade"
+ 
+ #: plugins/wwan/cc-wwan-errors-private.h:54
+ msgid "Incorrect password"
+-msgstr ""
+msgstr "Password sbaliade"
+ 
+ #: plugins/wwan/cc-wwan-errors-private.h:55
+ msgid "SIM PIN2 required"
+-msgstr ""
+msgstr "Necessari codiç PIN2 de SIM"
+ 
+ #: plugins/wwan/cc-wwan-errors-private.h:56
+ msgid "SIM PUK2 required"
+-msgstr ""
+msgstr "Necessari codiç PUK2 de SIM"
+ 
+ #: plugins/wwan/cc-wwan-errors-private.h:72
+-#, fuzzy
+-#| msgid "Unknown time"
+ msgid "Unknown error"
+-msgstr "Timp no cognossût"
+msgstr "Erôr no cognossût"
+ 
+ #: plugins/wwan/cc-wwan-errors-private.h:91
+-#, fuzzy
+-#| msgctxt "print job state"
+-#| msgid "Printing canceled"
+ msgid "Action Cancelled"
+-msgstr "Stampe anulade"
+msgstr "Azion anulade"
+ 
+ #: plugins/wwan/cc-wwan-errors-private.h:94
+ msgid "Access denied"
+-msgstr ""
+msgstr "Acès dineât"
+ 
+ #: plugins/wwan/cc-wwan-errors-private.h:103
+-#, fuzzy
+-#| msgid "Unknown time"
+ msgid "Unknown Error"
+-msgstr "Timp no cognossût"
+msgstr "Erôr no cognossût"
+ 
+ #: plugins/wwan/gsd-wwan-manager.c:117
+ msgid "New PIN for SIM"
+-msgstr ""
+msgstr "Gnûf codiç PIN pe SIM"
+ 
+ #: plugins/wwan/gsd-wwan-manager.c:118
+ msgid "Set"
+-msgstr ""
+msgstr "Stabilìs"
+ 
+ #: plugins/wwan/gsd-wwan-manager.c:120
+ msgid "Unlock SIM card"
+@@ -2621,16 +2607,13 @@ msgid "Cancel"
+ msgstr "Anule"
+ 
+ #: plugins/wwan/gsd-wwan-manager.c:129
+-#, fuzzy, c-format
+-#| msgid "Please provide the PIN for SIM card %s"
+#, c-format
+ msgid "Please provide a new PIN for SIM card %s"
+-msgstr "Par plasê furnìs il PIN pe schede SIM %s"
+msgstr "Par plasê furnìs un gnûf codiç PIN pe schede SIM %s"
+ 
+ #: plugins/wwan/gsd-wwan-manager.c:131
+-#, fuzzy
+-#| msgid "Enter PIN to unlock your SIM card"
+ msgid "Enter a New PIN to unlock your SIM card"
+-msgstr "Inserìs il PIN par sblocâ la tô schede SIM"
+msgstr "Inserìs un gnûf codiç PIN par sblocâ la tô schede SIM"
+ 
+ #: plugins/wwan/gsd-wwan-manager.c:133
+ #, c-format
+@@ -2642,26 +2625,21 @@ msgid "Enter PIN to unlock your SIM card"
+ msgstr "Inserìs il PIN par sblocâ la tô schede SIM"
+ 
+ #: plugins/wwan/gsd-wwan-manager.c:138
+-#, fuzzy, c-format
+-#| msgid "Please provide the PIN for SIM card %s"
+#, c-format
+ msgid "Please provide the PUK for SIM card %s"
+-msgstr "Par plasê furnìs il PIN pe schede SIM %s"
+msgstr "Par plasê furnìs il codiç PUK pe schede SIM %s"
+ 
+ #: plugins/wwan/gsd-wwan-manager.c:140
+-#, fuzzy
+-#| msgid "Enter PIN to unlock your SIM card"
+ msgid "Enter PUK to unlock your SIM card"
+-msgstr "Inserìs il PIN par sblocâ la tô schede SIM"
+msgstr "Inserìs il codiç PUK par sblocâ la tô schede SIM"
+ 
+ #. msg is already localised
+ #: plugins/wwan/gsd-wwan-manager.c:156
+-#, fuzzy, c-format
+-#| msgid "%2$s You have %1$u try left"
+-#| msgid_plural "%2$s You have %1$u tries left"
+#, c-format
+ msgid "%2$s. You have %1$u try left"
+ msgid_plural "%2$s. You have %1$u tries left"
+-msgstr[0] "%2$s Tu âs ancjemò %1$u tentatîf"
+-msgstr[1] "%2$s Tu âs ancjemò %1$u tentatîfs"
+msgstr[0] "%2$s. Tu âs ancjemò %1$u tentatîf"
+msgstr[1] "%2$s. Tu âs ancjemò %1$u tentatîfs"
+ 
+ #: plugins/wwan/gsd-wwan-manager.c:160
+ #, c-format
--- a/debian/patches/Update-German-translation.patch
+++ b/debian/patches/Update-German-translation.patch
+From: Tim Sabsch <tim@sabsch.com>
+Date: Sun, 1 Nov 2020 13:57:32 +0000
+Subject: Update German translation
+
+Origin: upstream, 3.38.2, commit:23763dfec62ff80fb7f04f39c107b1ab45296705
+---
+ po/de.po | 53 ++++++++++++++++++++++++-----------------------------
+ 1 file changed, 24 insertions(+), 29 deletions(-)
+
+diff --git a/po/de.po b/po/de.po
+index b2fdc3b..5a5e6a3 100644
+--- a/po/de.po
+++ b/po/de.po
+@@ -30,9 +30,9 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: gnome-settings-daemon master\n"
+-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-settings-daemon/iss"
+-"ues\n"
+-"POT-Creation-Date: 2020-09-03 20:47+0000\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-settings-daemon/"
+"issues\n"
+"POT-Creation-Date: 2020-10-28 13:36+0000\n"
+ "PO-Revision-Date: 2020-09-05 22:06+0200\n"
+ "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
+ "Language-Team: Deutsch <gnome-de@gnome.org>\n"
+@@ -1450,7 +1450,7 @@ msgid ""
+ "before it goes to sleep. A value of 0 means never."
+ msgstr ""
+ "Zeit in Sekunden, die der Rechner bei Netzanschluss inaktiv sein muss, bevor "
+-"er in den Energiesparmodus versetzt wird. Ein Wert von O bedeutet nie."
+"er in den Energiesparmodus versetzt wird. Ein Wert von 0 bedeutet nie."
+ 
+ #: data/org.gnome.settings-daemon.plugins.power.gschema.xml.in:21
+ #: data/org.gnome.settings-daemon.plugins.power.gschema.xml.in:31
+@@ -1475,7 +1475,7 @@ msgid ""
+ "inactive before it goes to sleep. A value of 0 means never."
+ msgstr ""
+ "Zeit in Sekunden, die der Rechner im Akkubetrieb inaktiv sein muss, bevor er "
+-"in den Energiesparmodus versetzt wird. Ein Wert von O bedeutet nie."
+"in den Energiesparmodus versetzt wird. Ein Wert von 0 bedeutet nie."
+ 
+ #: data/org.gnome.settings-daemon.plugins.power.gschema.xml.in:36
+ msgid "Enable the ALS sensor"
+@@ -1725,30 +1725,30 @@ msgstr ""
+ msgid "This computer has only %s disk space remaining."
+ msgstr "Auf diesem Rechner ist nur noch %s Speicherplatz verfügbar."
+ 
+-#: plugins/media-keys/gsd-media-keys-manager.c:2468
+#: plugins/media-keys/gsd-media-keys-manager.c:2476
+ msgid "Bluetooth disabled"
+ msgstr "Bluetooth ist deaktiviert"
+ 
+-#: plugins/media-keys/gsd-media-keys-manager.c:2471
+#: plugins/media-keys/gsd-media-keys-manager.c:2479
+ msgid "Bluetooth enabled"
+ msgstr "Bluetooth ist aktiviert"
+ 
+-#: plugins/media-keys/gsd-media-keys-manager.c:2475
+#: plugins/media-keys/gsd-media-keys-manager.c:2483
+ msgid "Airplane mode enabled"
+ msgstr "Flugzeugmodus ist aktiviert"
+ 
+-#: plugins/media-keys/gsd-media-keys-manager.c:2478
+#: plugins/media-keys/gsd-media-keys-manager.c:2486
+ msgid "Airplane mode disabled"
+ msgstr "Flugzeugmodus ist deaktiviert"
+ 
+-#: plugins/media-keys/gsd-media-keys-manager.c:2507
+#: plugins/media-keys/gsd-media-keys-manager.c:2515
+ msgid "Hardware Airplane Mode"
+ msgstr "Hardware-Flugzeugmodus"
+ 
+ #. Translators: this is a filename used for screencast
+ #. * recording, where "%d" and "%t" date and time, e.g.
+ #. * "Screencast from 07-17-2013 10:00:46 PM.webm"
+-#: plugins/media-keys/gsd-media-keys-manager.c:2570
+#: plugins/media-keys/gsd-media-keys-manager.c:2578
+ #, no-c-format
+ msgid "Screencast from %d %t.webm"
+ msgstr "Bildschirmvideo von %d %t.webm"
+@@ -2178,46 +2178,46 @@ msgstr ""
+ "Rechner wird deshalb nun heruntergefahren."
+ 
+ #. TRANSLATORS: this is the sound description
+-#: plugins/power/gsd-power-manager.c:1333
+#: plugins/power/gsd-power-manager.c:1338
+ msgid "Lid has been opened"
+ msgstr "Klappe wurde geöffnet"
+ 
+ #. TRANSLATORS: this is the sound description
+-#: plugins/power/gsd-power-manager.c:1367
+#: plugins/power/gsd-power-manager.c:1372
+ msgid "Lid has been closed"
+ msgstr "Klappe wurde geschlossen"
+ 
+ #. TRANSLATORS: this is the sound description
+-#: plugins/power/gsd-power-manager.c:1934
+#: plugins/power/gsd-power-manager.c:1946
+ msgid "On battery power"
+ msgstr "Batteriebetrieb"
+ 
+ #. TRANSLATORS: this is the sound description
+-#: plugins/power/gsd-power-manager.c:1939
+#: plugins/power/gsd-power-manager.c:1951
+ msgid "On AC power"
+ msgstr "Netzbetrieb"
+ 
+-#: plugins/power/gsd-power-manager.c:2127
+#: plugins/power/gsd-power-manager.c:2139
+ msgid "Automatic logout"
+ msgstr "Automatisch abmelden"
+ 
+-#: plugins/power/gsd-power-manager.c:2127
+#: plugins/power/gsd-power-manager.c:2139
+ msgid "You will soon log out because of inactivity."
+ msgstr "Aufgrund von Inaktivität werden Sie bald abgemeldet."
+ 
+ # oder Automatischer Bereitschaftsmodus
+-#: plugins/power/gsd-power-manager.c:2132
+#: plugins/power/gsd-power-manager.c:2144
+ msgid "Automatic suspend"
+ msgstr "Automatisch in den Bereitschaftsmodus wechseln"
+ 
+-#: plugins/power/gsd-power-manager.c:2132
+-#: plugins/power/gsd-power-manager.c:2137
+#: plugins/power/gsd-power-manager.c:2144
+#: plugins/power/gsd-power-manager.c:2149
+ msgid "Computer will suspend very soon because of inactivity."
+ msgstr ""
+ "Aufgrund von Inaktivität wird der Rechner bald in Bereitschaft versetzt."
+ 
+ # oder Automatischer Ruhezustand
+-#: plugins/power/gsd-power-manager.c:2137
+#: plugins/power/gsd-power-manager.c:2149
+ msgid "Automatic hibernation"
+ msgstr "Automatisch in den Ruhezustand wechseln"
+ 
+@@ -2509,23 +2509,18 @@ msgstr ""
+ "Geräte prüfen."
+ 
+ #: plugins/usb-protection/gsd-usb-protection-manager.c:589
+-#| msgid "New keyboard detected"
+ msgid "New device detected"
+ msgstr "Neues Gerät erkannt"
+ 
+ #: plugins/usb-protection/gsd-usb-protection-manager.c:590
+-#| msgid ""
+-#| "Either your keyboard has been reconnected or a new one has been plugged "
+-#| "in. If you did not do it, check your system for any suspicious device."
+ msgid ""
+ "Either one of your existing devices has been reconnected or a new one has "
+ "been plugged in. If you did not do it, check your system for any suspicious "
+ "device."
+ msgstr ""
+-"Entweder wurde eines Ihrer vorhandenen Geräte neu verbunden oder ein neues"
+-" Gerät wurde "
+-"angeschlossen. Falls Sie nichts dergleichen getan haben, sollten Sie Ihr "
+-"System auf verdächtige Geräte prüfen."
+"Entweder wurde eines Ihrer vorhandenen Geräte neu verbunden oder ein neues "
+"Gerät wurde angeschlossen. Falls Sie nichts dergleichen getan haben, sollten "
+"Sie Ihr System auf verdächtige Geräte prüfen."
+ 
+ #: plugins/usb-protection/gsd-usb-protection-manager.c:596
+ msgid "Reconnect USB device"
--- a/debian/patches/Update-Norwegian-Bokm-l-translation-1.patch
+++ b/debian/patches/Update-Norwegian-Bokm-l-translation-1.patch
--- a/debian/patches/Update-Norwegian-Bokm-l-translation.patch
+++ b/debian/patches/Update-Norwegian-Bokm-l-translation.patch
--- a/debian/patches/Update-Romanian-translation.patch
+++ b/debian/patches/Update-Romanian-translation.patch
--- a/debian/patches/correct_logout_action.patch
+++ b/debian/patches/correct_logout_action.patch
@@ -12,24 +12,24 @@ Subject: correct_logout_action
 plugins/media-keys/gsd-media-keys-manager.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

-diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
-index 8c38590..677a31a 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
-+++ b/plugins/media-keys/gsd-media-keys-manager.c
-@@ -1168,6 +1168,12 @@ gnome_session_shutdown (GsdMediaKeysManager *manager)
-         g_object_unref (proxy);
+Index: gnome-settings-daemon/plugins/media-keys/gsd-media-keys-manager.c
+===================================================================
+--- gnome-settings-daemon.orig/plugins/media-keys/gsd-media-keys-manager.c
+++ gnome-settings-daemon/plugins/media-keys/gsd-media-keys-manager.c
+@@ -1169,6 +1169,12 @@ gnome_session_shutdown (GsdMediaKeysMana
 }
 
-+static void
+ static void
 +do_logout_action (GsdMediaKeysManager *manager)
 +{
 +        execute (manager, "gnome-session-quit --logout", FALSE);
 +}
 +
- static void
+static void
 do_eject_action_cb (GDrive              *drive,
                     GAsyncResult        *res,
-@@ -2674,7 +2680,7 @@ do_action (GsdMediaKeysManager *manager,
+                     GsdMediaKeysManager *manager)
+@@ -2682,7 +2688,7 @@ do_action (GsdMediaKeysManager *manager,
                                  SOUND_ACTION_FLAG_IS_OUTPUT | SOUND_ACTION_FLAG_IS_PRECISE);
                 break;
         case LOGOUT_KEY:

--- a/debian/patches/datetime-Load-Olson-DB-on-the-fly-instead-of-caching-it.patch
+++ b/debian/patches/datetime-Load-Olson-DB-on-the-fly-instead-of-caching-it.patch
+From: Benjamin Berg <bberg@redhat.com>
+Date: Sat, 25 Apr 2020 23:20:30 +0200
+Subject: datetime: Load Olson DB on the fly instead of caching it
+
+We need the database only quite irregularly (i.e. when the location
+change). Just load the database on the fly when we need it, and discard
+it afterwards to free up the memory again.
+
+See also: !168
+
+Origin: upstream, 3.38.2, commit:70cadb750353c398198a6c84e5d78551ebe48851
+---
+ plugins/datetime/gsd-timezone-monitor.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/plugins/datetime/gsd-timezone-monitor.c b/plugins/datetime/gsd-timezone-monitor.c
+index b8ed108..a6e8a48 100644
+--- a/plugins/datetime/gsd-timezone-monitor.c
+++ b/plugins/datetime/gsd-timezone-monitor.c
+@@ -49,7 +49,6 @@ typedef struct
+         GClueSimple *geoclue_simple;
+         GCancellable *geoclue_cancellable;
+ 
+-        TzDB *tzdb;
+         gchar *current_timezone;
+ 
+         GSettings *location_settings;
+@@ -175,15 +174,17 @@ find_timezone (GsdTimezoneMonitor *self,
+                GeocodeLocation    *location,
+                const gchar        *country_code)
+ {
+        TzDB *tzdb;
+         gchar *res;
+         GList *filtered;
+         GList *weather_locations;
+         GList *locations;
+-        GsdTimezoneMonitorPrivate *priv = gsd_timezone_monitor_get_instance_private (self);
+         TzLocation *closest_tz_location;
+ 
+        tzdb = tz_load_db ();
+
+         /* First load locations from Olson DB */
+-        locations = ptr_array_to_list (tz_get_locations (priv->tzdb));
+        locations = ptr_array_to_list (tz_get_locations (tzdb));
+         g_return_val_if_fail (locations != NULL, NULL);
+ 
+         /* ... and then add libgweather's locations as well */
+@@ -208,6 +209,7 @@ find_timezone (GsdTimezoneMonitor *self,
+ 
+         g_list_free (locations);
+         g_list_free_full (weather_locations, (GDestroyNotify) tz_location_free);
+        tz_db_free (tzdb);
+ 
+         return res;
+ }
+@@ -391,7 +393,6 @@ gsd_timezone_monitor_finalize (GObject *obj)
+         g_clear_object (&priv->dtm);
+         g_clear_object (&priv->permission);
+         g_clear_pointer (&priv->current_timezone, g_free);
+-        g_clear_pointer (&priv->tzdb, tz_db_free);
+ 
+         g_clear_object (&priv->location_settings);
+ 
+@@ -463,7 +464,6 @@ gsd_timezone_monitor_init (GsdTimezoneMonitor *self)
+         }
+ 
+         priv->current_timezone = timedate1_dup_timezone (priv->dtm);
+-        priv->tzdb = tz_load_db ();
+ 
+         priv->location_settings = g_settings_new ("org.gnome.system.location");
+         g_signal_connect_swapped (priv->location_settings, "changed::enabled",
--- a/debian/patches/datetime-Query-GWeather-DB-on-the-fly-instead-of-caching.patch
+++ b/debian/patches/datetime-Query-GWeather-DB-on-the-fly-instead-of-caching.patch
+From: Benjamin Berg <bberg@redhat.com>
+Date: Sat, 25 Apr 2020 22:53:48 +0200
+Subject: datetime: Query GWeather DB on the fly instead of caching
+
+We need the database only quite irregularly (i.e. when the location
+change). Just grab the required information from GWeather on the fly and
+destroy it immediately after. Also, use the API to only grab the cities
+of one country instead of filtering them later.
+
+See also: !168
+
+Origin: upstream, 3.38.2, commit:df6c69f028d27b53ac86829e11df103b25ed5a74
+---
+ plugins/datetime/gsd-timezone-monitor.c | 17 ++++++++++-------
+ plugins/datetime/weather-tz.c           | 34 ++++++++++-----------------------
+ plugins/datetime/weather-tz.h           |  6 +-----
+ 3 files changed, 21 insertions(+), 36 deletions(-)
+
+diff --git a/plugins/datetime/gsd-timezone-monitor.c b/plugins/datetime/gsd-timezone-monitor.c
+index ca3e6a7..b8ed108 100644
+--- a/plugins/datetime/gsd-timezone-monitor.c
+++ b/plugins/datetime/gsd-timezone-monitor.c
+@@ -50,7 +50,6 @@ typedef struct
+         GCancellable *geoclue_cancellable;
+ 
+         TzDB *tzdb;
+-        WeatherTzDB *weather_tzdb;
+         gchar *current_timezone;
+ 
+         GSettings *location_settings;
+@@ -171,12 +170,14 @@ find_by_country (GList       *locations,
+         return found;
+ }
+ 
+-static const gchar *
+static gchar *
+ find_timezone (GsdTimezoneMonitor *self,
+                GeocodeLocation    *location,
+                const gchar        *country_code)
+ {
+        gchar *res;
+         GList *filtered;
+        GList *weather_locations;
+         GList *locations;
+         GsdTimezoneMonitorPrivate *priv = gsd_timezone_monitor_get_instance_private (self);
+         TzLocation *closest_tz_location;
+@@ -186,8 +187,9 @@ find_timezone (GsdTimezoneMonitor *self,
+         g_return_val_if_fail (locations != NULL, NULL);
+ 
+         /* ... and then add libgweather's locations as well */
+        weather_locations = weather_tz_db_get_locations (country_code);
+         locations = g_list_concat (locations,
+-                                   weather_tz_db_get_locations (priv->weather_tzdb));
+                                   g_list_copy (weather_locations));
+ 
+         /* Filter tz locations by country */
+         filtered = find_by_country (locations, country_code);
+@@ -202,9 +204,12 @@ find_timezone (GsdTimezoneMonitor *self,
+         locations = sort_by_closest_to (locations, location);
+         closest_tz_location = (TzLocation *) locations->data;
+ 
+        res = g_strdup (closest_tz_location->zone);
+
+         g_list_free (locations);
+        g_list_free_full (weather_locations, (GDestroyNotify) tz_location_free);
+ 
+-        return closest_tz_location->zone;
+        return res;
+ }
+ 
+ static void
+@@ -214,7 +219,7 @@ process_location (GsdTimezoneMonitor *self,
+         GeocodeLocation *location;
+         GsdTimezoneMonitorPrivate *priv = gsd_timezone_monitor_get_instance_private (self);
+         const gchar *country_code;
+-        const gchar *new_timezone;
+        g_autofree gchar *new_timezone = NULL;
+ 
+         country_code = geocode_place_get_country_code (place);
+         location = geocode_place_get_location (place);
+@@ -387,7 +392,6 @@ gsd_timezone_monitor_finalize (GObject *obj)
+         g_clear_object (&priv->permission);
+         g_clear_pointer (&priv->current_timezone, g_free);
+         g_clear_pointer (&priv->tzdb, tz_db_free);
+-        g_clear_pointer (&priv->weather_tzdb, weather_tz_db_free);
+ 
+         g_clear_object (&priv->location_settings);
+ 
+@@ -460,7 +464,6 @@ gsd_timezone_monitor_init (GsdTimezoneMonitor *self)
+ 
+         priv->current_timezone = timedate1_dup_timezone (priv->dtm);
+         priv->tzdb = tz_load_db ();
+-        priv->weather_tzdb = weather_tz_db_new ();
+ 
+         priv->location_settings = g_settings_new ("org.gnome.system.location");
+         g_signal_connect_swapped (priv->location_settings, "changed::enabled",
+diff --git a/plugins/datetime/weather-tz.c b/plugins/datetime/weather-tz.c
+index 2666846..f1de2b9 100644
+--- a/plugins/datetime/weather-tz.c
+++ b/plugins/datetime/weather-tz.c
+@@ -25,11 +25,6 @@
+ #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
+ #include <libgweather/gweather.h>
+ 
+-struct _WeatherTzDB
+-{
+-        GList *tz_locations;
+-};
+-
+ static GList *
+ location_get_cities (GWeatherLocation *parent_location)
+ {
+@@ -104,33 +99,24 @@ load_timezones (GList *cities)
+ }
+ 
+ GList *
+-weather_tz_db_get_locations (WeatherTzDB *tzdb)
+-{
+-        return g_list_copy (tzdb->tz_locations);
+-}
+-
+-WeatherTzDB *
+-weather_tz_db_new (void)
+weather_tz_db_get_locations (const gchar *country_code)
+ {
+         GList *cities;
+        GList *tz_locations;
+         GWeatherLocation *world;
+-        WeatherTzDB *tzdb;
+        GWeatherLocation *country;
+ 
+         world = gweather_location_get_world ();
+-        cities = location_get_cities (world);
+ 
+-        tzdb = g_new0 (WeatherTzDB, 1);
+-        tzdb->tz_locations = load_timezones (cities);
+        country = gweather_location_find_by_country_code (world, country_code);
+ 
+-        g_list_free (cities);
+        if (!country)
+                return NULL;
+ 
+-        return tzdb;
+-}
+        cities = location_get_cities (country);
+        tz_locations = load_timezones (cities);
+ 
+-void
+-weather_tz_db_free (WeatherTzDB *tzdb)
+-{
+-        g_list_free_full (tzdb->tz_locations, (GDestroyNotify) tz_location_free);
+        g_list_free (cities);
+ 
+-        g_free (tzdb);
+        return tz_locations;
+ }
+diff --git a/plugins/datetime/weather-tz.h b/plugins/datetime/weather-tz.h
+index 14de449..15b1571 100644
+--- a/plugins/datetime/weather-tz.h
+++ b/plugins/datetime/weather-tz.h
+@@ -22,10 +22,6 @@
+ 
+ #include <glib.h>
+ 
+-typedef struct _WeatherTzDB WeatherTzDB;
+-
+-WeatherTzDB     *weather_tz_db_new              (void);
+-GList           *weather_tz_db_get_locations    (WeatherTzDB *db);
+-void             weather_tz_db_free             (WeatherTzDB *db);
+GList           *weather_tz_db_get_locations    (const char *country);
+ 
+ #endif /* __WEATHER_TZ_H */
--- a/debian/patches/debian/01_debianize_xrdb.patch
+++ b/debian/patches/debian/01_debianize_xrdb.patch
-From: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
-Date: Thu, 27 Aug 2020 19:08:16 +0200
-Subject: _debianize_xrdb
+From: Laurent Bigonville <bigon@debian.org>
+Date: Thu, 12 Mar 2020 18:05:51 +0100
+Subject: Debianize the 00-xrdb script

+In Debian, /etc/X11/Xresources is a directory, processing of ~/.Xresources
+is controlled by /etc/X11/Xsession.options, and xrdb is not a mandatory
+dependency.
+
+Forwarded: not-needed, Debian-specific
 ---
 plugins/xsettings/00-xrdb | 36 +++++++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

--- 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 82c4159..5b6f4bc 100644
+index 7dbee64..7acf80a 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -104,7 +104,7 @@ libgeoclue_dep = dependency('libgeoclue-2.0', version: '>= 2.3.1')

--- a/debian/patches/power-Avoid-automatic-logout-in-GDM-greeter.patch
+++ b/debian/patches/power-Avoid-automatic-logout-in-GDM-greeter.patch
+From: Benjamin Berg <bberg@redhat.com>
+Date: Thu, 15 Oct 2020 15:18:35 +0200
+Subject: power: Avoid automatic logout in GDM/greeter
+
+In GDM sessions (greeter, initial-setup), it does not make sense to
+automatically logout. This can happen if the system wide default is
+changed to default to the "logout" action.
+
+Note that we already use the RUNNING_UNDER_GDM environment variable in
+the keyboard plugin currently. So doing this is likely sane, even if we
+probably want a more elegant strategy to detect whether we are in a
+"login" session.
+
+Origin: upstream, 3.38.2, commit:10aa1714b05b9834bae7b31e49742baf707b35cb
+---
+ plugins/power/gsd-power-manager.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
+index 0e65bd2..cecd53f 100644
+--- a/plugins/power/gsd-power-manager.c
+++ b/plugins/power/gsd-power-manager.c
+@@ -985,6 +985,9 @@ static void
+ gnome_session_logout (GsdPowerManager *manager,
+                       guint            logout_mode)
+ {
+        if (g_getenv("RUNNING_UNDER_GDM"))
+                return;
+
+         g_dbus_proxy_call (G_DBUS_PROXY (manager->session),
+                            "Logout",
+                            g_variant_new ("(u)", logout_mode),