Commit 248d35a794aaa096f0795700bee86d1a5878cc72 - rust-libslirp

+12

-0

src/chrono/debian/changelog less more

	0	rust-chrono (0.4.21-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
	1
	2	* Team upload.
	3	* Package chrono 0.4.21 from crates.io using debcargo 2.5.0
	4	(Closes: #996913, #1017084)
	5	* Drop relax-dep.diff, Debian now has the required version of time 0.1
	6	(though we currently disable time 0.1 in a later patch anyway)
	7	* Drop update-bincode-to-1.0.patch, upstream now depends on bincode 1.3
	8	* Update remaining patches for new upstream.
	9
	10	-- Peter Michael Green <plugwash@debian.org> Sat, 13 Aug 2022 13:00:51 +0000
	11
0	12	rust-chrono (0.4.19-3) unstable; urgency=medium
1	13
2	14	* Team upload.

+3

-3

src/chrono/debian/copyright less more

7	7	Files: *
8	8	Copyright:
9	9	2014-2019 Kang Seonghoon <public+rust@mearie.org>
10		2017-2019 Brandon W Maister <quodlibetor@gmail.com>
	10	2017-2021 Brandon W Maister <quodlibetor@gmail.com>
11	11	2015 John Nagle
12	12	2012-2014 The Rust Project Developers.
13		2014-2019 chrono contributors
	13	2014-2022 chrono contributors
14	14	License: MIT or Apache-2.0
15	15
16	16	Files: debian/*
17	17	Copyright:
18		2018-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
	18	2018-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
19	19	2018-2020 Wolfgang Silbermayr <wolfgang@silbermayr.at>
20	20	2018-2020 kpcyrd <git@rxv.cc>
21	21	License: MIT or Apache-2.0

+23

-41

src/chrono/debian/copyright.debcargo.hint less more

0	0	Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
1	1	Upstream-Name: chrono
2		Upstream-Contact:
3		Kang Seonghoon <public+rust@mearie.org>
4		Brandon W Maister <quodlibetor@gmail.com>
	2	Upstream-Contact: FIXME (overlay) UNKNOWN-AUTHORS
5	3	Source: https://github.com/chronotope/chrono
6	4
7	5	Files: *
8		Copyright:
9		FIXME (overlay) UNKNOWN-YEARS Kang Seonghoon <public+rust@mearie.org>
10		FIXME (overlay) UNKNOWN-YEARS Brandon W Maister <quodlibetor@gmail.com>
	6	Copyright: FIXME (overlay) UNKNOWN-AUTHORS FIXME (overlay) UNKNOWN-YEARS
11	7	License: MIT or Apache-2.0
12	8	Comment:
13	9	FIXME (overlay): Since upstream copyright years are not available in

24	20	FIXME (overlay): These notices are extracted from files. Please review them
25	21	before uploading to the archive.
26	22
27		Files: ./src/div.rs
28		Copyright: 2013-2014 The Rust Project Developers.
	23	Files: ./src/format/parse.rs
	24	Copyright: 2015, John Nagle.
29	25	License: UNKNOWN-LICENSE; FIXME (overlay)
30	26	Comment:
31	27	FIXME (overlay): These notices are extracted from files. Please review them
32	28	before uploading to the archive.
33	29
34		Files: ./src/format/parse.rs
35		Copyright: 2015, John Nagle.
	30	Files: ./src/offset/local/stub.rs
	31	Copyright: 2012-2014 The Rust Project Developers
	32	License: UNKNOWN-LICENSE; FIXME (overlay)
	33	Comment:
	34	FIXME (overlay): These notices are extracted from files. Please review them
	35	before uploading to the archive.
	36
	37	Files: ./src/offset/local/unix.rs
	38	Copyright: 2012-2014 The Rust Project Developers
	39	License: UNKNOWN-LICENSE; FIXME (overlay)
	40	Comment:
	41	FIXME (overlay): These notices are extracted from files. Please review them
	42	before uploading to the archive.
	43
	44	Files: ./src/offset/local/windows.rs
	45	Copyright: 2012-2014 The Rust Project Developers
36	46	License: UNKNOWN-LICENSE; FIXME (overlay)
37	47	Comment:
38	48	FIXME (overlay): These notices are extracted from files. Please review them

45	55	FIXME (overlay): These notices are extracted from files. Please review them
46	56	before uploading to the archive.
47	57
48		Files: ./src/sys.rs
49		Copyright: 2012-2014 The Rust Project Developers
50		License: UNKNOWN-LICENSE; FIXME (overlay)
51		Comment:
52		FIXME (overlay): These notices are extracted from files. Please review them
53		before uploading to the archive.
54
55		Files: ./src/sys/stub.rs
56		Copyright: 2012-2014 The Rust Project Developers
57		License: UNKNOWN-LICENSE; FIXME (overlay)
58		Comment:
59		FIXME (overlay): These notices are extracted from files. Please review them
60		before uploading to the archive.
61
62		Files: ./src/sys/unix.rs
63		Copyright: 2012-2014 The Rust Project Developers
64		License: UNKNOWN-LICENSE; FIXME (overlay)
65		Comment:
66		FIXME (overlay): These notices are extracted from files. Please review them
67		before uploading to the archive.
68
69		Files: ./src/sys/windows.rs
70		Copyright: 2012-2014 The Rust Project Developers
71		License: UNKNOWN-LICENSE; FIXME (overlay)
72		Comment:
73		FIXME (overlay): These notices are extracted from files. Please review them
74		before uploading to the archive.
75
76	58	Files: debian/*
77	59	Copyright:
78		2018-2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
79		2018-2021 Wolfgang Silbermayr <wolfgang@silbermayr.at>
80		2018-2021 kpcyrd <git@rxv.cc>
	60	2018-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
	61	2018-2022 Wolfgang Silbermayr <wolfgang@silbermayr.at>
	62	2018-2022 kpcyrd <git@rxv.cc>
81	63	License: MIT or Apache-2.0
82	64
83	65	License: Apache-2.0

+0

-11

~~src/chrono/debian/patches/relax-dep.diff~~ less more

0		--- a/Cargo.toml
1		+++ b/Cargo.toml
2		@@ -67,7 +67,7 @@
3		default-features = false
4
5		[dependencies.time]
6		-version = "0.1.43"
7		+version = "0.1.42"
8		optional = true
9		[dev-dependencies.bincode]
10		version = "0.8.0"

+11

-25

src/chrono/debian/patches/remove-benchmarks.patch less more

0	0	--- a/Cargo.toml
1	1	+++ b/Cargo.toml
2		@@ -23,6 +23,7 @@
3		categories = ["date-and-time"]
4		license = "MIT/Apache-2.0"
	2	@@ -25,2 +25,3 @@
5	3	repository = "https://github.com/chronotope/chrono"
6	4	+autobenches = false
7		[package.metadata.docs.rs]
8		features = ["serde"]
9	5
10		@@ -32,15 +33,6 @@
11		[lib]
12		name = "chrono"
	6	@@ -34,14 +35,2 @@
13	7
14	8	-[[bench]]
15	9	-name = "chrono"

19	13	-[[bench]]
20	14	-name = "serde"
21	15	-harness = false
22		-required-features = ["serde"]
23		[dependencies.libc]
24		version = "0.2.69"
25		optional = true
26		@@ -68,9 +60,6 @@
27		[dev-dependencies.bincode]
28		version = "1"
	16	-required-features = [
	17	- "__internal_bench",
	18	- "serde",
	19	-]
29	20
30		-[dev-dependencies.criterion]
	21	@@ -70,4 +62,0 @@
	22	-[dependencies.criterion]
31	23	-version = "0.3"
	24	-optional = true
32	25	-
33		[dev-dependencies.doc-comment]
34		version = "0.3"
35
36		@@ -87,7 +76,6 @@
37
38		[features]
	26	@@ -89,3 +78,2 @@
39	27	__doctest = []
40		-__internal_bench = []
	28	-__internal_bench = ["criterion"]
41	29	alloc = []
42		clock = ["libc", "std", "winapi"]
43		default = ["clock", "std", "oldtime"]

+18

-28

src/chrono/debian/patches/remove-time.patch less more

3	3	See: https://github.com/chronotope/chrono/commit/5115c6f5f93d112d48b618edfa1b47d004c39d10
4	4	Author: Peter Michael Green <plugwash@debian.org>
5	5
6		---
7		The information above should follow the Patch Tagging Guidelines, please
8		checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
9		are templates for supplementary fields that you might want to add:
10
11		Origin: <vendor\|upstream\|other>, <url of original patch>
12		Bug: <url in upstream bugtracker>
13		Bug-Debian: https://bugs.debian.org/<bugnumber>
14		Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
15		Forwarded: <no\|not-needed\|url proving that it has been forwarded>
16		Reviewed-By: <name and email of someone who approved the patch>
17		Last-Update: 2021-12-18
18
19		--- rust-chrono-0.4.19.orig/Cargo.toml
20		+++ rust-chrono-0.4.19/Cargo.toml
21		@@ -54,9 +54,6 @@ version = "1.0.99"
	6	Index: chrono/Cargo.toml
	7	===================================================================
	8	--- chrono.orig/Cargo.toml
	9	+++ chrono/Cargo.toml
	10	@@ -64,9 +64,6 @@ version = "1.0.99"
22	11	optional = true
23	12	default-features = false
24	13
25	14	-[dependencies.time]
26		-version = "0.1.42"
	15	-version = "0.1.43"
27	16	-optional = true
	17
28	18	[dev-dependencies.bincode]
29		version = "1"
	19	version = "1.3.0"
	20	@@ -96,10 +93,8 @@ clock = [
	21	default = [
	22	"clock",
	23	"std",
	24	- "oldtime",
	25	]
	26	libc = []
	27	-oldtime = ["time"]
	28	std = []
30	29
31		@@ -78,8 +75,7 @@ version = "1"
32		__doctest = []
33		alloc = []
34		clock = ["libc", "std", "winapi"]
35		-default = ["clock", "std", "oldtime"]
36		-oldtime = ["time"]
37		+default = ["clock", "std"]
38		std = []
39		[target."cfg(windows)".dependencies.winapi]
40		version = "0.3.0"
	30	[target."cfg(not(any(target_os = \"emscripten\", target_os = \"wasi\", target_os = \"solaris\")))".dependencies.iana-time-zone]

+6

-15

src/chrono/debian/patches/remove-unstable-locales.patch less more

0	0	--- a/Cargo.toml
1	1	+++ b/Cargo.toml
2		@@ -53,10 +53,6 @@
3		version = "0.2"
4		default-features = false
5
	2	@@ -56,4 +55,0 @@
6	3	-[dependencies.pure-rust-locales]
7	4	-version = "0.5.2"
8	5	-optional = true
9	6	-
10		[dependencies.rustc-serialize]
11		version = "0.3.20"
12		optional = true
13		@@ -97,7 +93,6 @@
14		default = ["clock", "std", "oldtime"]
15		oldtime = ["time"]
16		std = []
17		-unstable-locales = ["pure-rust-locales", "alloc"]
18		wasmbind = ["wasm-bindgen", "js-sys"]
19		[target."cfg(all(target_arch = \"wasm32\", not(any(target_os = \"emscripten\", target_os = \"wasi\"))))".dependencies.js-sys]
20		version = "0.3"
	7	@@ -100,4 +95,0 @@
	8	-unstable-locales = [
	9	- "pure-rust-locales",
	10	- "alloc",
	11	-]

+0

-2

src/chrono/debian/patches/series less more

0		relax-dep.diff
1		update-bincode-to-1.0.patch
2	0	remove-unstable-locales.patch
3	1	strip-wasm.patch
4	2	remove-benchmarks.patch

+4

-10

src/chrono/debian/patches/strip-wasm.patch less more

0	0	--- a/Cargo.toml
1	1	+++ b/Cargo.toml
2		@@ -93,16 +93,6 @@
3		default = ["clock", "std", "oldtime"]
4		oldtime = ["time"]
5		std = []
6		-wasmbind = ["wasm-bindgen", "js-sys"]
	2	@@ -96,10 +95,0 @@
	3	-wasmbind = []
	4	-
7	5	-[target."cfg(all(target_arch = \"wasm32\", not(any(target_os = \"emscripten\", target_os = \"wasi\"))))".dependencies.js-sys]
8	6	-version = "0.3"
9		-optional = true
10	7	-
11	8	-[target."cfg(all(target_arch = \"wasm32\", not(any(target_os = \"emscripten\", target_os = \"wasi\"))))".dependencies.wasm-bindgen]
12	9	-version = "0.2"
13		-optional = true
	10	-
14	11	-[target."cfg(all(target_arch = \"wasm32\", not(any(target_os = \"emscripten\", target_os = \"wasi\"))))".dev-dependencies.wasm-bindgen-test]
15	12	-version = "0.3"
16		[target."cfg(windows)".dependencies.winapi]
17		version = "0.3.0"
18		features = ["std", "minwinbase", "minwindef", "timezoneapi"]

+0

-89

~~src/chrono/debian/patches/update-bincode-to-1.0.patch~~ less more

0		--- a/src/datetime.rs
1		+++ b/src/datetime.rs
2		@@ -2157,10 +2157,10 @@
3		fn test_serde_bincode() {
4		// Bincode is relevant to test separately from JSON because
5		// it is not self-describing.
6		- use self::bincode::{deserialize, serialize, Infinite};
7		+ use self::bincode::{deserialize, serialize};
8
9		let dt = Utc.ymd(2014, 7, 24).and_hms(12, 34, 6);
10		- let encoded = serialize(&dt, Infinite).unwrap();
11		+ let encoded = serialize(&dt).unwrap();
12		let decoded: DateTime<Utc> = deserialize(&encoded).unwrap();
13		assert_eq!(dt, decoded);
14		assert_eq!(dt.offset(), decoded.offset());
15		--- a/src/naive/date.rs
16		+++ b/src/naive/date.rs
17		@@ -1876,10 +1876,10 @@
18		fn test_serde_bincode() {
19		// Bincode is relevant to test separately from JSON because
20		// it is not self-describing.
21		- use self::bincode::{deserialize, serialize, Infinite};
22		+ use self::bincode::{deserialize, serialize};
23
24		let d = NaiveDate::from_ymd(2014, 7, 24);
25		- let encoded = serialize(&d, Infinite).unwrap();
26		+ let encoded = serialize(&d).unwrap();
27		let decoded: NaiveDate = deserialize(&encoded).unwrap();
28		assert_eq!(d, decoded);
29		}
30		--- a/src/naive/datetime.rs
31		+++ b/src/naive/datetime.rs
32		@@ -2212,18 +2212,18 @@
33		// it is not self-describing.
34		#[test]
35		fn test_serde_bincode() {
36		- use self::bincode::{deserialize, serialize, Infinite};
37		+ use self::bincode::{deserialize, serialize};
38		use naive::NaiveDate;
39
40		let dt = NaiveDate::from_ymd(2016, 7, 8).and_hms_milli(9, 10, 48, 90);
41		- let encoded = serialize(&dt, Infinite).unwrap();
42		+ let encoded = serialize(&dt).unwrap();
43		let decoded: NaiveDateTime = deserialize(&encoded).unwrap();
44		assert_eq!(dt, decoded);
45		}
46
47		#[test]
48		fn test_serde_bincode_optional() {
49		- use self::bincode::{deserialize, serialize, Infinite};
50		+ use self::bincode::{deserialize, serialize};
51		use self::serde_derive::{Deserialize, Serialize};
52		use prelude::*;
53		use serde::ts_nanoseconds_option;
54		@@ -2236,7 +2236,7 @@
55		}
56
57		let expected = Test { one: Some(1), two: Some(Utc.ymd(1970, 1, 1).and_hms(0, 1, 1)) };
58		- let bytes: Vec<u8> = serialize(&expected, Infinite).unwrap();
59		+ let bytes: Vec<u8> = serialize(&expected).unwrap();
60		let actual = deserialize::<Test>(&(bytes)).unwrap();
61
62		assert_eq!(expected, actual);
63		--- a/src/naive/time.rs
64		+++ b/src/naive/time.rs
65		@@ -1513,10 +1513,10 @@
66		fn test_serde_bincode() {
67		// Bincode is relevant to test separately from JSON because
68		// it is not self-describing.
69		- use self::bincode::{deserialize, serialize, Infinite};
70		+ use self::bincode::{deserialize, serialize};
71
72		let t = NaiveTime::from_hms_nano(3, 5, 7, 98765432);
73		- let encoded = serialize(&t, Infinite).unwrap();
74		+ let encoded = serialize(&t).unwrap();
75		let decoded: NaiveTime = deserialize(&encoded).unwrap();
76		assert_eq!(t, decoded);
77		}
78		--- a/Cargo.toml
79		+++ b/Cargo.toml
80		@@ -70,7 +70,7 @@
81		version = "0.1.42"
82		optional = true
83		[dev-dependencies.bincode]
84		-version = "0.8.0"
85		+version = "1"
86
87		[dev-dependencies.criterion]
88		version = "0.3"