Package: timeshift Version: 19.01+ds-2 Severity: high Tags: patch pending Dear Yanhao Mo,
I've prepared an NMU for timeshift (versioned as 19.01+ds-2.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. Steve Meliza
diff -Nru timeshift-19.01+ds/debian/changelog timeshift-19.01+ds/debian/changelog --- timeshift-19.01+ds/debian/changelog 2019-02-27 20:03:15.000000000 -0800 +++ timeshift-19.01+ds/debian/changelog 2020-02-17 22:33:00.000000000 -0800 @@ -1,3 +1,20 @@ +timeshift (19.01+ds-2.1) unstable; urgency=medium + + * Non-maintainer upload + * Apply upstream fix for bug #948130 + + -- Steve Meliza <s...@swm1.com> Mon, 17 Feb 2020 22:33:00 -0800 + +timeshift (19.01+ds-2) unstable; urgency=medium + + * d/control: Add missing dependency: psmisc (Closes: #919760). + + -- Yanhao Mo <yanha...@gmail.com> Thu, 28 Feb 2019 12:03:15 +0800 + +timeshift (19.01+ds-1) unstable; urgency=medium + + * New upstream version 19.01+ds + * d/patches: Add a patch to fix FTBFS (Closes: #921762), timeshift (19.01+ds-2) unstable; urgency=medium * d/control: Add missing dependency: psmisc (Closes: #919760). diff -Nru timeshift-19.01+ds/debian/control timeshift-19.01+ds/debian/control --- timeshift-19.01+ds/debian/control 2019-02-27 20:03:09.000000000 -0800 +++ timeshift-19.01+ds/debian/control 2020-02-17 22:33:00.000000000 -0800 @@ -2,13 +2,12 @@ Section: utils Priority: optional Maintainer: Yanhao Mo <yanha...@gmail.com> -Build-Depends: - debhelper-compat (= 12), - valac, - libgtk-3-dev, - libgee-0.8-dev, - libjson-glib-dev, - libvte-2.91-dev, +Build-Depends: debhelper-compat (= 12), + libgee-0.8-dev, + libgtk-3-dev, + libjson-glib-dev, + libvte-2.91-dev, + valac Standards-Version: 4.3.0 Homepage: http://teejeetech.blogspot.in/ Vcs-Git: https://salsa.debian.org/yanhao-guest/timeshift.git @@ -16,7 +15,7 @@ Package: timeshift Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, rsync, psmisc +Depends: psmisc, rsync, ${misc:Depends}, ${shlibs:Depends} Replaces: timeshift-btrfs Description: System restore utility Timeshift is a system restore utility which takes snapshots diff -Nru timeshift-19.01+ds/debian/patches/0006-fix-valac-build-error.patch timeshift-19.01+ds/debian/patches/0006-fix-valac-build-error.patch --- timeshift-19.01+ds/debian/patches/0006-fix-valac-build-error.patch 1969-12-31 16:00:00.000000000 -0800 +++ timeshift-19.01+ds/debian/patches/0006-fix-valac-build-error.patch 2020-02-17 22:33:00.000000000 -0800 @@ -0,0 +1,19 @@ +From: Steve Meliza <s...@swm1.com> +Date: Mon, 17 Feb 2020 22:52:00 -0800 +Subject: Fix valac compile error. +Bug-Debian: https://bugs.debian.org/948130 + +Description: Fix valac compile error. + Change creation method of abstract class from public to protected. + +--- timeshift-19.01+ds.orig/src/Utility/AsyncTask.vala ++++ timeshift-19.01+ds/src/Utility/AsyncTask.vala +@@ -73,7 +73,7 @@ public abstract class AsyncTask : GLib.O + public signal void stderr_line_read(string line); + public signal void task_complete(); + +- public AsyncTask(){ ++ protected AsyncTask(){ + working_dir = TEMP_DIR + "/" + timestamp_for_path(); + script_file = path_combine(working_dir, "script.sh"); + log_file = path_combine(working_dir, "task.log"); diff -Nru timeshift-19.01+ds/debian/patches/series timeshift-19.01+ds/debian/patches/series --- timeshift-19.01+ds/debian/patches/series 2019-02-26 02:01:52.000000000 -0800 +++ timeshift-19.01+ds/debian/patches/series 2020-02-17 22:33:00.000000000 -0800 @@ -3,3 +3,4 @@ 0004-select-etc-timeshift-as-the-default-config-dir.patch 0005-build-with-debug-info.patch 0005-Fix-build-errors-with-new-version-of-vala.patch +0006-fix-valac-build-error.patch