diff -pruN 43.0-1/debian/changelog 43.0-1ubuntu1/debian/changelog --- 43.0-1/debian/changelog 2022-09-21 12:32:51.000000000 +0000 +++ 43.0-1ubuntu1/debian/changelog 2022-09-21 12:34:45.000000000 +0000 @@ -1,15 +1,39 @@ +gnome-disk-utility (43.0-1ubuntu1) kinetic; urgency=medium + + * Merge with unstable. Remaining change: + - Add dont-use-libdvdread.patch: + + Revert commit that depends on libdvdread since it's in universe + + -- Jeremy Bicha Wed, 21 Sep 2022 08:34:45 -0400 + gnome-disk-utility (43.0-1) unstable; urgency=medium * New upstream release -- Jeremy Bicha Wed, 21 Sep 2022 08:32:51 -0400 +gnome-disk-utility (43~rc-1ubuntu1) kinetic; urgency=medium + + * Merge with unstable. Remaining change: + - Add dont-use-libdvdread.patch: + + Revert commit that depends on libdvdread since it's in universe + + -- Jeremy Bicha Wed, 07 Sep 2022 10:38:31 -0400 + gnome-disk-utility (43~rc-1) unstable; urgency=medium * New upstream release -- Jeremy Bicha Wed, 07 Sep 2022 10:36:57 -0400 +gnome-disk-utility (43~beta-1ubuntu1) kinetic; 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 Wed, 10 Aug 2022 09:02:26 -0400 + gnome-disk-utility (43~beta-1) unstable; urgency=medium * New upstream release @@ -18,12 +42,28 @@ gnome-disk-utility (43~beta-1) unstable; -- Jeremy Bicha Mon, 08 Aug 2022 13:47:46 -0400 +gnome-disk-utility (42.0-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 Fri, 18 Mar 2022 17:40:32 -0400 + gnome-disk-utility (42.0-1) unstable; urgency=medium * New upstream release -- Jeremy Bicha Fri, 18 Mar 2022 17:38:06 -0400 +gnome-disk-utility (42~rc-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 Tue, 08 Mar 2022 16:52:35 -0500 + gnome-disk-utility (42~rc-1) unstable; urgency=medium * New upstream release @@ -36,6 +76,14 @@ gnome-disk-utility (42~beta-2) unstable; -- Jeremy Bicha Mon, 14 Feb 2022 13:09:20 -0500 +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 Fri, 11 Feb 2022 14:50:17 -0500 + gnome-disk-utility (42~beta-1) experimental; urgency=medium * New upstream release @@ -43,6 +91,14 @@ gnome-disk-utility (42~beta-1) experimen -- Jeremy Bicha Fri, 11 Feb 2022 14:46:02 -0500 +gnome-disk-utility (41.0-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 Fri, 24 Sep 2021 11:37:30 +0200 + gnome-disk-utility (41.0-1) unstable; urgency=medium * New upstream release @@ -122,6 +178,20 @@ gnome-disk-utility (3.38.0-1) unstable; -- Iain Lane Mon, 14 Sep 2020 13:04:09 +0100 +gnome-disk-utility (3.36.3-1ubuntu1) groovy; urgency=medium + + * Sync with Debian. Remaining change: + - Add dont-use-libdvdread.patch: + + Revert commit that depends on libdvdread since it's in universe + + -- Sebastien Bacher Mon, 27 Jul 2020 16:17:01 +0200 + +gnome-disk-utility (3.36.3-1) unstable; urgency=medium + + * New upstream release + + -- Sebastien Bacher Mon, 27 Jul 2020 16:07:30 +0200 + gnome-disk-utility (3.36.1-1) unstable; urgency=medium * New upstream release diff -pruN 43.0-1/debian/control 43.0-1ubuntu1/debian/control --- 43.0-1/debian/control 2022-09-21 12:32:51.000000000 +0000 +++ 43.0-1ubuntu1/debian/control 2022-09-21 12:34:45.000000000 +0000 @@ -5,7 +5,8 @@ Source: gnome-disk-utility Section: admin Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: Iain Lane , Jeremy Bicha , Laurent Bigonville , Michael Biebl , Sebastien Bacher , Tim Lunn Build-Depends: appstream-util, debhelper-compat (= 13), @@ -28,8 +29,10 @@ Build-Depends: appstream-util, xsltproc, Rules-Requires-Root: no Standards-Version: 4.6.1 -Vcs-Git: https://salsa.debian.org/gnome-team/gnome-disk-utility.git -Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-disk-utility +XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-disk-utility.git +XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-disk-utility +Vcs-Git: https://salsa.debian.org/gnome-team/gnome-disk-utility.git -b ubuntu/master +Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-disk-utility/tree/ubuntu/master Homepage: https://wiki.gnome.org/Apps/Disks Package: gnome-disk-utility diff -pruN 43.0-1/debian/control.in 43.0-1ubuntu1/debian/control.in --- 43.0-1/debian/control.in 2022-09-21 12:32:51.000000000 +0000 +++ 43.0-1ubuntu1/debian/control.in 2022-09-21 12:34:45.000000000 +0000 @@ -1,7 +1,8 @@ Source: gnome-disk-utility Section: admin Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Build-Depends: appstream-util, debhelper-compat (= 13), @@ -24,8 +25,10 @@ Build-Depends: appstream-util, xsltproc, Rules-Requires-Root: no Standards-Version: 4.6.1 -Vcs-Git: https://salsa.debian.org/gnome-team/gnome-disk-utility.git -Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-disk-utility +XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-disk-utility.git +XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-disk-utility +Vcs-Git: https://salsa.debian.org/gnome-team/gnome-disk-utility.git -b ubuntu/master +Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-disk-utility/tree/ubuntu/master Homepage: https://wiki.gnome.org/Apps/Disks Package: gnome-disk-utility diff -pruN 43.0-1/debian/gbp.conf 43.0-1ubuntu1/debian/gbp.conf --- 43.0-1/debian/gbp.conf 2022-09-21 12:32:51.000000000 +0000 +++ 43.0-1ubuntu1/debian/gbp.conf 2022-09-21 12:34:45.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 [buildpackage] diff -pruN 43.0-1/debian/patches/dont-use-libdvdread.patch 43.0-1ubuntu1/debian/patches/dont-use-libdvdread.patch --- 43.0-1/debian/patches/dont-use-libdvdread.patch 1970-01-01 00:00:00.000000000 +0000 +++ 43.0-1ubuntu1/debian/patches/dont-use-libdvdread.patch 2022-09-21 12:34:45.000000000 +0000 @@ -0,0 +1,233 @@ +From: David Zeuthen +Date: Sat, 20 Oct 2012 01:36:48 +0000 +Subject: Revert "Use libdvdcss for creating disk images of DVDs, + if available" + +Without this change, the archive process may fail for some DVD video +discs with "Add. Sense: Read of scrambled sector without +authentication". + +This commit does NOT add a hard dependency on libdvdcss (which would +be bad as this library isn't even shipped in most OSes) since it's +accessed via dlopen(). If libdvdcss is not available on the system, we +simply fall back to reading data using the standard libc interfaces +(e.g. read(2)). + +License-wise there is no problem with this approach: libdvdcss is +licensed under the GPLv2+ which is exactly the same license as Disks +itself. + +This dlopen() approach is nothing new - it's also used in Brasero, +VLC, mplayer, Totem and many other applications. + +Signed-off-by: David Zeuthen +--- + meson.build | 1 - + src/disks/gducreatediskimagedialog.c | 90 +++++++++--------------------------- + src/disks/meson.build | 2 - + 3 files changed, 23 insertions(+), 70 deletions(-) + +Index: gnome-disk-utility-3.33.90/meson.build +=================================================================== +--- gnome-disk-utility-3.33.90.orig/meson.build ++++ gnome-disk-utility-3.33.90/meson.build +@@ -68,7 +68,6 @@ endif + + add_project_arguments(compiler_flags, language: 'c') + +-dvdread_dep = dependency('dvdread', version: '>= 4.2.0') + gio_unix_dep = dependency('gio-unix-2.0', version: '>= 2.31.0') + gmodule_dep = dependency('gmodule-2.0') + gtk_dep = dependency('gtk+-3.0', version: '>= 3.16.0') +Index: gnome-disk-utility-3.33.90/src/disks/gducreatediskimagedialog.c +=================================================================== +--- gnome-disk-utility-3.33.90.orig/src/disks/gducreatediskimagedialog.c ++++ gnome-disk-utility-3.33.90/src/disks/gducreatediskimagedialog.c +@@ -17,6 +17,7 @@ + #include + #include + ++#include + #include + #include + #include +@@ -30,8 +31,6 @@ + #include "gduestimator.h" + #include "gdulocaljob.h" + +-#include "gdudvdsupport.h" +- + /* TODOs / ideas for Disk Image creation + * + * - Be tolerant of I/O errors like dd_rescue(1), see http://www.gnu.org/s/ddrescue/ddrescue.html +@@ -75,7 +74,6 @@ typedef struct + GduEstimator *estimator; + + gboolean allocating_file; +- gboolean retrieving_dvd_keys; + guint64 num_error_bytes; + gint64 start_time_usec; + gint64 end_time_usec; +@@ -342,10 +340,6 @@ update_job (DialogData *data, + { + extra_markup = g_strdup (_("Allocating Disk Image")); + } +- else if (data->retrieving_dvd_keys) +- { +- extra_markup = g_strdup (_("Retrieving DVD keys")); +- } + + if (num_error_bytes > 0) + { +@@ -531,7 +525,6 @@ copy_span (int fd, + guint64 size, + guchar *buffer, + gboolean pad_with_zeroes, +- GduDVDSupport *dvd_support, + GCancellable *cancellable, + GError **error) + { +@@ -545,45 +538,35 @@ copy_span (int fd, + g_return_val_if_fail (-1, cancellable == NULL || G_IS_CANCELLABLE (cancellable)); + g_return_val_if_fail (-1, error == NULL || *error == NULL); + +- if (dvd_support != NULL) ++ if (lseek (fd, offset, SEEK_SET) == (off_t) -1) + { +- num_bytes_read = gdu_dvd_support_read (dvd_support, fd, buffer, offset, size); ++ g_set_error (error, ++ G_IO_ERROR, g_io_error_from_errno (errno), ++ "Error seeking to offset %" G_GUINT64_FORMAT ": %s", ++ offset, strerror (errno)); ++ goto out; ++ } ++ ++ copy_read_again: ++ num_bytes_read = read (fd, buffer, size); ++ if (num_bytes_read < 0) ++ { ++ if (errno == EAGAIN || errno == EINTR) ++ goto copy_read_again; ++ /* do not consider this an error - treat as zero bytes read */ ++ num_bytes_read = 0; + } + else + { +- if (lseek (fd, offset, SEEK_SET) == (off_t) -1) ++ /* EOF */ ++ if (num_bytes_read == 0) + { + g_set_error (error, +- G_IO_ERROR, g_io_error_from_errno (errno), +- "Error seeking to offset %" G_GUINT64_FORMAT ": %s", +- offset, strerror (errno)); ++ G_IO_ERROR, G_IO_ERROR_FAILED, ++ "Reading from offset %" G_GUINT64_FORMAT " returned zero bytes", ++ offset); + goto out; + } +- read_again: +- num_bytes_read = read (fd, buffer, size); +- if (num_bytes_read < 0) +- { +- if (errno == EAGAIN || errno == EINTR) +- goto read_again; +- } +- else +- { +- /* EOF */ +- if (num_bytes_read == 0) +- { +- g_set_error (error, +- G_IO_ERROR, G_IO_ERROR_FAILED, +- "Reading from offset %" G_GUINT64_FORMAT " returned zero bytes", +- offset); +- goto out; +- } +- } +- } +- +- if (num_bytes_read < 0) +- { +- /* do not consider this an error - treat as zero bytes read */ +- num_bytes_read = 0; + } + + num_bytes_to_write = num_bytes_read; +@@ -632,7 +615,6 @@ static gpointer + copy_thread_func (gpointer user_data) + { + DialogData *data = user_data; +- GduDVDSupport *dvd_support = NULL; + guchar *buffer_unaligned = NULL; + guchar *buffer = NULL; + guint64 block_device_size = 0; +@@ -657,29 +639,7 @@ copy_thread_func (gpointer user_data) + */ + if (g_str_has_prefix (udisks_block_get_device (data->block), "/dev/sr")) + { +- const gchar *device_file = udisks_block_get_device (data->block); +- fd = open (device_file, O_RDONLY); +- +- /* Use libdvdcss (if available on the system) on DVDs with UDF +- * filesystems - otherwise the backup process may fail because +- * of unreadable/scrambled sectors +- */ +- if (g_strcmp0 (udisks_block_get_id_usage (data->block), "filesystem") == 0 && +- g_strcmp0 (udisks_block_get_id_type (data->block), "udf") == 0 && +- g_str_has_prefix (udisks_drive_get_media (data->drive), "optical_dvd")) +- { +- g_mutex_lock (&data->copy_lock); +- data->retrieving_dvd_keys = TRUE; +- g_mutex_unlock (&data->copy_lock); +- g_idle_add (on_update_job, dialog_data_ref (data)); +- +- dvd_support = gdu_dvd_support_new (device_file, udisks_block_get_size (data->block)); +- +- g_mutex_lock (&data->copy_lock); +- data->retrieving_dvd_keys = FALSE; +- g_mutex_unlock (&data->copy_lock); +- g_idle_add (on_update_job, dialog_data_ref (data)); +- } ++ fd = open (udisks_block_get_device (data->block), O_RDONLY); + } + + /* Otherwise, request the fd from udisks */ +@@ -814,7 +774,6 @@ copy_thread_func (gpointer user_data) + num_bytes_to_read, + buffer, + TRUE, /* pad_with_zeroes */ +- dvd_support, + data->cancellable, + &error); + if (num_bytes_read < 0) +@@ -836,9 +795,6 @@ copy_thread_func (gpointer user_data) + } + + out: +- if (dvd_support != NULL) +- gdu_dvd_support_free (dvd_support); +- + data->end_time_usec = g_get_real_time (); + + /* in either case, close the stream */ +Index: gnome-disk-utility-3.33.90/src/disks/meson.build +=================================================================== +--- gnome-disk-utility-3.33.90.orig/src/disks/meson.build ++++ gnome-disk-utility-3.33.90/src/disks/meson.build +@@ -17,7 +17,6 @@ sources = files( + 'gducrypttabdialog.c', + 'gdudevicetreemodel.c', + 'gdudisksettingsdialog.c', +- 'gdudvdsupport.c', + 'gduestimator.c', + 'gdufilesystemdialog.c', + 'gduformatdiskdialog.c', +@@ -82,7 +81,6 @@ sources += gnome.mkenums( + ) + + deps = [ +- dvdread_dep, + gio_unix_dep, + gmodule_dep, + libcanberra_dep, diff -pruN 43.0-1/debian/patches/series 43.0-1ubuntu1/debian/patches/series --- 43.0-1/debian/patches/series 2022-09-21 12:32:51.000000000 +0000 +++ 43.0-1ubuntu1/debian/patches/series 2022-09-21 12:34:45.000000000 +0000 @@ -0,0 +1 @@ +dont-use-libdvdread.patch