diff -Nru timeshift-20.03+ds/.bzrignore timeshift-20.03/.bzrignore --- timeshift-20.03+ds/.bzrignore 2020-03-05 03:28:13.000000000 +0000 +++ timeshift-20.03/.bzrignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -src/timeshift -src/timeshift-gtk -designs/ -release/source -release/amd64 -release/i386 -release/armel -release/armhf -release/*.deb -release/*.run -*.geany -*.mo -*.c -*.o -.git -.bzr -*~ diff -Nru timeshift-20.03+ds/debian/changelog timeshift-20.03/debian/changelog --- timeshift-20.03+ds/debian/changelog 2020-03-15 19:16:40.000000000 +0000 +++ timeshift-20.03/debian/changelog 2020-05-07 16:57:16.000000000 +0000 @@ -1,65 +1,490 @@ -timeshift (20.03+ds-2) unstable; urgency=medium +timeshift (20.03-0~202003050328~ubuntu20.10.1) groovy; urgency=low - * debian/patches: - + Add $(VALAFLAGS) to valac call to fix lintian - hardening-no-bindnow. - + Fix lintian desktop-entry-lacks-keywords-entry. - * debian/copyright: - + Fix lintian missing-explanation-for-repacked-upstream-tarball. - * debian/timeshift.appdata.xml: - + Add tag to fix AppStream metadata issue. - * debian/control: Add Rules-Requires-Root. - * debian/upstream/metadata: Added upstream metadata. + * Auto build. - [ Boyuan Yang ] - * debian/control: Update Vcs-* fields and use git packaging repo - under Salsa Debian Group. - * debian/README.Debian: Removed, no longer applicable. + -- Tony George Thu, 07 May 2020 16:57:16 +0000 - -- Steve Meliza Sun, 15 Mar 2020 12:16:40 -0700 +timeshift (20.03) xenial; urgency=medium -timeshift (20.03+ds-1) unstable; urgency=high + * Fix an issue with script execution - * New upstream version (Closes: #951302) - * d/control: Update homepage URL (Closes: #952690) + -- Tony George Thu, 05 Mar 2020 05:00:00 +0530 - -- Steve Meliza Sun, 08 Mar 2020 14:12:47 -0700 -timeshift (19.01+ds-2.1) unstable; urgency=high +timeshift (20.02) xenial; urgency=medium - * Non-maintainer upload - * d/patches: Add a patch to fix FTBFS (Closes: #948130) + * Fix bind-mount issues (#528, #535, #536, #555) - -- Steve Meliza Mon, 17 Feb 2020 22:33:00 -0800 + * Mount devices to /run/timeshift instead of /mnt/timeshift -timeshift (19.01+ds-2) unstable; urgency=medium + * Update translation files - * d/control: Add missing dependency: psmisc (Closes: #919760). + -- Tony George Sat, 29 Feb 2020 10:00:00 +0530 - -- Yanhao Mo Thu, 28 Feb 2019 12:03:15 +0800 -timeshift (19.01+ds-1) unstable; urgency=medium +timeshift (19.08.1) xenial; urgency=medium - * New upstream version 19.01+ds - * d/patches: Add a patch to fix FTBFS (Closes: #921762), - and some trivial updates. - * d/control: Using debhelper-compat (= 12). - * Bump Standards-Version to 4.3.0 (no changes needed). - * d/compat: Removed. - * Remove d/timeshift.appdata.xml, get rid of lintian warning: - inconsistent-appstream-metadata-license . + * #375 Fix build errors with vala 0.42.5; Remove --threads from makefile; - -- Yanhao Mo Mon, 28 Jan 2019 13:46:04 +0800 + * #443 Add support for custom date format; Add new page for Misc settings; -timeshift (18.9+ds-2) unstable; urgency=medium + * Add OK button to Settings window - * Fix d/watch. - * Workaround valac hardening issues. + * Improve the layout of Prev/Next/Finish navigation buttons - -- Yanhao Mo Fri, 04 Jan 2019 15:06:42 +0800 + * Fix incorrect date format for path string -timeshift (18.9+ds-1) unstable; urgency=medium + * Use the --sparse option with rsync - * Initial release. (Closes: #908002) + * #437 Exclude package manager cache for rsync snapshots - -- Yanhao Mo Wed, 05 Sep 2018 12:51:11 +0800 + * #436 Add man page + + * #386 Fix an issue with check for admin access + + * Update translation template and translation files + + -- Tony George Sun, 11 Aug 2019 18:00:00 +0530 + + +timeshift (19.01) xenial; urgency=medium + + * Exclude /snap by default + + * Updated translations + + * #362 - Don't delete snapshots older than X interval if count < max + + * #211 - Snapshots with comments will not be auto-removed + + -- Tony George Sun, 20 Jan 2019 10:00:00 +0530 + + +timeshift (18.9.1) xenial; urgency=medium + + * Updated donation window message + + -- Tony George Wed, 05 Sep 2018 10:00:00 +0530 + + +timeshift (18.9) xenial; urgency=medium + + * Updated donation window + + * Display donation button in toolbar + + -- Tony George Sat, 01 Sep 2018 10:00:00 +0530 + + +timeshift (18.8) xenial; urgency=medium + + * #196 Fixed a typo + + * #191 Don't exclude /var/spool + + * Add makepot file + + * Launcher: Explicitly pass DISPLAY and XAUTHORITY to pkexec + + * Use -O3 optimization when compiling with gcc + + * #278 Increased the width of Setup Wizard window + + * Fixed: Unencrypted partionless disk could not be used as backup device + + * Added support for using F2FS and ZFS filesystems for RSYNC backups + + * Workaround for Docker mounting rootfs on /var/lib/docker/plugins + + * Added support for raid5 and dmraid + + * Translation fixes + + -- Tony George Sun, 26 Aug 2018 10:00:00 +0530 + + +timeshift (18.6.1) xenial; urgency=medium + + * Rsync: Read fstab to exclude devices mounted on non-standard locations + + * UI: Hide snapshot type information behind an expander + + * UI: Added frame around messages; Use smaller bullet characters; + + * Wizard: Add "Users" page to Setup Wizard for selecting home directory + + * Fixed build issue with newer version of libvte291 + + -- Tony George Sun, 24 Jun 2018 17:00:00 +0530 + + +timeshift (18.6) xenial; urgency=medium + + * Exclude /swapfile for rsync snapshots + + * Translation fixes + + -- Tony George Sat, 23 Jun 2018 20:00:00 +0530 + +timeshift (18.4) xenial; urgency=medium + + * UI Improvements + + * Added option to keep BTRFS qgroups disabled + + * Added a fix for nested subvolume issue + + -- Tony George Sun, 01 Apr 2018 10:00:00 +0530 + + +timeshift (18.2.1) xenial; urgency=medium + + * Fixed an issue in parsing subvol name from fstab + + -- Tony George Mon, 12 Feb 2018 10:00:00 +0530 + + +timeshift (18.2) xenial; urgency=medium + + * Updated rsync log viewer + + * Display preview of files to be restored for rsync snapshots + + * Enable "View Log for Restore" menu item only if restore log exits + + * Appdata: Install to both /appdata and /metainfo for compatibility + + * Skip parsing log file after creating rsync snapshot + + * Disable deleted count label while creating snapshot as this info + is not applicable while creating snapshots + + * makefile: Remove rpath; Break commands over multiple lines; + + * Removed menu item for "Refresh Snapshot List" + + * Statusbar: DIsplay status items in separate frames + + * Restore: Allow compare action to be cancelled + + * Fixed: Unchanged files count was not displayed + + -- Tony George Sat, 03 Feb 2018 10:00:00 +0530 + + +timeshift (18.1.1) xenial; urgency=medium + + * Fixed an issue where home directory would get deleted while + restoring rsync snapshot. This happened in scenarios where the user + had created a snapshot excluding home directory, and later + restored the snapshot after including home directory in Settings. + To avoid such scenarios, user-specified include filters + will be ignored for restore. Exclude list that was created during + snapshot creation will be used instead, along with any additional + exclude filters. + + -- Tony George Thu, 25 Jan 2018 10:00:00 +0530 + + +timeshift (18.1) xenial; urgency=medium + + * Added messages to Settings window to answer common questions + + * Added 3 options for including and excluding home directory contents + + * Number of snapshots to keep will be enabled, even if snapshot level + is not selected. + + * Excluded paths/devices will not be mounted during restore + + * /var/lib/schroot will be excluded by default to prevent an issue + with the snapshot never completing + + * /DATA and /sdcard will be excluded by default, as some users mount + devices at these locations. + + * Added a check for "notify-send" before sending a desktop + notification. "notify-send" is not available on some systems. + + * About window was updated to include the GPL license text. Web links + will open web browser as non-admin user. + + * #95 Added support for selecting partition-less devices as snapshot device + + * #97 PARTLABEL and LABEL will be displayed in device list + + -- Tony George Sun, 14 Jan 2018 10:00:00 +0530 + + +timeshift (17.11) xenial; urgency=medium + + * Added appdata file + + * Prefer pkexec for starting timeshift in Wayland session + + * Added a Polkit policy file + + * Add hidpi support for icons + + * Updated translations + + -- Tony George Sun, 05 Nov 2017 10:00:00 +0530 + + +timeshift (17.10) xenial; urgency=medium + + * [Changed] Entire contents of home directories will be excluded by + default. Any data to be included from home directories must be + explicitly selected from Settings window. + + * [Fixed] Encrypted home directories will be backed-up and restored + using encrypted files in /home/.ecryptfs. Decrypted contents will + NOT be saved to backup location. + + * [Added] Added support for BTRFS systems with @ on BTRFS volume + and /home mounted on non-BTRFS partition + + * [Added] Support for window progress in Cinnamon 3.6 using libxapp + + * [Added] Install a default configuration file in  + /etc/default/timeshift.json + + * [Removed] Removed the Exclude Apps page in restore wizard + + * [Removed] Unnecessary dependency on libxml2 and libsoup + + * [Fixed] Inverted mouse cursor was displayed for some cursor themes + on KDE and GTK + + * [Fixed] Message dialog was unreadable when timeshift-gtk was + started without admin access on a system with newer versions of GTK+ + + * [Fixed] Updated timeshift-launcher to work with Wayland in Fedora + + * [Fixed] Snapshots were saved on root device if backup device was missing + + * [Fixed] Build error with valac-0.36 + + * [Fixed] Build error with libvte-2.91 on Debian 9 + + * [Fixed] Scheduled tasks will be added only after user clicks  + Next on Schedule page. Tasks will not be added if user quits the + Setup Wizard without clicking Next on the Schedule page. + + * [Changed] Use symbolic icons in toolbar for better contrast with + light and dark GTK themes + + * [Updated] Donation window + + * [Updated] Improved installer; More robust and supports more systems + + * [Updated] Added new translations by Linux Mint translation teams + + -- Tony George Sun, 01 Oct 2017 10:00:00 +0530 + + +timeshift (17.2) trusty; urgency=medium + + * Use StackWidget for Settings window + + * Fixed: Hourly task was not created correctly + + * Settings: Updated messages in Schedule tab to avoid confusion + + -- Tony George Thu, 26 Jan 2017 10:00:00 +0530 + + +timeshift (17.1) trusty; urgency=medium + + * Added support for BTRFS snapshots. There's a new tab in Settings + Window to select the snapshot type as BTRFS or RSYNC. Application will + default to BTRFS snapshots on supported systems. + + * Added support for BTRFS systems with @ and @home on different disks + + * Exclude: Added /var/lib/docker to default exclude list. This will + prevent recursive backups which can cause the disk to run out of + space. + + * Exclude: Added /timeshift-btrfs and /var/log/timeshift to + default exclude list + + * Scheduling: Scripts will be created in /etc/cron.*/ instead of + adding entries to root user's crontab. This allows users to create + custom jobs for timeshift without any conflict with jobs created + automatically by the application. + + * Console: Replaced options '--backup' with '--check', and + '--backup-now' with '--create' + + * Console: Added option --tags to specify backup level while creating + snapshots + + * Console: Added options --btrfs and --rsync to specify snapshot type + + * Console: Fixed: Progress was not displayed when first snapshot was + taken. System size will be estimated before creating first snapshot. + + * Console: Fixed: Comments passed as command argument were not saved + + * Settings: Removed Notes tab from SettingsWindow + + * Settings: Added option to stop emails sent by cron service + + * Use expanded ButtonBox if gtk+ version >= 3.18 + + * Package 'timeshift' now replaces package 'timeshift-btrfs' + if installed on the system + + * Added Ukranian translation by Ihor Chomko + + * Added Swedish translation by Åke Engelbrektson + + -- Tony George Sun, 15 Jan 2017 10:00:00 +0530 + + +timeshift (16.11.2) trusty; urgency=medium + + * Fixed: Partitions were not detected correctly on LMDE2 Betsy + + * Fixed some dependency issues while running installer on LMDE2. + Installer will be built using trusty as base instead of xenial for + better compatibility with older distros. + + -- Tony George Fri, 11 Nov 2016 14:00:00 +0530 + + +timeshift (16.11.1) trusty; urgency=medium + + * Fixed an issue with application launcher + + -- Tony George Fri, 11 Nov 2016 14:00:00 +0530 + + +timeshift (16.11) trusty; urgency=medium + + * Moved console and Gtk code to separate utilities: + 'timeshift' and 'timeshift-gtk' + + * Console: Display progress in terminal while creating and + deleting snapshots; Added --comments option for setting the comment + when new snapshot is created; Changed input timeout interval to + 60 seconds; + + * RestoreWindow: Removed loop devices from target device dropdowns; + Fixed some issues in device selection logic; Comboboxes would remain + unselected in some scenarios; User will be prompted to unlock + default devices before the restore window is displayed; LVM volume + names will be displayed on the target device selection tab; + + * RestoreWindow: Added new options to reinstall GRUB, + update initramfs and update GRUB menu; Fixed: Progress will be + displayed when restoring another system in GUI mode; Added + right-click menu option to view restore log file; + + * RestoreWindow: Exclude Apps: Populate items from destination home + directories as well as snapshot's home directories. + + * Restore: Bind /dev/pts when chrooting the restored system; + + * Restore: Check and repair file systems after offline restore; + + * UI: Added borders around statusbar; + + * OS Support: Fedora/RedHat: Fixed detection of Live USB mode; + Fixed an issue with grub update; + + * Create: Exclude /var/spool and ~/.dbus while creating snapshots; + File count will be saved when snapshots are created; + + * Fixed the handling of leading and trailing spaces in device + labels and mount paths; + + * SettingsWindow: Replaced Include and Exclude tabs with a single + tab for Filters; Resized the window size to match Main Window; Main + Window will be hidden when the Settings Window is displayed; + + * Exclude /etc/timeshift.json so that it is not replaced when a + snapshot is restored + + -- Tony George Fri, 11 Nov 2016 10:00:00 +0530 + + +timeshift (16.10.6) trusty; urgency=medium + + * Fixed scheduled backups; Initialize display for the scheduled cron task; + + -- Tony George Sun, 16 Oct 2016 14:00:00 +0530 + + +timeshift (16.10.5) trusty; urgency=medium + + * Fixed build errors on trusty; Removed references to + Gtk.ButtonBoxStyle.EXPAND; + + * Added support for BTRFS systems with @ and @home on separate + devices + + * Added workaround for older versions of lsblk; Fixed support for + Ubuntu 14.04 and Mint 17.x; + + * Updated list of donors in Credits section + + * Use valac-0.26 + + -- Tony George Sat, 15 Oct 2016 14:00:00 +0530 + + +timeshift (16.10.3) trusty; urgency=medium + + * Statusbar: Display dates in 24-hr format; + + * Check system uuid when linking from previous snapshot; This allows + snapshots of multiple systems to be saved on the same backup device + without wasting space; + + * Fixed error handling for udisks automount() and unmount() + + -- Tony George Sat, 08 Oct 2016 14:00:00 +0530 + + +timeshift (16.10.2) xenial; urgency=medium + + * Fixed: AM/PM is not displayed by some locales; Snapshot date will + be displayed in 24-hr format to avoid this issue; + + * Fixed: RestoreWindow: Subvolume column is sometimes hidden when + window is opened for the first time; + + -- Tony George Sat, 08 Oct 2016 10:00:00 +0530 + + +timeshift (16.10.1) xenial; urgency=medium + + * Major release with re-designed UI and features + + -- Tony George Fri, 07 Oct 2016 10:00:00 +0530 + + +timeshift (16.7.11) trusty; urgency=medium + + * Fixed: First snapshot size estimation fails in some cases + + * Fixed: Statusbar padding + + * Moved extra toolbar items to dropdown menu + + * Updated list of contributors and translators in About > Credits + + -- Tony George Wed, 06 Jul 2016 10:00:00 +0530 + + +timeshift (16.3) trusty; urgency=medium + + * Fix Gtk.Switch + + * Update translation template + + * Update localization files + + -- Maxim Taranov Wed, 06 Jul 2016 10:00:00 +0530 diff -Nru timeshift-20.03+ds/debian/compat timeshift-20.03/debian/compat --- timeshift-20.03+ds/debian/compat 1970-01-01 00:00:00.000000000 +0000 +++ timeshift-20.03/debian/compat 2020-05-07 16:57:16.000000000 +0000 @@ -0,0 +1 @@ +8 diff -Nru timeshift-20.03+ds/debian/control timeshift-20.03/debian/control --- timeshift-20.03+ds/debian/control 2020-03-15 19:16:40.000000000 +0000 +++ timeshift-20.03/debian/control 2020-05-07 16:57:16.000000000 +0000 @@ -1,23 +1,17 @@ Source: timeshift Section: utils -Priority: optional -Maintainer: Yanhao Mo -Uploaders: Steve Meliza -Rules-Requires-Root: no -Build-Depends: debhelper-compat (= 12), - libgee-0.8-dev, - libgtk-3-dev, - libjson-glib-dev, - libvte-2.91-dev, - valac -Standards-Version: 4.5.0 -Homepage: https://teejeetech.in/timeshift/ -Vcs-Git: https://salsa.debian.org/debian/timeshift.git -Vcs-Browser: https://salsa.debian.org/debian/timeshift +Priority: extra +Maintainer: Tony George +Build-Depends: debhelper (>= 8.0.0), autotools-dev, gzip, valac, libgtk-3-dev, libgee-0.8-dev, libjson-glib-dev, libvte-2.91-dev +Standards-Version: 3.9.3 +Homepage: https://teejeetech.in/ +#Vcs-Git: git://git.debian.org/collab-maint/hello.git +#Vcs-Browser: http://git.debian.org/?p=collab-maint/hello.git;a=summary Package: timeshift Architecture: any -Depends: psmisc, rsync, ${misc:Depends}, ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, rsync, btrfs-tools | btrfs-progs +#Recommends: Replaces: timeshift-btrfs Description: System restore utility Timeshift is a system restore utility which takes snapshots diff -Nru timeshift-20.03+ds/debian/copyright timeshift-20.03/debian/copyright --- timeshift-20.03+ds/debian/copyright 2020-03-15 19:16:40.000000000 +0000 +++ timeshift-20.03/debian/copyright 2020-05-07 16:57:16.000000000 +0000 @@ -1,34 +1,13 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: timeshift -Upstream-Contact: Tony George -Source: https://github.com/teejee2008/timeshift -Comment: Upstream repackaged due to numerous incompatibilities with - Debian's packaging policies. Upstream author is targeting Mint. +Source: Files: * -Copyright: Tony George -License: GPL-3+ - -Files: debian/timeshift.appdata.xml -Copyright: Tony George -License: CC-BY-SA-3.0 - -Files: src/Utility/*.vala - src/Utility/Gtk/*.vala - src/Gtk/*.vala - src/Console/*.vala - src/Core/*.vala -Copyright: 2012-2018, 2016 Tony George +Copyright: 2013 Tony George License: GPL-2+ - -Files: po/* -Copyright: 2017, Rosetta Contributors and Canonical Ltd -License: GPL-2+ - -License: GPL-2+ - This program is free software: you can redistribute it and/or modify + This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or + the Free Software Foundation; either version 2 of the License, or (at your option) any later version. . This package is distributed in the hope that it will be useful, @@ -37,86 +16,8 @@ GNU General Public License for more details. . You should have received a copy of the GNU General Public License - along with this program. If not, see . + along with this program. If not, see . On Debian systems, the complete text of the GNU General Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". -License: GPL-3+ - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see . - . - On Debian systems, the complete text of the GNU General - Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". - -License: CC-BY-SA-3.0 - THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. - . - BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. - . - 1. Definitions - . - "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License. - "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License. - "Creative Commons Compatible License" means a license that is listed at https://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License. - "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership. - "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike. - "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License. - "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast. - "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work. - "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. - "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images. - "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium. - . - 2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws. - . - 3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: - . - to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections; - to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified."; - to Distribute and Publicly Perform the Work including as incorporated in Collections; and, - to Distribute and Publicly Perform Adaptations. - . - For the avoidance of doubt: - Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; - Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and, - Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License. - . - The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved. - . - 4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: - . - You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested. - You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License. - If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties. - Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise. - . - 5. Representations, Warranties and Disclaimer - . - UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. - . - 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - . - 7. Termination - . - This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. - Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above. - . - 8. Miscellaneous - . - Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. - Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License. - If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. - No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. - This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You. - The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law. diff -Nru timeshift-20.03+ds/debian/docs timeshift-20.03/debian/docs --- timeshift-20.03+ds/debian/docs 2020-03-15 19:16:40.000000000 +0000 +++ timeshift-20.03/debian/docs 2020-05-07 16:57:16.000000000 +0000 @@ -1 +0,0 @@ - diff -Nru timeshift-20.03+ds/debian/git-build-recipe.manifest timeshift-20.03/debian/git-build-recipe.manifest --- timeshift-20.03+ds/debian/git-build-recipe.manifest 1970-01-01 00:00:00.000000000 +0000 +++ timeshift-20.03/debian/git-build-recipe.manifest 2020-05-07 16:57:16.000000000 +0000 @@ -0,0 +1,2 @@ +# git-build-recipe format 0.4 deb-version {debupstream}-0~202003050328 +lp:timeshift-github git-commit:cecd294dcaea9bcf282865268dc6667fbeeeddb3 diff -Nru timeshift-20.03+ds/debian/patches/0002-get-rid-of-appdata.patch timeshift-20.03/debian/patches/0002-get-rid-of-appdata.patch --- timeshift-20.03+ds/debian/patches/0002-get-rid-of-appdata.patch 2020-03-15 19:16:40.000000000 +0000 +++ timeshift-20.03/debian/patches/0002-get-rid-of-appdata.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -From: Yanhao Mo -Date: Fri, 12 Oct 2018 17:21:41 +0800 -Subject: get rid of lintian warning: appstream-metadata-in-legacy-location - -Index: src/makefile -=================================================================== ---- a/src/makefile -+++ b/src/makefile -@@ -105,7 +105,6 @@ install: - mkdir -p "$(DESTDIR)$(sysconfdir)/default" - mkdir -p "$(DESTDIR)$(sharedir)/${app_name}" - mkdir -p "$(DESTDIR)$(sharedir)/icons" -- mkdir -p "$(DESTDIR)$(sharedir)/appdata" - mkdir -p "$(DESTDIR)$(sharedir)/metainfo" - - # binary -@@ -136,7 +135,6 @@ install: - chmod --recursive 0644 $(DESTDIR)$(sharedir)/icons/hicolor/*/apps/${app_name}.png - - # appdata -- install -m 0644 ../debian/${app_name}.appdata.xml "$(DESTDIR)$(sharedir)/appdata" - install -m 0644 ../debian/${app_name}.appdata.xml "$(DESTDIR)$(sharedir)/metainfo" - - # translations -@@ -172,5 +170,4 @@ uninstall: - rm -f $(DESTDIR)$(localedir)/*/LC_MESSAGES/${app_name}.mo - - # appdata -- rm -f "$(DESTDIR)$(sharedir)/appdata/${app_name}.appdata.xml" - rm -f "$(DESTDIR)$(sharedir)/metainfo/${app_name}.appdata.xml" diff -Nru timeshift-20.03+ds/debian/patches/0003-Remove-Mime-Type-record-form-timeshift-gtk.desktop.patch timeshift-20.03/debian/patches/0003-Remove-Mime-Type-record-form-timeshift-gtk.desktop.patch --- timeshift-20.03+ds/debian/patches/0003-Remove-Mime-Type-record-form-timeshift-gtk.desktop.patch 2020-03-15 19:16:40.000000000 +0000 +++ timeshift-20.03/debian/patches/0003-Remove-Mime-Type-record-form-timeshift-gtk.desktop.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -From: Yanhao Mo -Date: Mon, 15 Oct 2018 15:39:00 +0800 -Subject: Remove "Mime-Type" record form timeshift-gtk.desktop - -get rid of Lintian Warning: desktop-mime-but-no-exec-code ---- - src/timeshift-gtk.desktop | 1 - - 1 file changed, 1 deletion(-) - -Index: timeshift-20.03+ds/src/timeshift-gtk.desktop -=================================================================== ---- timeshift-20.03+ds.orig/src/timeshift-gtk.desktop -+++ timeshift-20.03+ds/src/timeshift-gtk.desktop -@@ -1,6 +1,5 @@ - [Desktop Entry] - Name=Timeshift --MimeType= - Exec=timeshift-launcher - Type=Application - GenericName=System Restore Utility diff -Nru timeshift-20.03+ds/debian/patches/0004-select-etc-timeshift-as-the-default-config-dir.patch timeshift-20.03/debian/patches/0004-select-etc-timeshift-as-the-default-config-dir.patch --- timeshift-20.03+ds/debian/patches/0004-select-etc-timeshift-as-the-default-config-dir.patch 2020-03-15 19:16:40.000000000 +0000 +++ timeshift-20.03/debian/patches/0004-select-etc-timeshift-as-the-default-config-dir.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -From: Yanhao Mo -Date: Mon, 15 Oct 2018 16:33:07 +0800 -Subject: select "/etc/timeshift" as the default config dir - -using "/etc/defautl/" as the default config dir is totally insane. ---- - src/Core/Main.vala | 2 +- - src/makefile | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/Core/Main.vala b/src/Core/Main.vala -index e236683..7ff094c 100644 ---- a/src/Core/Main.vala -+++ b/src/Core/Main.vala -@@ -271,7 +271,7 @@ public class Main : GLib.Object{ - this.app_path = (File.new_for_path (args[0])).get_parent().get_path (); - this.share_folder = "/usr/share"; - this.app_conf_path = "/etc/timeshift.json"; -- this.app_conf_path_default = "/etc/default/timeshift.json"; -+ this.app_conf_path_default = "/etc/timeshift/timeshift.json"; - //sys_root and sys_home will be initalized by update_partition_list() - - // check if running locally ------------------------ -diff --git a/src/makefile b/src/makefile -index f2ea8d0..9d6a680 100644 ---- a/src/makefile -+++ b/src/makefile -@@ -102,7 +102,7 @@ install: - mkdir -p "$(DESTDIR)$(man1dir)" - mkdir -p "$(DESTDIR)$(launcherdir)" - mkdir -p "$(DESTDIR)$(polkitdir)" -- mkdir -p "$(DESTDIR)$(sysconfdir)/default" -+ mkdir -p "$(DESTDIR)$(sysconfdir)/timeshift" - mkdir -p "$(DESTDIR)$(sharedir)/${app_name}" - mkdir -p "$(DESTDIR)$(sharedir)/icons" - mkdir -p "$(DESTDIR)$(sharedir)/metainfo" -@@ -125,7 +125,7 @@ install: - install -m 0755 ${app_name}-gtk.desktop "$(DESTDIR)$(launcherdir)" - - # config -- install -m 0644 ../files/${app_name}.json "$(DESTDIR)$(sysconfdir)/default" -+ install -m 0644 ../files/${app_name}.json "$(DESTDIR)$(sysconfdir)/timeshift" - - # man page - install -m 0644 ../man/${app_name}.1.gz "$(DESTDIR)$(man1dir)/${app_name}.1.gz" diff -Nru timeshift-20.03+ds/debian/patches/0005-build-with-debug-info.patch timeshift-20.03/debian/patches/0005-build-with-debug-info.patch --- timeshift-20.03+ds/debian/patches/0005-build-with-debug-info.patch 2020-03-15 19:16:40.000000000 +0000 +++ timeshift-20.03/debian/patches/0005-build-with-debug-info.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -From: Yanhao Mo -Date: Tue, 26 Feb 2019 17:15:10 +0800 -Subject: build-with-debug-info - ---- - src/makefile | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/makefile b/src/makefile -index 9d6a680..eac9760 100644 ---- a/src/makefile -+++ b/src/makefile -@@ -1,5 +1,5 @@ - SHELL=/bin/bash --CFLAGS=--std=c99 -+CFLAGS=--std=c99 -g - EXECUTABLES = find msgmerge msgfmt install rm mkdir cp chmod valac - CHECKEXECS := $(foreach exec,$(EXECUTABLES), $(if $(shell which $(exec)),,$(error No $(exec) found, install it))) - -@@ -49,7 +49,7 @@ all: app-gtk app-console pot - app-gtk: - - #timeshift-gtk -- valac -X -D'GETTEXT_PACKAGE="${app_name}"' \ -+ valac -g -X -D'GETTEXT_PACKAGE="${app_name}"' \ - --Xcc="-lm" --Xcc="-O3" ${symbols} \ - Core/*.vala Gtk/*.vala Utility/*.vala Utility/Gtk/*.vala \ - -o ${app_name}-gtk \ -@@ -60,7 +60,7 @@ app-gtk: - app-console: - - #timeshift -- valac -X -D'GETTEXT_PACKAGE="${app_name}"' \ -+ valac -g -X -D'GETTEXT_PACKAGE="${app_name}"' \ - --Xcc="-lm" --Xcc="-O3" ${symbols} \ - Core/*.vala Utility/*.vala Utility/Gtk/*.vala Console/*.vala \ - -o ${app_name} \ diff -Nru timeshift-20.03+ds/debian/patches/0006-Add_keywords_to_dot_desktop.patch timeshift-20.03/debian/patches/0006-Add_keywords_to_dot_desktop.patch --- timeshift-20.03+ds/debian/patches/0006-Add_keywords_to_dot_desktop.patch 2020-03-15 19:16:40.000000000 +0000 +++ timeshift-20.03/debian/patches/0006-Add_keywords_to_dot_desktop.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -Description: Add keywords to timeshift-gtk.desktop - ---- timeshift-20.03+ds.orig/src/timeshift-gtk.desktop -+++ timeshift-20.03+ds/src/timeshift-gtk.desktop -@@ -25,3 +25,4 @@ Comment[ru]=Программа для в - X-KDE-StartupNotify=false - Categories=System; - X-GNOME-UsesNotifications=true -+Keywords=backup;btrfs;rsync; diff -Nru timeshift-20.03+ds/debian/patches/0007-Add_VALAFLAGS_to_makefile.patch timeshift-20.03/debian/patches/0007-Add_VALAFLAGS_to_makefile.patch --- timeshift-20.03+ds/debian/patches/0007-Add_VALAFLAGS_to_makefile.patch 2020-03-15 19:16:40.000000000 +0000 +++ timeshift-20.03/debian/patches/0007-Add_VALAFLAGS_to_makefile.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -Description: Add VALAFLAGS to valac arguments in src/makefile. - ---- timeshift-20.03+ds.orig/src/makefile -+++ timeshift-20.03+ds/src/makefile -@@ -51,6 +51,7 @@ app-gtk: - #timeshift-gtk - valac -g -X -D'GETTEXT_PACKAGE="${app_name}"' \ - --Xcc="-lm" --Xcc="-O3" ${symbols} \ -+ $(VALAFLAGS) \ - Core/*.vala Gtk/*.vala Utility/*.vala Utility/Gtk/*.vala \ - -o ${app_name}-gtk \ - --pkg glib-2.0 --pkg gio-unix-2.0 --pkg posix \ -@@ -62,6 +63,7 @@ app-console: - #timeshift - valac -g -X -D'GETTEXT_PACKAGE="${app_name}"' \ - --Xcc="-lm" --Xcc="-O3" ${symbols} \ -+ $(VALAFLAGS) \ - Core/*.vala Utility/*.vala Utility/Gtk/*.vala Console/*.vala \ - -o ${app_name} \ - --pkg glib-2.0 --pkg gio-unix-2.0 --pkg posix \ diff -Nru timeshift-20.03+ds/debian/patches/series timeshift-20.03/debian/patches/series --- timeshift-20.03+ds/debian/patches/series 2020-03-15 19:16:40.000000000 +0000 +++ timeshift-20.03/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -0002-get-rid-of-appdata.patch -0003-Remove-Mime-Type-record-form-timeshift-gtk.desktop.patch -0004-select-etc-timeshift-as-the-default-config-dir.patch -0005-build-with-debug-info.patch -0006-Add_keywords_to_dot_desktop.patch -0007-Add_VALAFLAGS_to_makefile.patch diff -Nru timeshift-20.03+ds/debian/rules timeshift-20.03/debian/rules --- timeshift-20.03+ds/debian/rules 2020-03-15 19:16:40.000000000 +0000 +++ timeshift-20.03/debian/rules 2020-05-07 16:57:16.000000000 +0000 @@ -1,18 +1,15 @@ #!/usr/bin/make -f -export DH_VERBOSE = 1 -export DEB_BUILD_MAINT_OPTIONS = hardening=+all -export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic -export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. -DPKG_EXPORT_BUILDFLAGS = 1 -include /usr/share/dpkg/buildflags.mk -export VALAFLAGS:=$(foreach w,$(CPPFLAGS) $(CFLAGS) $(LDFLAGS),-X $(w)) +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 -%: - dh $@ +override_dh_usrlocal: -override_dh_auto_install: - dh_auto_install - rm -rf debian/timeshift/usr/share/man/man1 - rmdir debian/timeshift/usr/share/man - rm -f debian/timeshift/usr/bin/timeshift-uninstall +%: + dh $@ --with autotools-dev diff -Nru timeshift-20.03+ds/debian/source/format timeshift-20.03/debian/source/format --- timeshift-20.03+ds/debian/source/format 2018-10-21 14:25:43.000000000 +0000 +++ timeshift-20.03/debian/source/format 2020-05-07 16:57:16.000000000 +0000 @@ -1 +1 @@ -3.0 (quilt) +3.0 (native) diff -Nru timeshift-20.03+ds/debian/timeshift.1 timeshift-20.03/debian/timeshift.1 --- timeshift-20.03+ds/debian/timeshift.1 2020-03-15 19:16:40.000000000 +0000 +++ timeshift-20.03/debian/timeshift.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,156 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" (C) Copyright 2020 Tony George , -.\" -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH TIMESHIFT 1 "March 8 2020" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -timeshift \- a system restore utility -.SH SYNOPSIS -.B timeshift -.RI --check -.br -.B timeshift -.RI --create [OPTIONS] -.br -.B timeshift -.RI --restore [OPTIONS] -.br -.B timeshift -.RI --delete-[all] [OPTIONS] -.br -.B timeshift -.RI --list-{snapshots|devices} [OPTIONS] -.br -.SH DESCRIPTION -.B timeshift -is a system restore utility which takes snapshots -of the system at regular intervals. These snapshots can be restored -at a later date to undo system changes. Creates incremental snapshots -using rsync or BTRFS snapshots using BTRFS tools. -.SH OPTIONS -A summary of options is included below. -.TP -List: -.br -.B \-\-list[-snapshots] -List snapshots. -.br -.B \-\-list-devices -List devices. -.TP -Backup: -.br -.B \-\-check -Create snapshot if scheduled. -.br -.B \-\-create -Create snapshot (even if not scheduled). -.br -.B \-\-comments -Set snapshot description. -.br -.B \-\-tags {O,B,H,D,W,M} -Add tags to snapshot (default: O). -.TP -Restore: -.br -.B \-\-restore -Restore snapshot. -.br -.B \-\-clone -Clone current system. -.br -.B \-\-snapshot -Specify snapshot to restore. -.br -.B \-\-target[-device] -Specify target device. -.br -.B \-\-grub[-device] -Specify device for installing GRUB2 bootloader. -.br -.B \-\-skip-grub -Skip GRUB2 reinstall. -.TP -Delete: -.br -.B \-\-delete -Delete snapshot. -.br -.B \-\-delete-all -Delete all snapshots. -.TP -Global: -.br -.B \-\-snapshot-device -Specify backup device (default: config). -.br -.B \-\-yes -Answer YES to all confirmation prompts. -.br -.B \-\-btrfs -Switch to BTRFS mode (default: config). -.br -.B \-\-rsync -Switch to RSYNC mode (default: config). -.br -.B \-\-debug -Show additional debug messages. -.br -.B \-\-verbose -Show rsync output (default). -.br -.B \-\-quiet -Hide rsync output. -.br -.B \-\-scripted -Run in non-interactive mode. -.br -.B \-\-help -Show all options. -.br -.SH EXAMPLES -.br -timeshift --list -.br -timeshift --list --snapshot-device /dev/sda1 -.br -timeshift --create --comments "after update" --tags D -.br -timeshift --restore -.br -timeshift --restore --snapshot '2014-10-12_16-29-08' --target /dev/sda1 -.br -timeshift --delete --snapshot '2014-10-12_16-29-08' -.br -timeshift --delete-all -.br -.SH NOTES -.br -1) --create will always create a new snapshot -.br -2) --check will create a snapshot only if a scheduled snapshot is due -.br -3) Use --restore without other options to select options interactively -.br -4) UUID can be specified instead of device name -.br -5) Default values will be loaded from app config if options are not specified -.br -.SH AUTHOR -.br -Written by Tony George. diff -Nru timeshift-20.03+ds/debian/timeshift.appdata.xml timeshift-20.03/debian/timeshift.appdata.xml --- timeshift-20.03+ds/debian/timeshift.appdata.xml 2020-03-15 19:16:40.000000000 +0000 +++ timeshift-20.03/debian/timeshift.appdata.xml 2020-05-07 16:57:16.000000000 +0000 @@ -43,7 +43,6 @@

