]> git.proxmox.com Git - debcargo-conf.git/commitdiff
chrono - new upstream release (can't be uploaded yet, because it requires rust-iana...
authorPeter Michael Green <plugwash@debian.org>
Sat, 13 Aug 2022 13:15:07 +0000 (13:15 +0000)
committerPeter Michael Green <plugwash@debian.org>
Sat, 13 Aug 2022 13:19:43 +0000 (13:19 +0000)
src/chrono/debian/changelog
src/chrono/debian/copyright
src/chrono/debian/copyright.debcargo.hint
src/chrono/debian/patches/relax-dep.diff [deleted file]
src/chrono/debian/patches/remove-benchmarks.patch
src/chrono/debian/patches/remove-time.patch
src/chrono/debian/patches/remove-unstable-locales.patch
src/chrono/debian/patches/series
src/chrono/debian/patches/strip-wasm.patch
src/chrono/debian/patches/update-bincode-to-1.0.patch [deleted file]

index 3298957e802400acd4df8952961f984a48e3db6c..37dcde26208548f2ccebec46c035ec8ef4584d25 100644 (file)
@@ -1,3 +1,15 @@
+rust-chrono (0.4.21-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Team upload.
+  * Package chrono 0.4.21 from crates.io using debcargo 2.5.0
+    (Closes: #996913, #1017084)
+  * Drop relax-dep.diff, Debian now has the required version of time 0.1
+    (though we currently disable time 0.1 in a later patch anyway)
+  * Drop update-bincode-to-1.0.patch, upstream now depends on bincode 1.3
+  * Update remaining patches for new upstream.
+
+ -- Peter Michael Green <plugwash@debian.org>  Sat, 13 Aug 2022 13:00:51 +0000
+
 rust-chrono (0.4.19-3) unstable; urgency=medium
 
   * Team upload.
index 79f738a5faf6ce9210668b19039c0b0981e72a3f..e6925361c1530d831535bea34b3e3ec72e98978b 100644 (file)
@@ -8,15 +8,15 @@ Source: https://github.com/chronotope/chrono
 Files: *
 Copyright:
  2014-2019 Kang Seonghoon <public+rust@mearie.org>
- 2017-2019 Brandon W Maister <quodlibetor@gmail.com>
+ 2017-2021 Brandon W Maister <quodlibetor@gmail.com>
  2015 John Nagle
  2012-2014 The Rust Project Developers.
- 2014-2019 chrono contributors
+ 2014-2022 chrono contributors
 License: MIT or Apache-2.0
 
 Files: debian/*
 Copyright:
- 2018-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2018-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
  2018-2020 Wolfgang Silbermayr <wolfgang@silbermayr.at>
  2018-2020 kpcyrd <git@rxv.cc>
 License: MIT or Apache-2.0
index ab1a012937f0acac4d5b705b50474a52bab31c6b..90c563211ee1f8602de7420f0f08cfca3e2703bf 100644 (file)
@@ -1,14 +1,10 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: chrono
-Upstream-Contact:
- Kang Seonghoon <public+rust@mearie.org>
- Brandon W Maister <quodlibetor@gmail.com>
+Upstream-Contact: FIXME (overlay) UNKNOWN-AUTHORS
 Source: https://github.com/chronotope/chrono
 
 Files: *
-Copyright:
- FIXME (overlay) UNKNOWN-YEARS Kang Seonghoon <public+rust@mearie.org>
- FIXME (overlay) UNKNOWN-YEARS Brandon W Maister <quodlibetor@gmail.com>
+Copyright: FIXME (overlay) UNKNOWN-AUTHORS FIXME (overlay) UNKNOWN-YEARS
 License: MIT or Apache-2.0
 Comment:
  FIXME (overlay): Since upstream copyright years are not available in
@@ -25,13 +21,6 @@ Comment:
  FIXME (overlay): These notices are extracted from files. Please review them
  before uploading to the archive.
 
-Files: ./src/div.rs
-Copyright: 2013-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/format/parse.rs
 Copyright: 2015, John Nagle.
 License: UNKNOWN-LICENSE; FIXME (overlay)
@@ -39,35 +28,28 @@ Comment:
  FIXME (overlay): These notices are extracted from files. Please review them
  before uploading to the archive.
 
-Files: ./src/oldtime.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/sys.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/sys/stub.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/sys/unix.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/sys/windows.rs
+Files: ./src/oldtime.rs
 Copyright: 2012-2014 The Rust Project Developers
 License: UNKNOWN-LICENSE; FIXME (overlay)
 Comment:
@@ -76,9 +58,9 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2018-2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2018-2021 Wolfgang Silbermayr <wolfgang@silbermayr.at>
- 2018-2021 kpcyrd <git@rxv.cc>
+ 2018-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2018-2022 Wolfgang Silbermayr <wolfgang@silbermayr.at>
+ 2018-2022 kpcyrd <git@rxv.cc>
 License: MIT or Apache-2.0
 
 License: Apache-2.0
diff --git a/src/chrono/debian/patches/relax-dep.diff b/src/chrono/debian/patches/relax-dep.diff
deleted file mode 100644 (file)
index acaf4b9..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -67,7 +67,7 @@
- default-features = false
- [dependencies.time]
--version = "0.1.43"
-+version = "0.1.42"
- optional = true
- [dev-dependencies.bincode]
- version = "0.8.0"
index e45a9d4106d03e3113ea01023829ce8ea516ecc6..946beeb1def9dd1cf312e6f0625fed5b97f0e7b7 100644 (file)
@@ -1,16 +1,10 @@
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -23,6 +23,7 @@
- categories = ["date-and-time"]
- license = "MIT/Apache-2.0"
+@@ -25,2 +25,3 @@
  repository = "https://github.com/chronotope/chrono"
 +autobenches = false
- [package.metadata.docs.rs]
- features = ["serde"]
  
-@@ -32,15 +33,6 @@
- [lib]
- name = "chrono"
+@@ -34,14 +35,2 @@
  
 -[[bench]]
 -name = "chrono"
 -[[bench]]
 -name = "serde"
 -harness = false
--required-features = ["serde"]
- [dependencies.libc]
- version = "0.2.69"
- optional = true
-@@ -68,9 +60,6 @@
- [dev-dependencies.bincode]
- version = "1"
+-required-features = [
+-    "__internal_bench",
+-    "serde",
+-]
  
--[dev-dependencies.criterion]
+@@ -70,4 +62,0 @@
+-[dependencies.criterion]
 -version = "0.3"
+-optional = true
 -
- [dev-dependencies.doc-comment]
- version = "0.3"
-@@ -87,7 +76,6 @@
- [features]
+@@ -89,3 +78,2 @@
  __doctest = []
--__internal_bench = []
+-__internal_bench = ["criterion"]
  alloc = []
- clock = ["libc", "std", "winapi"]
- default = ["clock", "std", "oldtime"]
index be7a1e5a4f1b1af30b5aca5f9506feff013f7059..639ff24203056611f7d9835e74d2869232a7d85e 100644 (file)
@@ -4,38 +4,28 @@ Description: Remove dependency on time crate.
  See: https://github.com/chronotope/chrono/commit/5115c6f5f93d112d48b618edfa1b47d004c39d10
 Author: Peter Michael Green <plugwash@debian.org>
 
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: https://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: 2021-12-18
-
---- rust-chrono-0.4.19.orig/Cargo.toml
-+++ rust-chrono-0.4.19/Cargo.toml
-@@ -54,9 +54,6 @@ version = "1.0.99"
+Index: chrono/Cargo.toml
+===================================================================
+--- chrono.orig/Cargo.toml
++++ chrono/Cargo.toml
+@@ -64,9 +64,6 @@ version = "1.0.99"
  optional = true
  default-features = false
  
 -[dependencies.time]
--version = "0.1.42"
+-version = "0.1.43"
 -optional = true
- [dev-dependencies.bincode]
- version = "1"
  
-@@ -78,8 +75,7 @@ version = "1"
- __doctest = []
- alloc = []
- clock = ["libc", "std", "winapi"]
--default = ["clock", "std", "oldtime"]
+ [dev-dependencies.bincode]
+ version = "1.3.0"
+@@ -96,10 +93,8 @@ clock = [
+ default = [
+     "clock",
+     "std",
+-    "oldtime",
+ ]
+ libc = []
 -oldtime = ["time"]
-+default = ["clock", "std"]
  std = []
- [target."cfg(windows)".dependencies.winapi]
- version = "0.3.0"
+ [target."cfg(not(any(target_os = \"emscripten\", target_os = \"wasi\", target_os = \"solaris\")))".dependencies.iana-time-zone]
index 73f21f1e8d47ad514dc155212551056241b38ca5..0e745446b9158c0a91c9ac2fc8e3d634a27d4494 100644 (file)
@@ -1,21 +1,12 @@
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -53,10 +53,6 @@
- version = "0.2"
- default-features = false
+@@ -56,4 +55,0 @@
 -[dependencies.pure-rust-locales]
 -version = "0.5.2"
 -optional = true
 -
- [dependencies.rustc-serialize]
- version = "0.3.20"
- optional = true
-@@ -97,7 +93,6 @@
- default = ["clock", "std", "oldtime"]
- oldtime = ["time"]
- std = []
--unstable-locales = ["pure-rust-locales", "alloc"]
- wasmbind = ["wasm-bindgen", "js-sys"]
- [target."cfg(all(target_arch = \"wasm32\", not(any(target_os = \"emscripten\", target_os = \"wasi\"))))".dependencies.js-sys]
- version = "0.3"
+@@ -100,4 +95,0 @@
+-unstable-locales = [
+-    "pure-rust-locales",
+-    "alloc",
+-]
index 24d6bd347337c2e4e21d32539e2ce31ccbe3af81..8f38a15a23f5fb1bf4024ec714bdb2623ad8c957 100644 (file)
@@ -1,5 +1,3 @@
-relax-dep.diff
-update-bincode-to-1.0.patch
 remove-unstable-locales.patch
 strip-wasm.patch
 remove-benchmarks.patch
index 612f45ae5b4b65a372c0d31f3607a3d900667cd3..add68d0cd9347cdc2f44bfdfcd9feb7e301c66c3 100644 (file)
@@ -1,19 +1,13 @@
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -93,16 +93,6 @@
- default = ["clock", "std", "oldtime"]
- oldtime = ["time"]
- std = []
--wasmbind = ["wasm-bindgen", "js-sys"]
+@@ -96,10 +95,0 @@
+-wasmbind = []
+-
 -[target."cfg(all(target_arch = \"wasm32\", not(any(target_os = \"emscripten\", target_os = \"wasi\"))))".dependencies.js-sys]
 -version = "0.3"
--optional = true
 -
 -[target."cfg(all(target_arch = \"wasm32\", not(any(target_os = \"emscripten\", target_os = \"wasi\"))))".dependencies.wasm-bindgen]
 -version = "0.2"
--optional = true
+-
 -[target."cfg(all(target_arch = \"wasm32\", not(any(target_os = \"emscripten\", target_os = \"wasi\"))))".dev-dependencies.wasm-bindgen-test]
 -version = "0.3"
- [target."cfg(windows)".dependencies.winapi]
- version = "0.3.0"
- features = ["std", "minwinbase", "minwindef", "timezoneapi"]
diff --git a/src/chrono/debian/patches/update-bincode-to-1.0.patch b/src/chrono/debian/patches/update-bincode-to-1.0.patch
deleted file mode 100644 (file)
index b640041..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
---- a/src/datetime.rs
-+++ b/src/datetime.rs
-@@ -2157,10 +2157,10 @@
-     fn test_serde_bincode() {
-         // Bincode is relevant to test separately from JSON because
-         // it is not self-describing.
--        use self::bincode::{deserialize, serialize, Infinite};
-+        use self::bincode::{deserialize, serialize};
-         let dt = Utc.ymd(2014, 7, 24).and_hms(12, 34, 6);
--        let encoded = serialize(&dt, Infinite).unwrap();
-+        let encoded = serialize(&dt).unwrap();
-         let decoded: DateTime<Utc> = deserialize(&encoded).unwrap();
-         assert_eq!(dt, decoded);
-         assert_eq!(dt.offset(), decoded.offset());
---- a/src/naive/date.rs
-+++ b/src/naive/date.rs
-@@ -1876,10 +1876,10 @@
-     fn test_serde_bincode() {
-         // Bincode is relevant to test separately from JSON because
-         // it is not self-describing.
--        use self::bincode::{deserialize, serialize, Infinite};
-+        use self::bincode::{deserialize, serialize};
-         let d = NaiveDate::from_ymd(2014, 7, 24);
--        let encoded = serialize(&d, Infinite).unwrap();
-+        let encoded = serialize(&d).unwrap();
-         let decoded: NaiveDate = deserialize(&encoded).unwrap();
-         assert_eq!(d, decoded);
-     }
---- a/src/naive/datetime.rs
-+++ b/src/naive/datetime.rs
-@@ -2212,18 +2212,18 @@
-     // it is not self-describing.
-     #[test]
-     fn test_serde_bincode() {
--        use self::bincode::{deserialize, serialize, Infinite};
-+        use self::bincode::{deserialize, serialize};
-         use naive::NaiveDate;
-         let dt = NaiveDate::from_ymd(2016, 7, 8).and_hms_milli(9, 10, 48, 90);
--        let encoded = serialize(&dt, Infinite).unwrap();
-+        let encoded = serialize(&dt).unwrap();
-         let decoded: NaiveDateTime = deserialize(&encoded).unwrap();
-         assert_eq!(dt, decoded);
-     }
-     #[test]
-     fn test_serde_bincode_optional() {
--        use self::bincode::{deserialize, serialize, Infinite};
-+        use self::bincode::{deserialize, serialize};
-         use self::serde_derive::{Deserialize, Serialize};
-         use prelude::*;
-         use serde::ts_nanoseconds_option;
-@@ -2236,7 +2236,7 @@
-         }
-         let expected = Test { one: Some(1), two: Some(Utc.ymd(1970, 1, 1).and_hms(0, 1, 1)) };
--        let bytes: Vec<u8> = serialize(&expected, Infinite).unwrap();
-+        let bytes: Vec<u8> = serialize(&expected).unwrap();
-         let actual = deserialize::<Test>(&(bytes)).unwrap();
-         assert_eq!(expected, actual);
---- a/src/naive/time.rs
-+++ b/src/naive/time.rs
-@@ -1513,10 +1513,10 @@
-     fn test_serde_bincode() {
-         // Bincode is relevant to test separately from JSON because
-         // it is not self-describing.
--        use self::bincode::{deserialize, serialize, Infinite};
-+        use self::bincode::{deserialize, serialize};
-         let t = NaiveTime::from_hms_nano(3, 5, 7, 98765432);
--        let encoded = serialize(&t, Infinite).unwrap();
-+        let encoded = serialize(&t).unwrap();
-         let decoded: NaiveTime = deserialize(&encoded).unwrap();
-         assert_eq!(t, decoded);
-     }
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -70,7 +70,7 @@
- version = "0.1.42"
- optional = true
- [dev-dependencies.bincode]
--version = "0.8.0"
-+version = "1"
- [dev-dependencies.criterion]
- version = "0.3"