tokio - prepare new upstream release and stop editing parking-lot dependency.

diff --git a/src/tokio/debian/changelog b/src/tokio/debian/changelog
index c9797da0c42da3145051f67f3d57c4fb9dd6ef4c..d49822c1e57b8043ac55dcb8e94af41c60a56ade 100644 (file)
--- a/src/tokio/debian/changelog
+++ b/src/tokio/debian/changelog
@@ -1,3 +1,11 @@
+rust-tokio (1.15.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Team upload.
+  * Package tokio 1.15.0 from crates.io using debcargo 2.5.0
+  * Stop altering dependency on parking-lot, we now have 0.11 in Debian.
+
+ -- Peter Michael Green <plugwash@debian.org>  Fri, 31 Dec 2021 11:19:38 +0000
+
 rust-tokio (1.13.0-1) unstable; urgency=medium
 
   * Team upload.

diff --git a/src/tokio/debian/patches/relax-deps.patch b/src/tokio/debian/patches/relax-deps.patch
index 37f8c00ffbea4376125d0225dea5d6aef60a2867..dc08bb557f47d31f000688cffc8b6fb31ae9f4ec 100644 (file)
--- a/src/tokio/debian/patches/relax-deps.patch
+++ b/src/tokio/debian/patches/relax-deps.patch
@@ -1,20 +1,11 @@
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -49,7 +49,7 @@ version = "1.5.2"
- optional = true
- 
- [dependencies.parking_lot]
--version = "0.11.0"
-+version = "0.10"
- optional = true
- 
- [dependencies.pin-project-lite]
 @@ -110,10 +110,6 @@ features = ["futures", "checkpoint"]
  [target."cfg(target_os = \"freebsd\")".dev-dependencies.mio-aio]
  version = "0.6.0"
  features = ["tokio"]
 -[target."cfg(tokio_unstable)".dependencies.tracing]
--version = "0.1.21"
+-version = "0.1.25"
 -features = ["std"]
 -optional = true
  default-features = false