On Fri, 19 Apr 2024 16:03:44 -0400 =?UTF-8?Q?Jeremy_B=C3=ADcha?=
<jeremy.bi...@canonical.com> wrote:
> Control: block -1 by 1068930
>
> You'll also need to bump the dependency on rust-async-channel to build
> against the version that was built for event-listener 5.
>
> Thank you,
> Jeremy Bícha
>
>
Updated debdiff attached. Please consider uploading this soon as this
blocks me from updating zbus to 4.0.
--
Matthias Geiger <werdahias>
Debian Maintainer
diff -Nru rust-async-lock-2.8.0/debian/changelog
rust-async-lock-2.8.0/debian/changelog
--- rust-async-lock-2.8.0/debian/changelog 2024-05-15 21:08:33.000000000
+0200
+++ rust-async-lock-2.8.0/debian/changelog 2023-08-24 10:46:30.000000000
+0200
@@ -1,10 +1,3 @@
-rust-async-lock (2.8.0-1.1) unstable; urgency=medium
-
- * Non-maintainer upload.
- * Merge patches into one; depend on event-listener 5.x and async-channel 2.x
-
- -- Matthias Geiger <werdah...@riseup.net> Wed, 15 May 2024 21:08:33 +0200
-
rust-async-lock (2.8.0-1) unstable; urgency=medium
* add patch 2001_fastrand
diff -Nru rust-async-lock-2.8.0/debian/control
rust-async-lock-2.8.0/debian/control
--- rust-async-lock-2.8.0/debian/control 2024-05-15 21:06:41.000000000
+0200
+++ rust-async-lock-2.8.0/debian/control 2023-08-24 10:45:54.000000000
+0200
@@ -4,8 +4,8 @@
Build-Depends:
debhelper-compat (= 13),
dh-cargo (>= 25),
- librust-async-channel-2+default-dev,
- librust-event-listener-5+default-dev,
+ librust-async-channel-1+default-dev,
+ librust-event-listener-2+default-dev,
librust-fastrand-1+default-dev,
librust-futures-lite-1+default-dev,
libstring-shellquote-perl,
@@ -20,7 +20,7 @@
Architecture: all
Multi-Arch: foreign
Depends:
- librust-event-listener-5+default-dev,
+ librust-event-listener-2+default-dev,
${misc:Depends},
Provides:
librust-async-lock-2+default-dev (= ${binary:Version}),
diff -Nru rust-async-lock-2.8.0/debian/patches/2001_fastrand.patch
rust-async-lock-2.8.0/debian/patches/2001_fastrand.patch
--- rust-async-lock-2.8.0/debian/patches/2001_fastrand.patch 1970-01-01
01:00:00.000000000 +0100
+++ rust-async-lock-2.8.0/debian/patches/2001_fastrand.patch 2023-08-24
10:44:45.000000000 +0200
@@ -0,0 +1,18 @@
+Description: relax dependency to match older crate fastrand 1.8.0
+Author: Jonas Smedegaard <d...@jones.dk>
+Bug-Debian: https://bugs.debian.org/1043016
+Forwarded: not-needed
+Last-Update: 2023-08-24
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -19,7 +19,7 @@
+
+ [dev-dependencies]
+ async-channel = "1.5.0"
+-fastrand = "2.0.0"
++fastrand = ">= 1.8, < 3"
+ futures-lite = "1.12.0"
+ waker-fn = "1.1.0"
+
diff -Nru rust-async-lock-2.8.0/debian/patches/2001_wasm.patch
rust-async-lock-2.8.0/debian/patches/2001_wasm.patch
--- rust-async-lock-2.8.0/debian/patches/2001_wasm.patch 1970-01-01
01:00:00.000000000 +0100
+++ rust-async-lock-2.8.0/debian/patches/2001_wasm.patch 2023-08-24
10:44:11.000000000 +0200
@@ -0,0 +1,15 @@
+Description: avoid wasm-only dependency on crate wasm-bindgen-test
+Author: Jonas Smedegaard <d...@jones.dk>
+Forwarded: not-needed
+Last-Update: 2023-08-14
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -22,6 +22,3 @@
+ fastrand = ">= 1.8, < 3"
+ futures-lite = "1.12.0"
+ waker-fn = "1.1.0"
+-
+-[target.'cfg(any(target_arch = "wasm32", target_arch =
"wasm64"))'.dev-dependencies]
+-wasm-bindgen-test = "0.3"
diff -Nru rust-async-lock-2.8.0/debian/patches/relax-deps.diff
rust-async-lock-2.8.0/debian/patches/relax-deps.diff
--- rust-async-lock-2.8.0/debian/patches/relax-deps.diff 2024-05-15
21:06:59.000000000 +0200
+++ rust-async-lock-2.8.0/debian/patches/relax-deps.diff 1970-01-01
01:00:00.000000000 +0100
@@ -1,32 +0,0 @@
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -15,13 +15,11 @@
- exclude = ["/.*"]
-
- [dependencies]
--event-listener = "2.5.1"
-+event-listener = "5"
-
- [dev-dependencies]
--async-channel = "1.5.0"
--fastrand = "2.0.0"
-+async-channel = "2"
-+fastrand = "1"
- futures-lite = "1.12.0"
- waker-fn = "1.1.0"
-
--[target.'cfg(any(target_arch = "wasm32", target_arch =
"wasm64"))'.dev-dependencies]
--wasm-bindgen-test = "0.3"
-
---- a/src/once_cell.rs
-+++ b/src/once_cell.rs
-@@ -7,7 +7,7 @@
- use std::sync::atomic::{AtomicUsize, Ordering};
- use std::task::{Context, Poll, RawWaker, RawWakerVTable, Waker};
-
--use event_listener::{Event, EventListener};
-+use event_listener::{Event, EventListener, Listener};
-
- /// The current state of the `OnceCell`.
- #[derive(Copy, Clone, PartialEq, Eq)]
-
diff -Nru rust-async-lock-2.8.0/debian/patches/series
rust-async-lock-2.8.0/debian/patches/series
--- rust-async-lock-2.8.0/debian/patches/series 2024-05-15 21:05:31.000000000
+0200
+++ rust-async-lock-2.8.0/debian/patches/series 2023-08-24 10:41:50.000000000
+0200
@@ -1 +1,2 @@
-relax-deps.diff
+2001_fastrand.patch
+2001_wasm.patch
