From fa8f9b5b4626aa04dc96f250fb05fea405df162a Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Tue, 31 Jan 2023 19:47:28 +0100 Subject: [PATCH] chore: Clean up cargo manifests and license Signed-off-by: Christoph Heiss --- .gitattributes | 2 +- Cargo.toml | 2 +- LICENSE | 2 +- bitwarden/Cargo.toml | 6 ++++-- bitwarden/LICENSE | 22 ---------------------- 5 files changed, 7 insertions(+), 27 deletions(-) delete mode 100644 bitwarden/LICENSE diff --git a/.gitattributes b/.gitattributes index 72cc6be..4a2c45b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -Cargo.lock merge=binary +**/Cargo.lock binary diff --git a/Cargo.toml b/Cargo.toml index b48cd2f..db4d595 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "bwtui" version = "0.2.0" -authors = ["Christoph Heiss "] +authors = ["Christoph Heiss "] edition = "2021" license = "MIT" categories = ["command-line-utilities"] diff --git a/LICENSE b/LICENSE index 972b244..e2f6036 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2019-2020 Christoph Heiss +Copyright (c) Christoph Heiss Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/bitwarden/Cargo.toml b/bitwarden/Cargo.toml index 7e4536c..488ba60 100644 --- a/bitwarden/Cargo.toml +++ b/bitwarden/Cargo.toml @@ -1,8 +1,10 @@ [package] name = "bitwarden" version = "0.2.0" -authors = ["Christoph Heiss "] -edition = "2018" +authors = ["Christoph Heiss "] +edition = "2021" +license = "MIT" +repository = "https://git.sr.ht/~c8h4/bwtui" [dependencies] aes = "0.6.0" diff --git a/bitwarden/LICENSE b/bitwarden/LICENSE deleted file mode 100644 index 972b244..0000000 --- a/bitwarden/LICENSE +++ /dev/null @@ -1,22 +0,0 @@ -MIT License - -Copyright (c) 2019-2020 Christoph Heiss - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -