From 49d37d3f656031e3f2178858fc2d67347ece0e4e Mon Sep 17 00:00:00 2001 From: Christian Buhtz Date: Fri, 8 Nov 2024 14:33:48 +0100 Subject: [PATCH] chore: Remove debug code and improve SPDX license meta data Close #1918 with removing some forgotten debug code. Add some more SDPX license data. --- CONTRIBUTING.md | 1 + common/backintime.desktop | 11 ++++++++++- common/bash-completion/backintime | 8 ++++++++ doc/ENCRYPT_TRANSITION.md | 10 ++++++++++ doc/maintain/1_doc_howto.md | 2 +- doc/maintain/2_localization.md | 9 +++++++++ ...How_to_set_up_openssh_server_for_ssh_unit_tests.md | 9 +++++++++ ...trol_files_usage_(locks_flocks_logs_and_others).md | 9 +++++++++ qt/app.py | 6 ++++-- 9 files changed, 61 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 74b1ee5cf..2410d7ed7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -163,6 +163,7 @@ the packages provided by the official repository of your GNU/Linux distribution. - `flake8` - `ruff` (>= 0.6.0) - `codespell` + - `reuse` (>= 4.0.0) * Dependencies to build documentation - All runtime, build, testing dependencies including the recommended diff --git a/common/backintime.desktop b/common/backintime.desktop index b036c42b7..ca02a415c 100644 --- a/common/backintime.desktop +++ b/common/backintime.desktop @@ -1,8 +1,17 @@ +# SPDX-FileCopyrightText: © 2009 Back In Time team +# +# SPDX-License-Identifier: CC0-1.0 +# +# This file is released under Creative Commons Zero 1.0 (CC0-1.0) and part of +# the program "Back In Time". The program as a whole is released under GNU +# General Public License v2 or any later version (GPL-2.0-or-later). +# See LICENSES directory or go to +# and . [Desktop Entry] Version=1.0 Name=Backintime Password Cache Exec=/bin/sh -c "backintime pw-cache start 2>&1 >/dev/null" -Comment=Cache passwords for non-interactive Backintime cronjobs +Comment=Cache passwords for non-interactive Back In Time cronjobs Icon=gtk-save SingleMainWindow=true Terminal=false diff --git a/common/bash-completion/backintime b/common/bash-completion/backintime index 7d977b6a8..1a91d6e48 100644 --- a/common/bash-completion/backintime +++ b/common/bash-completion/backintime @@ -1,3 +1,11 @@ +# SPDX-FileCopyrightText: © 2015 Germar Reitze +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# This file is part of the program "Back In time" which is released under GNU +# General Public License v2 (GPLv2). See file/folder LICENSE or go to +# . + # extract profile and config arguments _bit_extr_opts() { diff --git a/doc/ENCRYPT_TRANSITION.md b/doc/ENCRYPT_TRANSITION.md index 10adfd340..6fccf76ba 100644 --- a/doc/ENCRYPT_TRANSITION.md +++ b/doc/ENCRYPT_TRANSITION.md @@ -1,3 +1,13 @@ + + # Transition of the encryption feature in _Back In Time_ July 2024 diff --git a/doc/maintain/1_doc_howto.md b/doc/maintain/1_doc_howto.md index 9bdec0133..2f6cb229f 100644 --- a/doc/maintain/1_doc_howto.md +++ b/doc/maintain/1_doc_howto.md @@ -1,5 +1,5 @@ # Translation and localization (l10n) of Back In Time using Weblate Feel free to [open issues](https://github.com/bit-team/backintime/issues) or contact the [maintenance team on the mailing list](https://mail.python.org/mailman3/lists/bit-dev.python.org/) if this text is difficult to understand or not helpful. diff --git a/doc/maintain/3_How_to_set_up_openssh_server_for_ssh_unit_tests.md b/doc/maintain/3_How_to_set_up_openssh_server_for_ssh_unit_tests.md index 14706fbbb..98d51ed77 100644 --- a/doc/maintain/3_How_to_set_up_openssh_server_for_ssh_unit_tests.md +++ b/doc/maintain/3_How_to_set_up_openssh_server_for_ssh_unit_tests.md @@ -1,3 +1,12 @@ + # How to set up a local `openssh-server` to enable ssh unit tests - [Motivation](#motivation) diff --git a/doc/maintain/4_Control_files_usage_(locks_flocks_logs_and_others).md b/doc/maintain/4_Control_files_usage_(locks_flocks_logs_and_others).md index 542376ab0..eba37a21e 100644 --- a/doc/maintain/4_Control_files_usage_(locks_flocks_logs_and_others).md +++ b/doc/maintain/4_Control_files_usage_(locks_flocks_logs_and_others).md @@ -1,3 +1,12 @@ + # Usage of control files in _Back In Time_ (developer documentation) Table of contents: diff --git a/qt/app.py b/qt/app.py index 8ca24be73..b8221fcfa 100644 --- a/qt/app.py +++ b/qt/app.py @@ -588,12 +588,14 @@ def _create_actions(self): _('Restore the selected files or directories to a ' 'new destination.')), 'act_restore_parent': ( - icon.RESTORE, 'RESTORE PARENT (DEBUG)', + icon.RESTORE, + None, # text label is set elsewhere self.restoreParent, None, _('Restore the currently shown directory and all its contents ' 'to the original destination.')), 'act_restore_parent_to': ( - icon.RESTORE_TO, 'RESTORE PARENT TO (DEBUG)', + icon.RESTORE_TO, + None, # text label is set elsewhere self.restoreParentTo, None, _('Restore the currently shown directory and all its contents ' 'to a new destination.')),