Марко Костић · Sophie Herold · Trần Ngọc Quân · Ian Santopietro · Dušan Kazik · Maximiliano Sandoval R
--- a/.gitignore
+++ b/.gitignore
+/subprojects/libhandy/
+app/
+builddir/
+org.gnome.DiskUtility.flatpak
+repo/
+_build/
+.flatpak-builder/
--- a/NEWS
+++ b/NEWS
+42.beta - February 11, 2022
+===========================
+
+Kai Lüke:
+ * Restore old window destruction to fix data retrieval
+
+Updated translations:
+ * Marek Černocký (cs), Matej Urbančič (sl), Quentin PAGÈS (oc),
+   Rafael Fontenelle (pt_BR), sicklylife (ja)
+
+42.alpha - January 7, 2022
+==========================
+
+Alexander Mikhaylenko:
+ * Support dark theme preference (required to bump libhandy to 1.5.0)
+
+Maximiliano Sandoval R:
+ * Rewrite GUI parts to avoid deprecated things and prepare for GTK 4
+
+Ian Santopietro:
+ * Improve the visual appearance of the devtab toolbar
+
+Sophie Herold:
+ * metainfo: Align app name with .desktop name
+
+Updated translations:
+ * Alexey Rubtsov (ru), Asier Sarasua Garmendia (eu), Boyuan Yang (zh_CN),
+   Daniel Mustieles (es), Dušan Kazik (sk), Fabio Tomat (fur),
+   Fran Dieguez (gl), Goran Vidović (hr), Hugo Carvalho (pt),
+   Kukuh Syafaat (id), MohammadSaleh Kamyab (fa), Ngọc Quân Trần (vi),
+   Quentin PAGÈS (oc), Rūdolfs Mazurs (lv), Yaron Shahrabani (he),
+   Yuri Chornoivan (uk), Марко Костић (sr)
+
 41.0 - September 18, 2021
 =========================


--- a/data/meson.build
+++ b/data/meson.build
@@ -11,7 +11,6 @@ desktops = [

 foreach desktop: desktops
  i18n.merge_file (
-    desktop,
    type: 'desktop',
    input: desktop + '.in',
    output: desktop,
@@ -38,7 +37,6 @@ install_data(
 info = 'org.gnome.DiskUtility.appdata.xml'

 i18n.merge_file(
-  info,
  input: info + '.in',
  output: info,
  po_dir: po_dir,

--- a/data/org.gnome.DiskUtility.appdata.xml.in
+++ b/data/org.gnome.DiskUtility.appdata.xml.in
@@ -4,7 +4,7 @@
  <id>org.gnome.DiskUtility.desktop</id>
  <metadata_license>CC0-1.0</metadata_license>
  <project_license>GPL-2.0+</project_license>
-  <name>GNOME Disks</name>
+  <name>Disks</name>
  <summary>Disk management utility for GNOME</summary>
  <description>
    <p>

--- a/debian/changelog
+++ b/debian/changelog
+gnome-disk-utility (42~beta-1ubuntu1) jammy; urgency=medium
+
+  * Merge with unstable. Remaining changes:
+    - Add dont-use-libdvdread.patch:
+      + Revert commit that depends on libdvdread since it's in universe
+
+ -- Jeremy Bicha <jeremy.bicha@canonical.com>  Fri, 11 Feb 2022 14:50:17 -0500
+
+gnome-disk-utility (42~beta-1) experimental; urgency=medium
+
+  * New upstream release
+  * debian/control.in: Bump minimum libhandy to 1.5.0
+
+ -- Jeremy Bicha <jeremy.bicha@canonical.com>  Fri, 11 Feb 2022 14:46:02 -0500
+
 gnome-disk-utility (41.0-1ubuntu1) impish; urgency=medium

  * Merge with unstable. Remaining changes:

--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends: appstream-util,
               libdvdread-dev (>= 4.2.0),
               libglib2.0-dev (>= 2.31.0),
               libgtk-3-dev (>= 3.16.0),
-               libhandy-1-dev (>= 1.1.90),
+               libhandy-1-dev (>= 1.5.0),
               liblzma-dev (>= 5.0.5),
               libnotify-dev (>= 0.7),
               libpwquality-dev (>= 1.0.0),

--- a/debian/control.in
+++ b/debian/control.in
@@ -12,7 +12,7 @@ Build-Depends: appstream-util,
               libdvdread-dev (>= 4.2.0),
               libglib2.0-dev (>= 2.31.0),
               libgtk-3-dev (>= 3.16.0),
-               libhandy-1-dev (>= 1.1.90),
+               libhandy-1-dev (>= 1.5.0),
               liblzma-dev (>= 5.0.5),
               libnotify-dev (>= 0.7),
               libpwquality-dev (>= 1.0.0),

--- a/flatpak/org.gnome.DiskUtility.json
+++ b/flatpak/org.gnome.DiskUtility.json
@@ -318,16 +318,6 @@
                }
            ]
        },
-        {
-            "name" : "libhandy",
-            "buildsystem": "meson",
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/libhandy.git"
-                }
-            ]
-        },
        {
            "name" : "udisks2",
            "buildsystem" : "autotools",

--- a/meson.build
+++ b/meson.build
 project(
  'gnome-disk-utility', 'c',
-  version: '41.0',
+  version: '42.beta',
  license: 'GPL2.0',
  default_options: 'buildtype=debugoptimized',
  meson_version: '>= 0.50.0',
@@ -74,7 +74,7 @@ gmodule_dep = dependency('gmodule-2.0')
 gtk_dep = dependency('gtk+-3.0', version: '>= 3.16.0')
 libcanberra_dep = dependency('libcanberra-gtk3', version: '>= 0.1')
 # Keep the version here synchronised with subprojects/libhandy.wrap
-libhandy_dep = dependency('libhandy-1', version: '>= 1.1.90', fallback: ['libhandy', 'libhandy_dep'])
+libhandy_dep = dependency('libhandy-1', version: '>= 1.5.0', fallback: ['libhandy', 'libhandy_dep'])
 liblzma_dep = dependency('liblzma', version: '>= 5.0.5')
 libnotify_dep = dependency('libnotify', version: '>= 0.7')
 libsecret_dep = dependency('libsecret-1', version: '>= 0.7')

--- a/po/cs.po
+++ b/po/cs.po
--- a/po/es.po
+++ b/po/es.po
--- a/po/eu.po
+++ b/po/eu.po
--- a/po/fa.po
+++ b/po/fa.po
--- a/po/fur.po
+++ b/po/fur.po
--- a/po/gl.po
+++ b/po/gl.po
--- a/po/he.po
+++ b/po/he.po
--- a/po/hr.po
+++ b/po/hr.po
--- a/po/id.po
+++ b/po/id.po
--- a/po/ja.po
+++ b/po/ja.po
--- a/po/lv.po
+++ b/po/lv.po