From 43f27989f84e97c8bb5ed69805f83e59b42be912 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 15 Jun 2023 19:16:45 +0100 Subject: [PATCH] debian/update-build-deps: Add versions This ensures that we will migrate only after our actual build-deps do. Signed-off-by: Ian Jackson --- debian/update-build-deps | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/debian/update-build-deps b/debian/update-build-deps index 99e73c8..8d5b849 100755 --- a/debian/update-build-deps +++ b/debian/update-build-deps @@ -20,6 +20,16 @@ our %replace = ( clap => 'librust-clap-3+derive-dev', ); +sub convert_version ($) { + local ($_) = @_; + s{^\>= ?([^,]+)\, \<[^,]+$}{$1}; + if (m{^\d+(?:\.\d+){0,2}$}) { + return "(>= $_~)"; + } else { + warn "don't know how to convert Cargo version spec \`$_`"; + } +} + while () { if (m{^\# debian/update-build-deps}i...m{^\S}) { next if m{^ +librust[-+a-z0-9.]+ (?:\(.*\) )?\,?\s*$}; @@ -39,6 +49,11 @@ while () { } next if length $info->{path}; + + my $version = $info->{version} // die "$file $p ?"; + $version = convert_version($version); + $version = " $version" if length $version; + $p =~ y/_/-/; my $dep = $replace{$p}; if (!defined $dep) { @@ -46,7 +61,7 @@ while () { $dep = "librust-$p$f-dev"; } if (length $dep) { - $outputs{"$dep "}++; + $outputs{"$dep$version "}++; } } } -- 2.30.2