diff -Nru rust-parking-lot-core-0.4-0.4.0/debian/changelog rust-parking-lot-core-0.4-0.4.0/debian/changelog --- rust-parking-lot-core-0.4-0.4.0/debian/changelog 2020-01-16 21:13:57.000000000 +0000 +++ rust-parking-lot-core-0.4-0.4.0/debian/changelog 2022-02-05 10:11:10.000000000 +0000 @@ -1,3 +1,29 @@ +rust-parking-lot-core-0.4 (0.4.0-7) unstable; urgency=medium + + * Team upload. + * Package parking_lot_core 0.4.0 from crates.io using debcargo 2.5.0 + * Update rand patch for rand 0.8 + + -- Peter Michael Green Sat, 05 Feb 2022 10:11:10 +0000 + +rust-parking-lot-core-0.4 (0.4.0-6) unstable; urgency=medium + + * Team upload. + * Package parking_lot_core 0.4.0 from crates.io using debcargo 2.5.0 + * Relax dependency on thread_id + + -- Peter Michael Green Thu, 30 Dec 2021 13:47:10 +0000 + +rust-parking-lot-core-0.4 (0.4.0-5) unstable; urgency=medium + + * Team upload. + * Package parking_lot_core 0.4.0 from crates.io using debcargo 2.5.0 + + [ Henry-Nicolas Tourneur ] + * d/patches: added patch relax-deps.patch + + -- Peter Michael Green Tue, 30 Nov 2021 18:39:01 +0000 + rust-parking-lot-core-0.4 (0.4.0-4) unstable; urgency=medium * Team upload. diff -Nru rust-parking-lot-core-0.4-0.4.0/debian/compat rust-parking-lot-core-0.4-0.4.0/debian/compat --- rust-parking-lot-core-0.4-0.4.0/debian/compat 2020-01-16 21:13:57.000000000 +0000 +++ rust-parking-lot-core-0.4-0.4.0/debian/compat 2022-02-05 10:11:10.000000000 +0000 @@ -1 +1 @@ -11 +12 diff -Nru rust-parking-lot-core-0.4-0.4.0/debian/control rust-parking-lot-core-0.4-0.4.0/debian/control --- rust-parking-lot-core-0.4-0.4.0/debian/control 2020-01-16 21:13:57.000000000 +0000 +++ rust-parking-lot-core-0.4-0.4.0/debian/control 2022-02-05 10:11:10.000000000 +0000 @@ -1,15 +1,15 @@ Source: rust-parking-lot-core-0.4 Section: rust Priority: optional -Build-Depends: debhelper (>= 11), - dh-cargo (>= 18), +Build-Depends: debhelper (>= 12), + dh-cargo (>= 25), cargo:native , rustc:native , libstd-rust-dev , librust-libc-0.2+default-dev (>= 0.2.27-~~) , - librust-rand-0.7+default-dev , - librust-rand-0.7+small-rng-dev , - librust-rustc-version-0.2+default-dev , + librust-rand-0.8+default-dev , + librust-rand-0.8+small-rng-dev , + librust-rustc-version-0.4+default-dev , librust-smallvec-1+default-dev | librust-smallvec-0+default-dev (>= 0.6-~~) , librust-winapi-0.3+default-dev , librust-winapi-0.3+errhandlingapi-dev , @@ -24,10 +24,11 @@ Sylvestre Ledru , Wolfgang Silbermayr , kpcyrd -Standards-Version: 4.4.1 +Standards-Version: 4.5.1 Vcs-Git: https://salsa.debian.org/rust-team/debcargo-conf.git [src/parking-lot-core-0.4] Vcs-Browser: https://salsa.debian.org/rust-team/debcargo-conf/tree/master/src/parking-lot-core-0.4 X-Cargo-Crate: parking_lot_core +Rules-Requires-Root: no Package: librust-parking-lot-core-0.4-dev Architecture: any @@ -35,9 +36,9 @@ Depends: ${misc:Depends}, librust-libc-0.2+default-dev (>= 0.2.27-~~), - librust-rand-0.7+default-dev, - librust-rand-0.7+small-rng-dev, - librust-rustc-version-0.2+default-dev, + librust-rand-0.8+default-dev, + librust-rand-0.8+small-rng-dev, + librust-rustc-version-0.4+default-dev, librust-smallvec-1+default-dev | librust-smallvec-0+default-dev (>= 0.6-~~), librust-winapi-0.3+default-dev, librust-winapi-0.3+errhandlingapi-dev, @@ -91,9 +92,9 @@ Depends: ${misc:Depends}, librust-parking-lot-core-0.4-dev (= ${binary:Version}), - librust-backtrace-0.3+default-dev (>= 0.3.2-~~), - librust-petgraph-0.5+default-dev | librust-petgraph-0.4+default-dev (>= 0.4.5-~~), - librust-thread-id-3+default-dev (>= 3.2.0-~~) + librust-parking-lot-core-0.4+petgraph-dev (= ${binary:Version}), + librust-parking-lot-core-0.4+thread-id-dev (= ${binary:Version}), + librust-parking-lot-core-0.4+backtrace-dev (= ${binary:Version}) Provides: librust-parking-lot-core+deadlock-detection-dev (= ${binary:Version}), librust-parking-lot-core-0+deadlock-detection-dev (= ${binary:Version}), @@ -124,7 +125,7 @@ Depends: ${misc:Depends}, librust-parking-lot-core-0.4-dev (= ${binary:Version}), - librust-thread-id-3+default-dev (>= 3.2.0-~~) + librust-thread-id-4+default-dev | librust-thread-id-3+default-dev (>= 3.2.0-~~) Provides: librust-parking-lot-core+thread-id-dev (= ${binary:Version}), librust-parking-lot-core-0+thread-id-dev (= ${binary:Version}), diff -Nru rust-parking-lot-core-0.4-0.4.0/debian/copyright rust-parking-lot-core-0.4-0.4.0/debian/copyright --- rust-parking-lot-core-0.4-0.4.0/debian/copyright 2020-01-16 21:13:57.000000000 +0000 +++ rust-parking-lot-core-0.4-0.4.0/debian/copyright 2022-02-05 10:11:10.000000000 +0000 @@ -11,7 +11,7 @@ Files: debian/* Copyright: - 2019 Debian Rust Maintainers + 2019-2021 Debian Rust Maintainers 2019 Sylvestre Ledru 2019 Wolfgang Silbermayr 2019 kpcyrd diff -Nru rust-parking-lot-core-0.4-0.4.0/debian/copyright.debcargo.hint rust-parking-lot-core-0.4-0.4.0/debian/copyright.debcargo.hint --- rust-parking-lot-core-0.4-0.4.0/debian/copyright.debcargo.hint 2020-01-16 21:13:57.000000000 +0000 +++ rust-parking-lot-core-0.4-0.4.0/debian/copyright.debcargo.hint 2022-02-05 10:11:10.000000000 +0000 @@ -98,10 +98,10 @@ Files: debian/* Copyright: - 2019-2020 Debian Rust Maintainers - 2019-2020 Sylvestre Ledru - 2019-2020 Wolfgang Silbermayr - 2019-2020 kpcyrd + 2019-2022 Debian Rust Maintainers + 2019-2022 Sylvestre Ledru + 2019-2022 Wolfgang Silbermayr + 2019-2022 kpcyrd License: Apache-2.0 or MIT License: Apache-2.0 diff -Nru rust-parking-lot-core-0.4-0.4.0/debian/librust-parking-lot-core-0.4+backtrace-dev.lintian-overrides rust-parking-lot-core-0.4-0.4.0/debian/librust-parking-lot-core-0.4+backtrace-dev.lintian-overrides --- rust-parking-lot-core-0.4-0.4.0/debian/librust-parking-lot-core-0.4+backtrace-dev.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ rust-parking-lot-core-0.4-0.4.0/debian/librust-parking-lot-core-0.4+backtrace-dev.lintian-overrides 2022-02-05 10:11:10.000000000 +0000 @@ -0,0 +1 @@ +librust-parking-lot-core-0.4+backtrace-dev binary: empty-rust-library-declares-provides * \ No newline at end of file diff -Nru rust-parking-lot-core-0.4-0.4.0/debian/librust-parking-lot-core-0.4+deadlock-detection-dev.lintian-overrides rust-parking-lot-core-0.4-0.4.0/debian/librust-parking-lot-core-0.4+deadlock-detection-dev.lintian-overrides --- rust-parking-lot-core-0.4-0.4.0/debian/librust-parking-lot-core-0.4+deadlock-detection-dev.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ rust-parking-lot-core-0.4-0.4.0/debian/librust-parking-lot-core-0.4+deadlock-detection-dev.lintian-overrides 2022-02-05 10:11:10.000000000 +0000 @@ -0,0 +1 @@ +librust-parking-lot-core-0.4+deadlock-detection-dev binary: empty-rust-library-declares-provides * \ No newline at end of file diff -Nru rust-parking-lot-core-0.4-0.4.0/debian/librust-parking-lot-core-0.4+petgraph-dev.lintian-overrides rust-parking-lot-core-0.4-0.4.0/debian/librust-parking-lot-core-0.4+petgraph-dev.lintian-overrides --- rust-parking-lot-core-0.4-0.4.0/debian/librust-parking-lot-core-0.4+petgraph-dev.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ rust-parking-lot-core-0.4-0.4.0/debian/librust-parking-lot-core-0.4+petgraph-dev.lintian-overrides 2022-02-05 10:11:10.000000000 +0000 @@ -0,0 +1 @@ +librust-parking-lot-core-0.4+petgraph-dev binary: empty-rust-library-declares-provides * \ No newline at end of file diff -Nru rust-parking-lot-core-0.4-0.4.0/debian/librust-parking-lot-core-0.4+thread-id-dev.lintian-overrides rust-parking-lot-core-0.4-0.4.0/debian/librust-parking-lot-core-0.4+thread-id-dev.lintian-overrides --- rust-parking-lot-core-0.4-0.4.0/debian/librust-parking-lot-core-0.4+thread-id-dev.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ rust-parking-lot-core-0.4-0.4.0/debian/librust-parking-lot-core-0.4+thread-id-dev.lintian-overrides 2022-02-05 10:11:10.000000000 +0000 @@ -0,0 +1 @@ +librust-parking-lot-core-0.4+thread-id-dev binary: empty-rust-library-declares-provides * \ No newline at end of file diff -Nru rust-parking-lot-core-0.4-0.4.0/debian/patches/relax-deps.patch rust-parking-lot-core-0.4-0.4.0/debian/patches/relax-deps.patch --- rust-parking-lot-core-0.4-0.4.0/debian/patches/relax-deps.patch 2020-01-16 21:13:57.000000000 +0000 +++ rust-parking-lot-core-0.4-0.4.0/debian/patches/relax-deps.patch 2022-02-05 10:11:10.000000000 +0000 @@ -1,6 +1,8 @@ ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -24,14 +24,14 @@ +Index: parking-lot-core-0.4/Cargo.toml +=================================================================== +--- parking-lot-core-0.4.orig/Cargo.toml ++++ parking-lot-core-0.4/Cargo.toml +@@ -24,20 +24,20 @@ version = "0.3.2" optional = true [dependencies.petgraph] @@ -16,4 +18,12 @@ +version = ">= 0.6, < 2" [dependencies.thread-id] - version = "3.2.0" +-version = "3.2.0" ++version = ">= 3.2.0, < 5.0" + optional = true + [build-dependencies.rustc_version] +-version = "0.2" ++version = "0.4" + + [features] + deadlock_detection = ["petgraph", "thread-id", "backtrace"] diff -Nru rust-parking-lot-core-0.4-0.4.0/debian/patches/update-rand.patch rust-parking-lot-core-0.4-0.4.0/debian/patches/update-rand.patch --- rust-parking-lot-core-0.4-0.4.0/debian/patches/update-rand.patch 2020-01-16 21:13:57.000000000 +0000 +++ rust-parking-lot-core-0.4-0.4.0/debian/patches/update-rand.patch 2022-02-05 10:11:10.000000000 +0000 @@ -1,17 +1,21 @@ ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -28,7 +28,8 @@ +Index: parking-lot-core-0.4/Cargo.toml +=================================================================== +--- parking-lot-core-0.4.orig/Cargo.toml ++++ parking-lot-core-0.4/Cargo.toml +@@ -28,7 +28,8 @@ version = ">= 0.4.5, < 0.6" optional = true [dependencies.rand] -version = "0.6" -+version = "0.7" ++version = "0.8" +features = ["small_rng"] [dependencies.smallvec] version = ">= 0.6, < 2" ---- a/src/parking_lot.rs -+++ b/src/parking_lot.rs +Index: parking-lot-core-0.4/src/parking_lot.rs +=================================================================== +--- parking-lot-core-0.4.orig/src/parking_lot.rs ++++ parking-lot-core-0.4/src/parking_lot.rs @@ -6,7 +6,7 @@ // copied, modified, or distributed except according to those terms. @@ -21,3 +25,12 @@ use smallvec::SmallVec; use std::cell::{Cell, UnsafeCell}; use std::mem; +@@ -107,7 +107,7 @@ impl FairTimeout { + fn should_timeout(&mut self) -> bool { + let now = Instant::now(); + if now > self.timeout { +- self.timeout = now + Duration::new(0, self.rng.gen_range(0, 1000000)); ++ self.timeout = now + Duration::new(0, self.rng.gen_range(0 .. 1000000)); + true + } else { + false diff -Nru rust-parking-lot-core-0.4-0.4.0/debian/tests/control rust-parking-lot-core-0.4-0.4.0/debian/tests/control --- rust-parking-lot-core-0.4-0.4.0/debian/tests/control 2020-01-16 21:13:57.000000000 +0000 +++ rust-parking-lot-core-0.4-0.4.0/debian/tests/control 2022-02-05 10:11:10.000000000 +0000 @@ -1,29 +1,39 @@ Test-Command: /usr/share/cargo/bin/cargo-auto-test parking_lot_core 0.4.0 --all-targets --all-features -Features: test-name=@ +Features: test-name=rust-parking-lot-core-0.4:@ +Depends: dh-cargo (>= 18), @ +Restrictions: allow-stderr, skip-not-installable + +Test-Command: /usr/share/cargo/bin/cargo-auto-test parking_lot_core 0.4.0 --all-targets +Features: test-name=librust-parking-lot-core-0.4-dev:default +Depends: dh-cargo (>= 18), @ +Restrictions: allow-stderr, skip-not-installable + +Test-Command: /usr/share/cargo/bin/cargo-auto-test parking_lot_core 0.4.0 --all-targets --no-default-features --features nightly +Features: test-name=librust-parking-lot-core-0.4-dev:nightly Depends: dh-cargo (>= 18), @ Restrictions: allow-stderr, skip-not-installable Test-Command: /usr/share/cargo/bin/cargo-auto-test parking_lot_core 0.4.0 --all-targets --no-default-features -Features: test-name=librust-parking-lot-core-0.4-dev +Features: test-name=librust-parking-lot-core-0.4-dev: Depends: dh-cargo (>= 18), @ Restrictions: allow-stderr, skip-not-installable -Test-Command: /usr/share/cargo/bin/cargo-auto-test parking_lot_core 0.4.0 --all-targets --features backtrace -Features: test-name=librust-parking-lot-core-0.4+backtrace-dev +Test-Command: /usr/share/cargo/bin/cargo-auto-test parking_lot_core 0.4.0 --all-targets --no-default-features --features backtrace +Features: test-name=librust-parking-lot-core-0.4+backtrace-dev:backtrace Depends: dh-cargo (>= 18), @ Restrictions: allow-stderr, skip-not-installable -Test-Command: /usr/share/cargo/bin/cargo-auto-test parking_lot_core 0.4.0 --all-targets --features deadlock_detection -Features: test-name=librust-parking-lot-core-0.4+deadlock-detection-dev +Test-Command: /usr/share/cargo/bin/cargo-auto-test parking_lot_core 0.4.0 --all-targets --no-default-features --features deadlock_detection +Features: test-name=librust-parking-lot-core-0.4+deadlock-detection-dev:deadlock_detection Depends: dh-cargo (>= 18), @ Restrictions: allow-stderr, skip-not-installable -Test-Command: /usr/share/cargo/bin/cargo-auto-test parking_lot_core 0.4.0 --all-targets --features petgraph -Features: test-name=librust-parking-lot-core-0.4+petgraph-dev +Test-Command: /usr/share/cargo/bin/cargo-auto-test parking_lot_core 0.4.0 --all-targets --no-default-features --features petgraph +Features: test-name=librust-parking-lot-core-0.4+petgraph-dev:petgraph Depends: dh-cargo (>= 18), @ Restrictions: allow-stderr, skip-not-installable -Test-Command: /usr/share/cargo/bin/cargo-auto-test parking_lot_core 0.4.0 --all-targets --features thread-id -Features: test-name=librust-parking-lot-core-0.4+thread-id-dev +Test-Command: /usr/share/cargo/bin/cargo-auto-test parking_lot_core 0.4.0 --all-targets --no-default-features --features thread-id +Features: test-name=librust-parking-lot-core-0.4+thread-id-dev:thread-id Depends: dh-cargo (>= 18), @ Restrictions: allow-stderr, skip-not-installable diff -Nru rust-parking-lot-core-0.4-0.4.0/debian/watch rust-parking-lot-core-0.4-0.4.0/debian/watch --- rust-parking-lot-core-0.4-0.4.0/debian/watch 2020-01-16 21:13:57.000000000 +0000 +++ rust-parking-lot-core-0.4-0.4.0/debian/watch 2022-02-05 10:11:10.000000000 +0000 @@ -1,4 +1,4 @@ version=4 opts=filenamemangle=s/.*\/(.*)\/download/parking_lot_core-$1\.tar\.gz/g,\ uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/ \ -https://qa.debian.org/cgi-bin/fakeupstream.cgi?upstream=crates.io/parking_lot_core .*/crates/parking_lot_core/[-_]?(0\.4\.\d[\-+\.:\~\da-zA-Z]*)/download +https://qa.debian.org/cgi-bin/fakeupstream.cgi?upstream=crates.io/parking_lot_core .*/crates/parking_lot_core/[-_]?(0.4\.\d[\-+\.:\~\da-zA-Z]*)/download