diff --git a/deja-dup-36.0.tar.xz b/deja-dup-36.0.tar.xz deleted file mode 100644 index 37d0416..0000000 --- a/deja-dup-36.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5799e6f857f20742d786ad8d8e5be9fc206aba5f64f05c2f5cfe19637ddd25d7 -size 712288 diff --git a/deja-dup-36.1.tar.xz b/deja-dup-36.1.tar.xz new file mode 100644 index 0000000..8b3ce91 --- /dev/null +++ b/deja-dup-36.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d5aaa802e4dcf5c829e69db431849a13c4fc948a7137dc6fd93dfdcb59888e8 +size 712712 diff --git a/deja-dup-fix-setting-drive-volume.patch b/deja-dup-fix-setting-drive-volume.patch deleted file mode 100644 index 9944eb9..0000000 --- a/deja-dup-fix-setting-drive-volume.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 3390fd1b0a906b8bd4d859922844b3d57b7f5fdd Mon Sep 17 00:00:00 2001 -From: Michael Terry -Date: Thu, 14 Sep 2017 11:41:38 -0400 -Subject: BackendDrive: Fix setting a drive volume - -Use get_uuid() instead of get_identifier(UUID) because it gets the -user-friendly version (i.e. the unencrypted partition, not the outer -LUKS partition). - -And actually set the drive UUID when choosing it in the settings. - -https://launchpad.net/bugs/1717230 - -diff --git a/deja-dup/widgets/ConfigLocation.vala b/deja-dup/widgets/ConfigLocation.vala -index d51d241..8bd092e 100644 ---- a/deja-dup/widgets/ConfigLocation.vala -+++ b/deja-dup/widgets/ConfigLocation.vala -@@ -424,8 +424,7 @@ public class ConfigLocation : ConfigWidget - { - if (is_allowed_volume(v)) - { -- add_volume_full(v.get_identifier(VolumeIdentifier.UUID), -- v.get_name(), v.get_icon()); -+ add_volume_full(v.get_uuid(), v.get_name(), v.get_icon()); - } - } - -@@ -445,8 +444,7 @@ public class ConfigLocation : ConfigWidget - - void update_volume(VolumeMonitor monitor, Volume v) - { -- update_volume_full(v.get_identifier(VolumeIdentifier.UUID), -- v.get_name(), v.get_icon()); -+ update_volume_full(v.get_uuid(), v.get_name(), v.get_icon()); - } - - void update_volume_full(string uuid, string name, Icon icon) -@@ -460,7 +458,7 @@ public class ConfigLocation : ConfigWidget - - void remove_volume(VolumeMonitor monitor, Volume v) - { -- remove_volume_full(v.get_identifier(VolumeIdentifier.UUID)); -+ remove_volume_full(v.get_uuid()); - } - - void remove_volume_full(string uuid) -@@ -622,6 +620,7 @@ public class ConfigLocation : ConfigWidget - - // First things first, we must remember that we set a volume - all_settings[""].set_string(BACKEND_KEY, "drive"); -+ all_settings[DRIVE_ROOT].set_string(DRIVE_UUID_KEY, uuid); - - var vol = VolumeMonitor.get().get_volume_for_uuid(uuid); - if (vol == null) { -diff --git a/libdeja/BackendDrive.vala b/libdeja/BackendDrive.vala -index dcfe450..86c752c 100644 ---- a/libdeja/BackendDrive.vala -+++ b/libdeja/BackendDrive.vala -@@ -125,7 +125,7 @@ public class BackendDrive : BackendFile - var icon = volume.get_icon(); - - // sanity check that these writable settings are for this volume -- var vol_uuid = volume.get_identifier(VolumeIdentifier.UUID); -+ var vol_uuid = volume.get_uuid(); - var settings_uuid = settings.get_string(DRIVE_UUID_KEY); - if (vol_uuid != settings_uuid) - return; --- -cgit v0.10.2 - diff --git a/deja-dup.changes b/deja-dup.changes index 945e0e3..8c7ceb9 100644 --- a/deja-dup.changes +++ b/deja-dup.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Sep 30 00:14:29 UTC 2017 - luc14n0@linuxmail.org + +- Update to version 36.1: + + Fix backing up to external drives. + + Updated translations. +- Drop deja-dup-fix-setting-drive-volume.patch: Fixed upstream. + ------------------------------------------------------------------- Fri Sep 15 20:17:15 UTC 2017 - zaitor@opensuse.org diff --git a/deja-dup.spec b/deja-dup.spec index 1e47a87..81a02ca 100644 --- a/deja-dup.spec +++ b/deja-dup.spec @@ -17,15 +17,13 @@ Name: deja-dup -Version: 36.0 +Version: 36.1 Release: 0 Summary: Simple backup tool and frontend for duplicity License: GPL-3.0+ Group: Productivity/Archiving/Backup Url: https://launchpad.net/deja-dup Source0: https://launchpad.net/deja-dup/36/%{version}/+download/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM deja-dup-fix-setting-drive-volume.patch lp#1717230 zaitor@opensuse.org -- BackendDrive: Fix setting a drive volume -Patch0: deja-dup-fix-setting-drive-volume.patch # For make check to work, we need dbus-launch BuildRequires: dbus-1-x11 BuildRequires: fdupes @@ -87,7 +85,6 @@ This package contains a plugin to integrate Déjà Dup into Nautilus. %prep %setup -q -%patch0 -p1 %build export CFLAGS="%{optflags} -Wl,-rpath=%{_libdir}/%{name}"