build-deps: Actually get rid of versioned dep on base64

update-build-deps mishandled packages with versions in the names.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/control b/debian/control
index 3ac7144f3e73f1166f761572c976bbd3f0534620..be235c36c5f2d5b2751212b1971ecbdb072a41b7 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Build-Depends: debhelper (>= 12), cargo, rustc, python3-sphinx,
                python3-recommonmark, python3-sphinx-markdown-tables,
                moreutils, libssl-dev (>= 1.1), pkg-config,
 # debian/update-build-deps manages these:
-    librust-base64-0.21-dev <!upstream-cargo>,
     librust-backtrace-dev <!upstream-cargo>,
     librust-base64-dev <!upstream-cargo>,
     librust-clap-3+derive-dev <!upstream-cargo>,

diff --git a/debian/update-build-deps b/debian/update-build-deps
index 2c190494968a2b8d403039509a5e6102500061b4..b20ba8addef4fd2b295d9b04b4168a63fce3eb3e 100755 (executable)
--- a/debian/update-build-deps
+++ b/debian/update-build-deps
@@ -19,7 +19,7 @@ our %replace = (
 
 while (<I>) {
   if (m{^\# debian/update-build-deps}i...m{^\S}) {
-    next if m{^ +librust[-+a-z0-9]+ (?:\(.*\) )?\<!upstream-cargo\>,?\s*$};
+    next if m{^ +librust[-+a-z0-9.]+ (?:\(.*\) )?\<!upstream-cargo\>,?\s*$};
     if (m{^\S} && !m{^\#}i) {
       local ($_);
       open C, "Cargo.toml" or die $!;