From f6dd242b638083eca54859d79656bb925b3cd966 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 18 May 2024 04:49:51 +0200 Subject: Merging debian version 1.71.1+dfsg1-1. Signed-off-by: Daniel Baumann --- debian/prune-unused-deps | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'debian/prune-unused-deps') diff --git a/debian/prune-unused-deps b/debian/prune-unused-deps index 5807b4a4c..ae733854f 100755 --- a/debian/prune-unused-deps +++ b/debian/prune-unused-deps @@ -17,6 +17,7 @@ done test -f Cargo.lock.orig || cp Cargo.lock Cargo.lock.orig test -f src/bootstrap/Cargo.lock.orig || cp src/bootstrap/Cargo.lock src/bootstrap/Cargo.lock.orig test -f src/tools/rust-analyzer/Cargo.lock.orig || cp src/tools/rust-analyzer/Cargo.lock src/tools/rust-analyzer/Cargo.lock.orig +test -f src/tools/cargo/Cargo.lock.orig || cp src/tools/cargo/Cargo.lock src/tools/cargo/Cargo.lock.orig rm -f Cargo.lock src/bootstrap/Cargo.lock src/tools/rust-analyzer/Cargo.lock src/tools/cargo/Cargo.lock find vendor -name .cargo-checksum.json -execdir "$scriptdir/debian/prune-checksums" "{}" + @@ -30,10 +31,14 @@ cargo update --offline # re-generate src/tools/rust-analyzer/Cargo.lock after patching ( cd src/tools/rust-analyzer && cargo update --offline ) +# re-generate src/tools/cargo/Cargo.lock after patching +( cd src/tools/cargo && cargo update --offline ) + needed_crates() { cat Cargo.lock \ src/bootstrap/Cargo.lock \ src/tools/rust-analyzer/Cargo.lock \ + src/tools/cargo/Cargo.lock \ | sed -z -e 's/\nname = /name = /g' -e 's/\nversion = /version = /g' \ | sed -ne 's/\[\[package\]\]name = "\(.*\)"version = "\(.*\)"/\1 \2/gp' } -- cgit v1.2.3