diff --git a/Makefile b/Makefile index 462642b..7433141 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ .DELETE_ON_ERROR: -TZDB_VERSION := tzdb-2025c +TZDB_VERSION := tzdb-2026a tzdb_data/src/generated/mod.rs: tmp/${TZDB_VERSION}/usr/share/zoneinfo/ tzdb.tar.lz.sha cd make-tzdb && cargo r -- ../$(@D) ../$< ../tzdb.tar.lz.sha diff --git a/make-tzdb/src/main.rs b/make-tzdb/src/main.rs index b50cde3..56b61cb 100644 --- a/make-tzdb/src/main.rs +++ b/make-tzdb/src/main.rs @@ -148,21 +148,8 @@ fn gen_mod(args: &mut impl Iterator, target_dir: &Path) -> Result let r = format!( r#"{GENERATED_FILE} -// MIT No Attribution -// -// Copyright 2022-2024 René Kijewski -// -// 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. -// -// 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. +// SPDX-License-Identifier: MIT-0 OR MIT OR Apache-2.0 +// SPDX-FileCopyrightText: 2022-2026 René Kijewski #![allow(unknown_lints)] #![allow(clippy::pedantic)] diff --git a/tzdb.tar.lz.sha b/tzdb.tar.lz.sha index 97ba7cf..dc72ca2 100644 --- a/tzdb.tar.lz.sha +++ b/tzdb.tar.lz.sha @@ -1 +1 @@ -6fa233d6a884acd24b52c44b2eecf683f9403f44b39dcbe85b1ec92fc11f4daf6ee5143f05332faf9258b8bd8f7ca7d4882e19b1e3d892b4761be43fd4f39d51 tmp/tzdb-2025c.tar.lz +1824fc2e198a449ebaa41e6c679a494c486b848f13fe8f18f948fde0533e99f5f01e7e7298e257c565838d24ec743e824f402887abdf525d1ce578a714c71414 tmp/tzdb-2026a.tar.lz diff --git a/tzdb_data/Cargo.toml b/tzdb_data/Cargo.toml index e2263b5..609fd7f 100644 --- a/tzdb_data/Cargo.toml +++ b/tzdb_data/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tzdb_data" -version = "0.2.3" +version = "0.2.4" edition = "2021" authors = ["René Kijewski "] repository = "https://github.com/Kijewski/tzdb" diff --git a/tzdb_data/LICENSE.Apache b/tzdb_data/LICENSE.Apache new file mode 120000 index 0000000..182f375 --- /dev/null +++ b/tzdb_data/LICENSE.Apache @@ -0,0 +1 @@ +./src/generated/LICENSE.Apache \ No newline at end of file diff --git a/tzdb_data/LICENSE.MIT b/tzdb_data/LICENSE.MIT new file mode 120000 index 0000000..c6c2b88 --- /dev/null +++ b/tzdb_data/LICENSE.MIT @@ -0,0 +1 @@ +./src/generated/LICENSE.MIT \ No newline at end of file diff --git a/tzdb_data/LICENSE.MIT-0 b/tzdb_data/LICENSE.MIT-0 new file mode 120000 index 0000000..903f13e --- /dev/null +++ b/tzdb_data/LICENSE.MIT-0 @@ -0,0 +1 @@ +./src/generated/LICENSE.MIT-0 \ No newline at end of file diff --git a/tzdb_data/LICENSE.md b/tzdb_data/LICENSE.md deleted file mode 100644 index 79b5018..0000000 --- a/tzdb_data/LICENSE.md +++ /dev/null @@ -1,16 +0,0 @@ -MIT No Attribution - -Copyright 2022-2024 René Kijewski - -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. - -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. diff --git a/tzdb_data/src/generated b/tzdb_data/src/generated index 29b7194..c38fad0 160000 --- a/tzdb_data/src/generated +++ b/tzdb_data/src/generated @@ -1 +1 @@ -Subproject commit 29b71945b1a8cad63f82c46d7ec57b4fb40aa82a +Subproject commit c38fad049edc0c406b9ddb862e65c6abd822579a diff --git a/tzdb_data/src/lib.rs b/tzdb_data/src/lib.rs index cdfe731..c724391 100644 --- a/tzdb_data/src/lib.rs +++ b/tzdb_data/src/lib.rs @@ -1,6 +1,5 @@ -// SPDX-License-Identifier: MIT-0 -// -// Copyright 2022-2024 René Kijewski +// SPDX-License-Identifier: MIT-0 OR MIT OR Apache-2.0 +// SPDX-FileCopyrightText: 2022-2026 René Kijewski #![cfg_attr(docsrs, feature(doc_cfg))] #![allow(unknown_lints)]