From 0ae5bcd2fae7beecccfa3858d0ace220441bd9a9 Mon Sep 17 00:00:00 2001 From: Christian Buhtz Date: Mon, 12 Feb 2024 13:58:52 +0100 Subject: [PATCH 01/21] initial generated appstream xml --- bit_team.back_in_time.gui.metainfo.xml | 32 ++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 bit_team.back_in_time.gui.metainfo.xml diff --git a/bit_team.back_in_time.gui.metainfo.xml b/bit_team.back_in_time.gui.metainfo.xml new file mode 100644 index 000000000..2fc699e5e --- /dev/null +++ b/bit_team.back_in_time.gui.metainfo.xml @@ -0,0 +1,32 @@ + + + bit_team.back_in_time.gui + + Back In Time + An easy-to-use backup tool for GNU Linux using rsync in the back + + FSFAP + GPL-2.0-only + + +

+ It is an easy-to-use backup tool for files and folders. It runs on GNU Linux and provides a command line tool backintime and a Qt5 GUI backintime-qt both written in Python3. It uses [rsync](https://rsync.samba.org/) to take manual or scheduled snapshots and stores them locally or remotely through SSH. Each snapshot is its own folder with copies of the original files, but unchanged files are hard-linked between snapshots to save space. It was inspired by [FlyBack](https://en.wikipedia.org/wiki/FlyBack). +

+

+ You only need to specify 3 things: +

+

+ What folders to back up. Where to save snapshots. * The backup frequency (manual, every hour, every day, every month).y day, every month). +

+ + + backintime-qt.desktop + + + https://github.com/bit-team/doc/blob/master/_images/main_window.png + + + https://github.com/bit-team/doc/blob/master/_images/settings_general.png + + + From 7494a179d08e349bd4ab5ef5a5944f881e4343c9 Mon Sep 17 00:00:00 2001 From: Christian Buhtz Date: Mon, 12 Feb 2024 14:33:48 +0100 Subject: [PATCH 02/21] fixes --- bit_team.back_in_time.gui.metainfo.xml | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/bit_team.back_in_time.gui.metainfo.xml b/bit_team.back_in_time.gui.metainfo.xml index 2fc699e5e..0d698a94e 100644 --- a/bit_team.back_in_time.gui.metainfo.xml +++ b/bit_team.back_in_time.gui.metainfo.xml @@ -10,23 +10,34 @@

- It is an easy-to-use backup tool for files and folders. It runs on GNU Linux and provides a command line tool backintime and a Qt5 GUI backintime-qt both written in Python3. It uses [rsync](https://rsync.samba.org/) to take manual or scheduled snapshots and stores them locally or remotely through SSH. Each snapshot is its own folder with copies of the original files, but unchanged files are hard-linked between snapshots to save space. It was inspired by [FlyBack](https://en.wikipedia.org/wiki/FlyBack). + It is an easy-to-use backup tool for files and folders. It runs on GNU + Linux and provides a command line tool "backintime" and a Qt5 GUI + "backintime-qt". It uses "rsync" in the back to take manual or scheduled + snapshots and stores them locally or remotely through SSH. Each snapshot + is its own folder with copies of the original files, but unchanged files + are hard-linked between snapshots to save space. It was inspired by + "FlyBack".

You only need to specify 3 things: -

-

- What folders to back up. Where to save snapshots. * The backup frequency (manual, every hour, every day, every month).y day, every month). +

    +
  1. What folders to back up.
    2. +
  2. Where to save snapshots.
    3. +
  3. The backup frequency (manual, every hour, every day, every month)
    4. +

backintime-qt.desktop - https://github.com/bit-team/doc/blob/master/_images/main_window.png + https://raw.githubusercontent.com/bit-team/doc/master/_images/main_window.png + + + https://raw.githubusercontent.com/bit-team/doc/master/_images/settings_general.png - https://github.com/bit-team/doc/blob/master/_images/settings_general.png + https://translate.codeberg.org/media/screenshots/bit_menubar.gif From c244d1590173e44674083db7b55d0a1abc62a27d Mon Sep 17 00:00:00 2001 From: Christian Buhtz Date: Mon, 12 Feb 2024 16:17:58 +0100 Subject: [PATCH 03/21] x --- bit_team.back_in_time.gui.metainfo.xml | 114 +++++++++++++++---------- 1 file changed, 71 insertions(+), 43 deletions(-) diff --git a/bit_team.back_in_time.gui.metainfo.xml b/bit_team.back_in_time.gui.metainfo.xml index 0d698a94e..bb9f24064 100644 --- a/bit_team.back_in_time.gui.metainfo.xml +++ b/bit_team.back_in_time.gui.metainfo.xml @@ -1,43 +1,71 @@ - - - bit_team.back_in_time.gui - - Back In Time - An easy-to-use backup tool for GNU Linux using rsync in the back - - FSFAP - GPL-2.0-only - - -

- It is an easy-to-use backup tool for files and folders. It runs on GNU - Linux and provides a command line tool "backintime" and a Qt5 GUI - "backintime-qt". It uses "rsync" in the back to take manual or scheduled - snapshots and stores them locally or remotely through SSH. Each snapshot - is its own folder with copies of the original files, but unchanged files - are hard-linked between snapshots to save space. It was inspired by - "FlyBack". -

-

- You only need to specify 3 things: -

    -
  1. What folders to back up.
    2. -
  2. Where to save snapshots.
    3. -
  3. The backup frequency (manual, every hour, every day, every month)
    4. -
-

- - - backintime-qt.desktop - - - https://raw.githubusercontent.com/bit-team/doc/master/_images/main_window.png - - - https://raw.githubusercontent.com/bit-team/doc/master/_images/settings_general.png - - - https://translate.codeberg.org/media/screenshots/bit_menubar.gif - - - + + + + org.bit_team.back_in_time.gui + + Back In Time + Backup tool for GNU Linux desktop using rsync with its hard-links feature to save storage space + + FSFAP + GPL-2.0 + + +

+ It is an easy-to-use backup tool for files and folders. It runs on GNU + Linux and provides a command line tool "backintime" and a Qt5 GUI + "backintime-qt". It uses "rsync" in the back to take manual or scheduled + snapshots and stores them locally or remotely through SSH. Each snapshot + is its own folder with copies of the original files, but unchanged files + are hard-linked between snapshots to save space. It was inspired by + "FlyBack". +

+

+ You only need to specify 3 things: +

+
    +
  1. What folders to back up.
    2. +
  2. Where to save snapshots.
    3. +
  3. The backup frequency (manual, every hour, every day, every month).
    4. +
+ + + document-save + + + + System + Archiving + + + + Backup + Rsync + GUI + + + https://github.com/bit-team/backintime + https://github.com/bit-team/backintime/issues + https://github.com/bit-team/backintime/blob/dev/FAQ.md + https://backintime.readthedocs.io/ + https://translate.codeberg.org/engage/backintime + https://mail.python.org/mailman3/lists/bit-dev.python.org + https://github.com/bit-team/backintime + https://github.com/bit-team/backintime/blob/dev/CONTRIBUTING.md + + backintime-qt.desktop + + + + Main window + https://raw.githubusercontent.com/bit-team/doc/master/_images/main_window.png + + + https://raw.githubusercontent.com/bit-team/doc/master/_images/settings_general.png + + + https://translate.codeberg.org/media/screenshots/bit_menubar.gif + + + + + From af2a6f001a6c4b7da571aed36ed3a0a4708f3622 Mon Sep 17 00:00:00 2001 From: Christian Buhtz Date: Mon, 12 Feb 2024 16:19:10 +0100 Subject: [PATCH 04/21] x --- bit_team.back_in_time.gui.metainfo.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/bit_team.back_in_time.gui.metainfo.xml b/bit_team.back_in_time.gui.metainfo.xml index bb9f24064..14dd8c369 100644 --- a/bit_team.back_in_time.gui.metainfo.xml +++ b/bit_team.back_in_time.gui.metainfo.xml @@ -1,5 +1,13 @@ - + + + org.bit_team.back_in_time.gui From 8f0b843b7e6b10694e4d1b4179bf7e78eb10953a Mon Sep 17 00:00:00 2001 From: Christian Buhtz Date: Mon, 12 Feb 2024 16:25:17 +0100 Subject: [PATCH 05/21] x# --- bit_team.back_in_time.gui.metainfo.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/bit_team.back_in_time.gui.metainfo.xml b/bit_team.back_in_time.gui.metainfo.xml index 14dd8c369..aac1c00c8 100644 --- a/bit_team.back_in_time.gui.metainfo.xml +++ b/bit_team.back_in_time.gui.metainfo.xml @@ -62,6 +62,15 @@ backintime-qt.desktop + Main window @@ -75,5 +84,8 @@ + + + bit-dev@python.org From bfd5d6e45274983149a1bcbfae38e6fdc733b4a9 Mon Sep 17 00:00:00 2001 From: Christian Buhtz Date: Mon, 12 Feb 2024 16:55:23 +0100 Subject: [PATCH 06/21] x --- bit_team.back_in_time.gui.metainfo.xml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/bit_team.back_in_time.gui.metainfo.xml b/bit_team.back_in_time.gui.metainfo.xml index aac1c00c8..a5d5ebdb5 100644 --- a/bit_team.back_in_time.gui.metainfo.xml +++ b/bit_team.back_in_time.gui.metainfo.xml @@ -74,13 +74,11 @@ Main window - https://raw.githubusercontent.com/bit-team/doc/master/_images/main_window.png + https://translate.codeberg.org/media/screenshots/bit_16to9_960x540_mainwindow.png - https://raw.githubusercontent.com/bit-team/doc/master/_images/settings_general.png - - - https://translate.codeberg.org/media/screenshots/bit_menubar.gif + Setup of SSH snapshot profile + https://translate.codeberg.org/media/screenshots/bit_16to9_1280x720_general_ssh.png From 8d4c81ced6bf468a66b1135c9d1e24f327dc38e8 Mon Sep 17 00:00:00 2001 From: Christian Buhtz Date: Mon, 12 Feb 2024 17:17:43 +0100 Subject: [PATCH 07/21] ignore qt-root in AppStream --- qt/backintime-qt-root.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/qt/backintime-qt-root.desktop b/qt/backintime-qt-root.desktop index 94603b0bf..c91fedeb0 100644 --- a/qt/backintime-qt-root.desktop +++ b/qt/backintime-qt-root.desktop @@ -12,3 +12,4 @@ Comment=Simple backup system Comment[de]=Ein simples Backup-Programm inspiriert von »Time Machine«, »TimeVault« und dem »flyback project«. Comment[sl]=Enostaven sistem ustvarjanja varnostnih kopij Keywords=automatic;snapshot;restore;rsync;root; +X-AppStream-Ignore=true \ No newline at end of file From b34b5021ed8382163f42f518b66f05898818fdcb Mon Sep 17 00:00:00 2001 From: Christian Buhtz Date: Wed, 14 Feb 2024 10:26:15 +0100 Subject: [PATCH 08/21] set valid appstream id --- ...gui.metainfo.xml => io.github.bit_team.back_in_time.gui.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) rename bit_team.back_in_time.gui.metainfo.xml => io.github.bit_team.back_in_time.gui.xml (98%) diff --git a/bit_team.back_in_time.gui.metainfo.xml b/io.github.bit_team.back_in_time.gui.xml similarity index 98% rename from bit_team.back_in_time.gui.metainfo.xml rename to io.github.bit_team.back_in_time.gui.xml index a5d5ebdb5..21c9f95e5 100644 --- a/bit_team.back_in_time.gui.metainfo.xml +++ b/io.github.bit_team.back_in_time.gui.xml @@ -9,8 +9,7 @@ - org.bit_team.back_in_time.gui - + io.github.bit_team.back_in_time.gui Back In Time Backup tool for GNU Linux desktop using rsync with its hard-links feature to save storage space From 3bd45e3b3b4084c058d45feb688f416e27d001ac Mon Sep 17 00:00:00 2001 From: Christian Buhtz Date: Wed, 14 Feb 2024 10:46:23 +0100 Subject: [PATCH 09/21] add changelog [skip ci] --- CHANGES | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES b/CHANGES index d2c88daad..aa525e1da 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,7 @@ Back In Time Version 1.4.4-dev (development of upcoming release) +* Build: Add AppStream meta data * Build: PyLint unit test is skipped if PyLint isn't installed, but will always run on TravisCI (#1634) * Feature: Support rsync '--one-file-system' in Expert Options (#1598) * Feature: "*-dev" version strings contain last commit hash (#1637) From 047591484840e5183b4d6c8b60df64cc6218e6ff Mon Sep 17 00:00:00 2001 From: Christian Buhtz Date: Wed, 14 Feb 2024 11:26:57 +0100 Subject: [PATCH 10/21] Install appstream data with qt component --- qt/configure | 3 ++- .../io.github.bit_team.back_in_time.gui.xml | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename io.github.bit_team.back_in_time.gui.xml => qt/io.github.bit_team.back_in_time.gui.xml (100%) diff --git a/qt/configure b/qt/configure index 773cc74ae..4ba10bbd1 100755 --- a/qt/configure +++ b/qt/configure @@ -144,7 +144,7 @@ printf "clean:\n" >> ${MAKEFILE} printf "\trm -f po/*.mo\n" >> ${MAKEFILE} printf "\trm -f man/C/*.gz\n\n" >> ${MAKEFILE} -#create install and uninstall target +# Create install and uninstall target printf "install:\n" >> ${MAKEFILE} # Migration @@ -172,6 +172,7 @@ addComment "application" addInstallDir "/bin" addInstallFile "backintime-qt" "/bin" "755" addInstallFile "backintime-qt_polkit" "/bin" "755" +printf "\tinstall --mode=644 io.github.bit_team.back_in_time.gui.xml /usr/share/metainfo\n" >> ${MAKEFILE} addNewline addComment "dbus service" diff --git a/io.github.bit_team.back_in_time.gui.xml b/qt/io.github.bit_team.back_in_time.gui.xml similarity index 100% rename from io.github.bit_team.back_in_time.gui.xml rename to qt/io.github.bit_team.back_in_time.gui.xml From 443be887f3b83ff1ac7f277a38914858bcc2b165 Mon Sep 17 00:00:00 2001 From: Christian Buhtz Date: Wed, 14 Feb 2024 15:08:12 +0100 Subject: [PATCH 11/21] filename stick to official specs --- qt/configure | 2 +- ...gui.xml => io.github.bit_team.back_in_time.gui.metainfo.xml} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename qt/{io.github.bit_team.back_in_time.gui.xml => io.github.bit_team.back_in_time.gui.metainfo.xml} (100%) diff --git a/qt/configure b/qt/configure index 4ba10bbd1..b393cbdd8 100755 --- a/qt/configure +++ b/qt/configure @@ -172,7 +172,7 @@ addComment "application" addInstallDir "/bin" addInstallFile "backintime-qt" "/bin" "755" addInstallFile "backintime-qt_polkit" "/bin" "755" -printf "\tinstall --mode=644 io.github.bit_team.back_in_time.gui.xml /usr/share/metainfo\n" >> ${MAKEFILE} +printf "\tinstall --mode=644 io.github.bit_team.back_in_time.gui.metainfo.xml /usr/share/metainfo\n" >> ${MAKEFILE} addNewline addComment "dbus service" diff --git a/qt/io.github.bit_team.back_in_time.gui.xml b/qt/io.github.bit_team.back_in_time.gui.metainfo.xml similarity index 100% rename from qt/io.github.bit_team.back_in_time.gui.xml rename to qt/io.github.bit_team.back_in_time.gui.metainfo.xml From 39c7fff0c79ca79943d89b009202ba6c06c7dc52 Mon Sep 17 00:00:00 2001 From: Christian Buhtz Date: Wed, 14 Feb 2024 15:19:04 +0100 Subject: [PATCH 12/21] create metinfo folder if needed --- qt/configure | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/qt/configure b/qt/configure index b393cbdd8..c62dd7512 100755 --- a/qt/configure +++ b/qt/configure @@ -172,7 +172,9 @@ addComment "application" addInstallDir "/bin" addInstallFile "backintime-qt" "/bin" "755" addInstallFile "backintime-qt_polkit" "/bin" "755" -printf "\tinstall --mode=644 io.github.bit_team.back_in_time.gui.metainfo.xml /usr/share/metainfo\n" >> ${MAKEFILE} +printf "\tinstall -d /usr/share/metainfo\n" >> ${MAKEFILE} +addInstallFile "io.github.bit_team.back_in_time.gui.metainfo.xml" "/share/metainfo" +# printf "\tinstall --mode=644 io.github.bit_team.back_in_time.gui.metainfo.xml /usr/share/metainfo\n" >> ${MAKEFILE} addNewline addComment "dbus service" @@ -231,11 +233,10 @@ printf "compress:\n" >> ${MAKEFILE} printf "\t#man pages\n" >> ${MAKEFILE} printf "\tfor i in \$\$(ls -1 man/C/); do case \$\$i in *.gz|*~) continue;; *) gzip -n --best -c man/C/\$\$i > man/C/\$\${i}.gz;; esac; done\n\n" >> ${MAKEFILE} -#uninstall +# Uninstall printf "uninstall: uninstall_files uninstall_dirs\n\n" >> ${MAKEFILE} printf "uninstall_files:\n" >> ${MAKEFILE} cat ${UNINSTALL_FILES} >> ${MAKEFILE} - printf "uninstall_dirs:\n" >> ${MAKEFILE} cat ${UNINSTALL_DIRS} >> ${MAKEFILE} From 4bbf374239b5ab12958f5a403bc62bd614403a0d Mon Sep 17 00:00:00 2001 From: Christian Buhtz Date: Thu, 15 Feb 2024 09:02:00 +0100 Subject: [PATCH 13/21] add root lauchner. but need investigation --- qt/backintime-qt-root.desktop | 3 +-- qt/io.github.bit_team.back_in_time.gui.metainfo.xml | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qt/backintime-qt-root.desktop b/qt/backintime-qt-root.desktop index c91fedeb0..d9a9ae69e 100644 --- a/qt/backintime-qt-root.desktop +++ b/qt/backintime-qt-root.desktop @@ -11,5 +11,4 @@ Categories=Qt;System; Comment=Simple backup system Comment[de]=Ein simples Backup-Programm inspiriert von »Time Machine«, »TimeVault« und dem »flyback project«. Comment[sl]=Enostaven sistem ustvarjanja varnostnih kopij -Keywords=automatic;snapshot;restore;rsync;root; -X-AppStream-Ignore=true \ No newline at end of file +Keywords=automatic;snapshot;restore;rsync;root; \ No newline at end of file diff --git a/qt/io.github.bit_team.back_in_time.gui.metainfo.xml b/qt/io.github.bit_team.back_in_time.gui.metainfo.xml index 21c9f95e5..355160c4b 100644 --- a/qt/io.github.bit_team.back_in_time.gui.metainfo.xml +++ b/qt/io.github.bit_team.back_in_time.gui.metainfo.xml @@ -60,6 +60,7 @@ https://github.com/bit-team/backintime/blob/dev/CONTRIBUTING.md backintime-qt.desktop + backintime-qt-root.desktop