From d39f9477fdd75d499f27ac7bc18b298bd1de0e1b Mon Sep 17 00:00:00 2001 From: Adam McKellar Date: Sun, 27 Oct 2024 15:15:40 +0100 Subject: [PATCH] fix: missing license for dictionary --- CHANGELOG.md | 16 ++++++++++++++-- Cargo.lock | 17 ++++------------- Cargo.toml | 6 +++--- build.rs | 31 ++++++++++++++++++++++++++++--- dictionary/LICENSE-DICTIONARY.txt | 4 ---- 5 files changed, 49 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a92a7f..8d5c33b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.1.8] - 2024-10-11 + +### Fixed + +* Missing MIT license for dictionary. + +### Changed + +* Upgraded to `license-fetcher == 0.5.0`. + + ## [0.1.7] - 2024-10-11 ### Changed @@ -130,8 +141,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [cargo about]: https://github.com/EmbarkStudios/cargo-about -[Unreleased]: https://github.com/WyvernIXTL/ubilerntui/compare/v0.1.9...HEAD -[0.1.9]: https://github.com/WyvernIXTL/ubilerntui/compare/v0.1.6...v0.1.9 +[Unreleased]: https://github.com/WyvernIXTL/ubilerntui/compare/v0.1.8...HEAD +[0.1.8]: https://github.com/WyvernIXTL/ubilerntui/compare/v0.1.7...v0.1.8 +[0.1.7]: https://github.com/WyvernIXTL/ubilerntui/compare/v0.1.6...v0.1.7 [0.1.6]: https://github.com/WyvernIXTL/ubilerntui/compare/v0.1.5...v0.1.6 [0.1.5]: https://github.com/WyvernIXTL/ubilerntui/compare/v0.1.4...v0.1.5 [0.1.4]: https://github.com/WyvernIXTL/ubilerntui/compare/v0.1.3...v0.1.4 diff --git a/Cargo.lock b/Cargo.lock index 9f5c156..3ea1d7d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -668,9 +668,9 @@ dependencies = [ [[package]] name = "license-fetcher" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5bb75ad8772b52bd4f216d3f55cbdf88ff6c64bd3c19b74ad39e48557eed176" +checksum = "904bd80dd046aa1c625ddfd81c88a85a54ff3ca0ddcce0ca1ad9c8d7b6db185d" dependencies = [ "bincode 2.0.0-rc.3", "directories", @@ -1517,7 +1517,7 @@ dependencies = [ [[package]] name = "ubilerntui" -version = "0.1.7" +version = "0.1.8" dependencies = [ "chrono", "clap", @@ -1703,7 +1703,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -1739,15 +1739,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", -] - [[package]] name = "windows-targets" version = "0.48.5" diff --git a/Cargo.toml b/Cargo.toml index e40a005..1537a7c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ubilerntui" -version = "0.1.7" +version = "0.1.8" edition = "2021" authors = ["Adam McKellar"] description = "This is a terminal UI for learning for the UKW-Sprechfunkzeugnis für den Binnenschiffahrtsfunk." @@ -29,13 +29,13 @@ once_cell = "1.19.0" colored = "2.1.0" textwrap = {version = "0.16.1", features = ["hyphenation"]} hyphenation = "0.8.4" -license-fetcher = "0.4.0" +license-fetcher = "0.5.0" [dev-dependencies] pretty_assertions = "1.4.1" [build-dependencies] -license-fetcher = { version = "0.4.0", features = ["build"] } +license-fetcher = { version = "0.5.0", features = ["build"] } [package.metadata.deb] maintainer = "Adam McKellar " diff --git a/build.rs b/build.rs index fbb5744..8bc4119 100644 --- a/build.rs +++ b/build.rs @@ -1,8 +1,33 @@ -use license_fetcher::build_script::generate_package_list_with_licenses; +use std::concat; +use std::fs::read_to_string; + +use license_fetcher::{build_script::generate_package_list_with_licenses, Package}; fn main() { - generate_package_list_with_licenses(); + let mut packages = generate_package_list_with_licenses(); + + packages.push(Package { + name: "hyph-de-1996".to_owned(), + version: "CTAN-2021.03.21".to_owned(), + authors: vec!["Deutschsprachige Trennmustermannschaft ".to_owned()], + description: Some( + "TeX-Trennmuster für die reformierte (2006) deutsche Rechtschreibung".to_owned(), + ), + homepage: None, + repository: Some("https://github.com/hyphenation/tex-hyphen".to_owned()), + license_identifier: Some("MIT".to_owned()), + license_text: Some( + read_to_string(concat!( + env!("CARGO_MANIFEST_DIR"), + "/dictionary/LICENSE-DICTIONARY.txt" + )) + .expect("Failed reading license of hyph-de-1996"), + ), + }); + + packages.write(); + println!("cargo::rerun-if-changed=build.rs"); println!("cargo::rerun-if-changed=Cargo.lock"); println!("cargo::rerun-if-changed=Cargo.toml"); -} \ No newline at end of file +} diff --git a/dictionary/LICENSE-DICTIONARY.txt b/dictionary/LICENSE-DICTIONARY.txt index 48e0cac..8b4610f 100644 --- a/dictionary/LICENSE-DICTIONARY.txt +++ b/dictionary/LICENSE-DICTIONARY.txt @@ -1,7 +1,3 @@ -================================================================================ -de-1996.standard.bincode LICENCE -================================================================================ - de-1996.standard.bincode is part of the hyphenation crate . Generated from . Following is it's copyright notice: