diff --git a/src/chrono/debian/changelog b/src/chrono/debian/changelog index 34c2334..5fbe703 100644 --- a/src/chrono/debian/changelog +++ b/src/chrono/debian/changelog @@ -1,3 +1,12 @@ +rust-chrono (0.4.23-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Team upload. + * Package chrono 0.4.23 from crates.io using debcargo 2.6.0 (Closes: #1024454) + * Update patches for new upstream. + * Fix tests with --no-default-features. + + -- Peter Michael Green Sun, 20 Nov 2022 08:37:24 +0000 + rust-chrono (0.4.22-1) unstable; urgency=medium [ Blair Noctis ] diff --git a/src/chrono/debian/copyright.debcargo.hint b/src/chrono/debian/copyright.debcargo.hint index 90c5632..eac1cfb 100644 --- a/src/chrono/debian/copyright.debcargo.hint +++ b/src/chrono/debian/copyright.debcargo.hint @@ -12,7 +12,7 @@ be correct information so you should review and fix this before uploading to the archive. -Files: ./LICENSE.txt +Files: LICENSE.txt Copyright: 2014--2017, Kang Seonghoon and 2014, Kang Seonghoon. @@ -21,35 +21,35 @@ FIXME (overlay): These notices are extracted from files. Please review them before uploading to the archive. -Files: ./src/format/parse.rs +Files: src/format/parse.rs Copyright: 2015, John Nagle. License: UNKNOWN-LICENSE; FIXME (overlay) Comment: FIXME (overlay): These notices are extracted from files. Please review them before uploading to the archive. -Files: ./src/offset/local/stub.rs +Files: src/offset/local/stub.rs Copyright: 2012-2014 The Rust Project Developers License: UNKNOWN-LICENSE; FIXME (overlay) Comment: FIXME (overlay): These notices are extracted from files. Please review them before uploading to the archive. -Files: ./src/offset/local/unix.rs +Files: src/offset/local/unix.rs Copyright: 2012-2014 The Rust Project Developers License: UNKNOWN-LICENSE; FIXME (overlay) Comment: FIXME (overlay): These notices are extracted from files. Please review them before uploading to the archive. -Files: ./src/offset/local/windows.rs +Files: src/offset/local/windows.rs Copyright: 2012-2014 The Rust Project Developers License: UNKNOWN-LICENSE; FIXME (overlay) Comment: FIXME (overlay): These notices are extracted from files. Please review them before uploading to the archive. -Files: ./src/oldtime.rs +Files: src/oldtime.rs Copyright: 2012-2014 The Rust Project Developers License: UNKNOWN-LICENSE; FIXME (overlay) Comment: diff --git a/src/chrono/debian/patches/drop-windows-dep.patch b/src/chrono/debian/patches/drop-windows-dep.patch index cefaea7..993c116 100644 --- a/src/chrono/debian/patches/drop-windows-dep.patch +++ b/src/chrono/debian/patches/drop-windows-dep.patch @@ -8,7 +8,7 @@ "iana-time-zone", ] default = [ -@@ -115,17 +114,6 @@ +@@ -115,13 +114,3 @@ version = "0.2" optional = true @@ -22,7 +22,3 @@ - "timezoneapi", -] -optional = true -- - [badges.appveyor] - repository = "chronotope/chrono" - diff --git a/src/chrono/debian/patches/fix-tests-no-default-features.patch b/src/chrono/debian/patches/fix-tests-no-default-features.patch new file mode 100644 index 0000000..de1b417 --- /dev/null +++ b/src/chrono/debian/patches/fix-tests-no-default-features.patch @@ -0,0 +1,24 @@ +--- rust-chrono-0.4.23.orig/tests/dateutils.rs ++++ rust-chrono-0.4.23/tests/dateutils.rs +@@ -1,10 +1,11 @@ + use chrono::offset::TimeZone; ++#[cfg(feature="clock")] + use chrono::Local; + use chrono::{Datelike, NaiveDate, NaiveDateTime, Timelike}; + + use std::{path, process}; + +-#[cfg(unix)] ++#[cfg(all(unix,feature="clock"))] + fn verify_against_date_command_local(path: &'static str, dt: NaiveDateTime) { + let output = process::Command::new(path) + .arg("-d") +@@ -49,7 +50,7 @@ fn verify_against_date_command_local(pat + } + + #[test] +-#[cfg(unix)] ++#[cfg(all(unix,feature="clock"))] + fn try_verify_against_date_command() { + let date_path = "/usr/bin/date"; + diff --git a/src/chrono/debian/patches/remove-benchmarks.patch b/src/chrono/debian/patches/remove-benchmarks.patch index 543f7ff..e1040f7 100644 --- a/src/chrono/debian/patches/remove-benchmarks.patch +++ b/src/chrono/debian/patches/remove-benchmarks.patch @@ -8,15 +8,12 @@ [package.metadata.docs.rs] features = ["serde"] -@@ -41,22 +42,6 @@ - [lib] - name = "chrono" - +@@ -44,4 +44,0 @@ -[[bench]] -name = "chrono" -harness = false -required-features = ["__internal_bench"] -- +@@ -49,7 +46,0 @@ -[[bench]] -name = "serde" -harness = false @@ -24,18 +21,9 @@ - "__internal_bench", - "serde", -] -- +@@ -60,3 +60,0 @@ -[dependencies.criterion] --version = "0.3" +-version = "0.4.0" -optional = true - - [dependencies.iana-time-zone] - version = "0.1.44" -@@ -107,7 +92,6 @@ - - [features] - __doctest = [] +@@ -110 +94,0 @@ -__internal_bench = ["criterion"] - alloc = [] - clock = [ - "std", diff --git a/src/chrono/debian/patches/series b/src/chrono/debian/patches/series index ad3abf5..8187e0e 100644 --- a/src/chrono/debian/patches/series +++ b/src/chrono/debian/patches/series @@ -3,3 +3,4 @@ remove-benchmarks.patch remove-time.patch drop-windows-dep.patch +fix-tests-no-default-features.patch