Alexey Rubtsov · Kai Lüke · Manuel Wassermann · Kai Lüke · Manuel Wassermann · Kai Lüke
--- a/NEWS
+++ b/NEWS
+41.beta - August 14, 2021
+=========================
+
+Manuel Wassermann:
+ * gducreateformatdialog: Use LUKS2 for new encrypted partitions
+ * volume-menu/gduwindow: Add button and dialog to take filesystem ownership
+ * ui: Change the icon of the detach loop device button
+ * shortcuts: Add keyboard shortcut for the application menu
+ * gduwindow: Make menus toggleable
+ * ui: Change the icon of the job cancel button
+ * ui: Align job section
+ * ui: Enable ellipsis on the job remaining label
+ * gdubenchmarkdialog: Save benchmark settings
+ * Flatpak build fixes
+
+Kai Lüke:
+ * Flatpak build fixes
+
+Updated translations:
+ * Alexey Rubtsov (ru), Boyuan Yang (zh_CN), Daniel Mustieles (es),
+   Emin Tufan Çetin (tr), Enrico Nicoletto (pt_BR), Fabio Tomat (fur),
+   Hugo Carvalho (pt), Jordi Mas (ca), Kukuh Syafaat (id), Marek Černocký (cs),
+   Matej Urbančič (sl), Quentin PAGÈS (oc), Rafael Fontenelle (pt_BR),
+   Yaron Shahrabani (he), Yuri Chornoivan (uk)
+
+41.alpha - July 11, 2021
+========================
+
+Manuel Wassermann:
+ * gdusdmonitor: Fix notification icon
+ * UI: Highlight destructive actions
+
+Kai Lüke:
+ * Escape hyperlink text in mount point label
+
+Updated translations:
+ * Alexey Rubtsov (ru)
+
 40.1 - May 1, 2021
 ==================


--- a/TODO
+++ b/TODO
 This list is old and not updated, first take a look at
-https://bugzilla.gnome.org/buglist.cgi?quicksearch=product:gnome-disk-utility
+https://gitlab.gnome.org/GNOME/gnome-disk-utility/-/issues/
 and https://wiki.gnome.org/Apps/Disks

 - For optical drives, replace "Create Disk Image…" with "Burn Image to Disc…"

--- a/data/org.gnome.Disks.gschema.xml
+++ b/data/org.gnome.Disks.gschema.xml
@@ -7,4 +7,22 @@
      <description>Default location for the Create/Restore disk image dialogs. If blank the ~/Documents folder is used.</description>
    </key>
  </schema>
+  <schema id="org.gnome.Disks.benchmark" path="/org/gnome/Disks/benchmark/" gettext-domain="gnome-disk-utility">
+    <key name="num-samples" type="i">
+     <default>100</default>
+      <summary>The number of samples the benchmark will include for the read/write test.</summary>
+    </key>
+    <key name="sample-size-mib" type="i">
+     <default>10</default>
+      <summary>The number of MiB (1048576 bytes) to read/write for each sample.</summary>
+    </key>
+    <key name="do-write" type="b">
+      <default>true</default>
+      <summary>To enable or disable the write test.</summary>
+    </key>
+    <key name="num-access-samples" type="i">
+      <default>1000</default>
+      <summary>The number of samples the benchmark will do for the access time test.</summary>
+    </key>
+  </schema>
 </schemalist>
--- a/debian/changelog
+++ b/debian/changelog
-gnome-disk-utility (40.1-1ubuntu1) impish; urgency=medium
+gnome-disk-utility (41~beta-1ubuntu1) impish; urgency=medium

  * Merge with unstable. Remaining changes:
    - Add dont-use-libdvdread.patch:
      + Revert commit that depends on libdvdread since it's in universe

- -- Sebastien Bacher <seb128@ubuntu.com>  Mon, 03 May 2021 10:52:39 +0200
+ -- Sebastien Bacher <seb128@ubuntu.com>  Mon, 23 Aug 2021 12:35:09 +0200
+
+gnome-disk-utility (41~beta-1) experimental; urgency=medium
+
+  * New upstream release
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Mon, 23 Aug 2021 12:30:08 +0200
+
+gnome-disk-utility (40.2-1) unstable; urgency=medium
+
+  * New upstream release
+  * Bump debhelper-compat to 13
+  * Build-Depend on dh-sequence-gnome instead of gnome-pkg-tools
+  * debian/rules: Simplify a bit
+
+ -- Jeremy Bicha <jbicha@debian.org>  Sun, 22 Aug 2021 23:32:50 -0400

 gnome-disk-utility (40.1-1) experimental; urgency=medium


--- a/debian/control
+++ b/debian/control
@@ -7,11 +7,11 @@ Section: admin
 Priority: optional
 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>, Sebastien Bacher <seb128@debian.org>, Tim Lunn <tim@feathertop.org>
+Uploaders: Iain Lane <laney@debian.org>, Jeremy Bicha <jbicha@debian.org>, Laurent Bigonville <bigon@debian.org>, Sebastien Bacher <seb128@debian.org>
 Build-Depends: appstream-util,
-               debhelper-compat (= 12),
+               debhelper-compat (= 13),
+               dh-sequence-gnome,
               docbook-xsl,
-               gnome-pkg-tools,
               libcanberra-gtk3-dev (>= 0.1),
               libdvdread-dev (>= 4.2.0),
               libglib2.0-dev (>= 2.31.0),

--- a/debian/control.in
+++ b/debian/control.in
@@ -5,9 +5,9 @@ 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: appstream-util,
-               debhelper-compat (= 12),
+               debhelper-compat (= 13),
+               dh-sequence-gnome,
               docbook-xsl,
-               gnome-pkg-tools,
               libcanberra-gtk3-dev (>= 0.1),
               libdvdread-dev (>= 4.2.0),
               libglib2.0-dev (>= 2.31.0),

--- a/debian/rules
+++ b/debian/rules
 #!/usr/bin/make -f

 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,-z,defs -Wl,--as-needed
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,-z,defs

 %:
-	dh $@ --with gnome
+	dh $@

-override_dh_install:
-	dh_install
-	# when building for Ubuntu, move menu entry from Apps → System Tools
-	# (which Ubuntu tries to avoid) to System → Administration.
-	if dpkg-vendor --is ubuntu; then \
-	    sed -i '/^Categories=/ s/$$/Settings;HardwareSettings;/' debian/gnome-disk-utility/usr/share/applications/*.desktop; \
-	fi
+# when building for Ubuntu, move menu entry from Apps → System Tools
+# (which Ubuntu tries to avoid) to System → Administration.
+ifeq ($(shell dpkg-vendor --query vendor),Ubuntu)
+execute_after_dh_install:
+	sed -i '/^Categories=/ s/$$/Settings;HardwareSettings;/' debian/gnome-disk-utility/usr/share/applications/*.desktop
+endif
--- a/debian/watch
+++ b/debian/watch
 version=4
-opts="uversionmangle=s/\.(alpha|beta|rc)/~$1/" \
-https://download.gnome.org/sources/@PACKAGE@/@ANY_VERSION@/ \
-	@PACKAGE@@ANY_VERSION@\.tar\.xz
+opts="searchmode=plain, uversionmangle=s/\.(alpha|beta|rc)/~$1/" \
+https://download.gnome.org/sources/@PACKAGE@/cache.json \
+	\d+/@PACKAGE@-([\d.]+)@ARCHIVE_EXT@
--- a/doc/man/gnome-disk-image-mounter.xml
+++ b/doc/man/gnome-disk-image-mounter.xml
@@ -59,7 +59,7 @@
    <para>
      Please send bug reports to either the distribution bug tracker
      or the upstream bug tracker at
-      <ulink url="https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-disk-utility"/>.
+      <ulink url="https://gitlab.gnome.org/GNOME/gnome-disk-utility/-/issues/"/>.
    </para>
  </refsect1>


--- a/doc/man/gnome-disks.xml
+++ b/doc/man/gnome-disks.xml
@@ -107,7 +107,7 @@
    <para>
      Please send bug reports to either the distribution bug tracker
      or the upstream bug tracker at
-      <ulink url="https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-disk-utility"/>.
+      <ulink url="https://gitlab.gnome.org/GNOME/gnome-disk-utility/-/issues/"/>.
    </para>
  </refsect1>


--- a/flatpak/org.gnome.DiskUtility.json
+++ b/flatpak/org.gnome.DiskUtility.json
@@ -167,6 +167,15 @@
                }
            ]
        },
+        {
+            "name" : "popt",
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://github.com/rpm-software-management/popt.git"
+                }
+            ]
+        },
        {
            "name" : "cryptsetup",
            "buildsystem" : "autotools",
@@ -193,6 +202,16 @@
                }
            ]
        },
+        {
+            "name" : "yaml",
+            "sources" : [
+                {
+                    "type" : "archive",
+                    "url" : "https://github.com/yaml/libyaml/releases/download/0.2.5/yaml-0.2.5.tar.gz",
+                    "sha256" : "c642ae9b75fee120b2d96c712538bd2cf283228d2337df2cf2988e3c02678ef4"
+                }
+            ]
+        },
        {
            "name" : "blockdev",
            "config-opts" : [
@@ -212,7 +231,8 @@
            "sources" : [
                {
                    "type" : "git",
-                    "url" : "https://github.com/storaged-project/libblockdev.git"
+                    "url" : "https://github.com/storaged-project/libblockdev.git",
+                    "branch": "2.x-branch"
                }
            ]
        },

--- a/meson.build
+++ b/meson.build
 project(
  'gnome-disk-utility', 'c',
-  version: '40.1',
+  version: '41.beta',
  license: 'GPL2.0',
  default_options: 'buildtype=debugoptimized',
  meson_version: '>= 0.50.0',

--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -61,6 +61,7 @@ src/disks/ui/resize-dialog.ui
 src/disks/ui/restore-disk-image-dialog.ui
 src/disks/ui/shortcuts.ui
 src/disks/ui/smart-dialog.ui
+src/disks/ui/take-ownership-dialog.ui
 src/disks/ui/unlock-device-dialog.ui
 src/disks/ui/volume-menu.ui
 src/libgdu/gduutils.c

--- a/po/ca.po
+++ b/po/ca.po
--- a/po/cs.po
+++ b/po/cs.po
--- a/po/es.po
+++ b/po/es.po
--- a/po/fur.po
+++ b/po/fur.po
--- a/po/he.po
+++ b/po/he.po
--- a/po/id.po
+++ b/po/id.po
--- a/po/oc.po
+++ b/po/oc.po