- timeshift-gtk.desktop diff -Nru timeshift-20.03+ds/debian/timeshift.manpages timeshift-20.03/debian/timeshift.manpages --- timeshift-20.03+ds/debian/timeshift.manpages 2020-03-15 19:16:40.000000000 +0000 +++ timeshift-20.03/debian/timeshift.manpages 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/timeshift.1 diff -Nru timeshift-20.03+ds/debian/upstream/metadata timeshift-20.03/debian/upstream/metadata --- timeshift-20.03+ds/debian/upstream/metadata 2020-03-15 19:16:40.000000000 +0000 +++ timeshift-20.03/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -Contact: https://teejeetech.in/timeshift/ -FAQ: https://teejeetech.in/timeshift/ -Repository: https://github.com/teejee2008/timeshift -Repository-Browse: https://github.com/teejee2008/timeshift diff -Nru timeshift-20.03+ds/debian/watch timeshift-20.03/debian/watch --- timeshift-20.03+ds/debian/watch 2020-01-19 04:35:47.000000000 +0000 +++ timeshift-20.03/debian/watch 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -version=4 -opts="dversionmangle=s/\+(debian|dfsg|ds|deb)(\.\d+)?$//,repacksuffix=+ds, \ - filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%timeshift-$1.tar.gz%" \ - https://github.com/teejee2008/timeshift/tags \ - (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate diff -Nru timeshift-20.03+ds/.gitignore timeshift-20.03/.gitignore --- timeshift-20.03+ds/.gitignore 2020-03-05 03:28:13.000000000 +0000 +++ timeshift-20.03/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -src/timeshift -src/timeshift-gtk -designs/ -release/source -release/amd64 -release/i386 -release/armel -release/armhf -release/*.deb -release/*.run -*.geany -*.mo -*.c -*.o -.bzr -.git -*~ -po-lp/ -parts/ -stage/ -prime/ -snap/ -release/ -debian/timeshift/ -rpm/