diff --git a/dev/list-rdeps.sh b/dev/list-rdeps.sh index dc25fc0..42fa9bb 100755 --- a/dev/list-rdeps.sh +++ b/dev/list-rdeps.sh @@ -78,6 +78,11 @@ if ! printf "%s\n" "$versions" | grep "$ARCHIVT" | grep -qF "$rdep"; then # we're only interested in packages in both archives. # if a pkg-ver is not in either archive, this doesn't affect the migration process + # + # FIXME: actually, this is not true in the case where we are upgrading + # X from version A to B in unstable, but we want to keep X-A in testing. + # In this case, X-A has to go through unstable first and we are interested + # in keeping this installable, so can't continue here... continue fi apt-cache show "${rdep}=${ver}" \ diff --git a/src/parking-lot-core-0.4/debian/changelog b/src/parking-lot-core-0.4/debian/changelog index eea10ff..d461256 100644 --- a/src/parking-lot-core-0.4/debian/changelog +++ b/src/parking-lot-core-0.4/debian/changelog @@ -1,3 +1,10 @@ +rust-parking-lot-core-0.4 (0.4.0-3) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Team upload. + * Package parking_lot_core 0.4.0 from crates.io using debcargo 2.4.2 + + -- Ximin Luo Fri, 10 Jan 2020 11:39:35 +0000 + rust-parking-lot-core-0.4 (0.4.0-2) unstable; urgency=medium * Update rand dependency to 0.7 diff --git a/src/parking-lot-core-0.4/debian/copyright.debcargo.hint b/src/parking-lot-core-0.4/debian/copyright.debcargo.hint index baf63b8..d9c32fe 100644 --- a/src/parking-lot-core-0.4/debian/copyright.debcargo.hint +++ b/src/parking-lot-core-0.4/debian/copyright.debcargo.hint @@ -98,10 +98,10 @@ Files: debian/* Copyright: - 2019 Debian Rust Maintainers - 2019 Sylvestre Ledru - 2019 Wolfgang Silbermayr - 2019 kpcyrd + 2019-2020 Debian Rust Maintainers + 2019-2020 Sylvestre Ledru + 2019-2020 Wolfgang Silbermayr + 2019-2020 kpcyrd License: Apache-2.0 or MIT License: Apache-2.0 diff --git a/src/parking-lot-core-0.4/debian/patches/rand-0.7.patch b/src/parking-lot-core-0.4/debian/patches/rand-0.7.patch index 98589e8..0f8acec 100644 --- a/src/parking-lot-core-0.4/debian/patches/rand-0.7.patch +++ b/src/parking-lot-core-0.4/debian/patches/rand-0.7.patch @@ -1,5 +1,3 @@ -diff --git a/core/src/parking_lot.rs b/core/src/parking_lot.rs -index 64acaf9..b56deef 100644 --- a/src/parking_lot.rs +++ b/src/parking_lot.rs @@ -6,7 +6,7 @@ diff --git a/src/parking-lot-core-0.4/debian/patches/relax-deps.patch b/src/parking-lot-core-0.4/debian/patches/relax-deps.patch index 0dfca3c..fa8c455 100644 --- a/src/parking-lot-core-0.4/debian/patches/relax-deps.patch +++ b/src/parking-lot-core-0.4/debian/patches/relax-deps.patch @@ -1,12 +1,11 @@ --- a/Cargo.toml +++ b/Cargo.toml -@@ -28,7 +28,8 @@ - optional = true - - [dependencies.rand] --version = "0.6" -+version = "0.7" -+features = ["small_rng"] +@@ -32,7 +32,7 @@ + features = ["small_rng"] [dependencies.smallvec] - version = "0.6" +-version = "0.6" ++version = ">= 0.6, < 2" + + [dependencies.thread-id] + version = "3.2.0" diff --git a/src/parking-lot-core-0.4/debian/patches/series b/src/parking-lot-core-0.4/debian/patches/series index d03b6fa..e9e1005 100644 --- a/src/parking-lot-core-0.4/debian/patches/series +++ b/src/parking-lot-core-0.4/debian/patches/series @@ -1,2 +1,3 @@ +update-deps.patch relax-deps.patch rand-0.7.patch diff --git a/src/parking-lot-core-0.4/debian/patches/update-deps.patch b/src/parking-lot-core-0.4/debian/patches/update-deps.patch new file mode 100644 index 0000000..0dfca3c --- /dev/null +++ b/src/parking-lot-core-0.4/debian/patches/update-deps.patch @@ -0,0 +1,12 @@ +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -28,7 +28,8 @@ + optional = true + + [dependencies.rand] +-version = "0.6" ++version = "0.7" ++features = ["small_rng"] + + [dependencies.smallvec] + version = "0.6"