Change `cargo-upstream` build-profile to `upstream-cargo`

As per debian-devel discussion.  Profile now registered under that name.

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

diff --git a/debian/control b/debian/control
index 0c6b7181a1c94ab6e8e8537f7ffd57d638137fbd..40257c0dd805171c25f17e6ac8851ef9e0b39515 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -6,38 +6,38 @@ 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-backtrace-dev <!cargo-upstream>,
-    librust-base64-dev <!cargo-upstream>,
-    librust-clap-dev <!cargo-upstream>,
-    librust-easy-ext-dev <!cargo-upstream>,
-    librust-educe-dev <!cargo-upstream>,
-    librust-either-dev <!cargo-upstream>,
-    librust-env-logger+default-dev <!cargo-upstream>,
-    librust-eyre-dev <!cargo-upstream>,
-    librust-fehler-dev <!cargo-upstream>,
-    librust-futures-dev <!cargo-upstream>,
-    librust-heck-dev <!cargo-upstream>,
-    librust-hyper-dev <!cargo-upstream>,
-    librust-hyper-tls-dev <!cargo-upstream>,
-    librust-indenter-dev <!cargo-upstream>,
-    librust-ipnet-dev <!cargo-upstream>,
-    librust-itertools-dev <!cargo-upstream>,
-    librust-lazy-regex-dev <!cargo-upstream>,
-    librust-lazy-static-dev <!cargo-upstream>,
-    librust-libc-dev <!cargo-upstream>,
-    librust-log-dev <!cargo-upstream>,
-    librust-memchr-dev <!cargo-upstream>,
-    librust-mime-dev <!cargo-upstream>,
-    librust-nix-dev <!cargo-upstream>,
-    librust-parking-lot-dev <!cargo-upstream>,
-    librust-pin-project-lite-dev <!cargo-upstream>,
-    librust-regex-dev <!cargo-upstream>,
-    librust-sha2-dev <!cargo-upstream>,
-    librust-subtle-dev <!cargo-upstream>,
-    librust-syslog-dev <!cargo-upstream>,
-    librust-thiserror-dev <!cargo-upstream>,
-    librust-tokio-dev <!cargo-upstream>,
-    librust-void-dev <!cargo-upstream>,
+    librust-backtrace-dev <!upstream-cargo>,
+    librust-base64-dev <!upstream-cargo>,
+    librust-clap-dev <!upstream-cargo>,
+    librust-easy-ext-dev <!upstream-cargo>,
+    librust-educe-dev <!upstream-cargo>,
+    librust-either-dev <!upstream-cargo>,
+    librust-env-logger+default-dev <!upstream-cargo>,
+    librust-eyre-dev <!upstream-cargo>,
+    librust-fehler-dev <!upstream-cargo>,
+    librust-futures-dev <!upstream-cargo>,
+    librust-heck-dev <!upstream-cargo>,
+    librust-hyper-dev <!upstream-cargo>,
+    librust-hyper-tls-dev <!upstream-cargo>,
+    librust-indenter-dev <!upstream-cargo>,
+    librust-ipnet-dev <!upstream-cargo>,
+    librust-itertools-dev <!upstream-cargo>,
+    librust-lazy-regex-dev <!upstream-cargo>,
+    librust-lazy-static-dev <!upstream-cargo>,
+    librust-libc-dev <!upstream-cargo>,
+    librust-log-dev <!upstream-cargo>,
+    librust-memchr-dev <!upstream-cargo>,
+    librust-mime-dev <!upstream-cargo>,
+    librust-nix-dev <!upstream-cargo>,
+    librust-parking-lot-dev <!upstream-cargo>,
+    librust-pin-project-lite-dev <!upstream-cargo>,
+    librust-regex-dev <!upstream-cargo>,
+    librust-sha2-dev <!upstream-cargo>,
+    librust-subtle-dev <!upstream-cargo>,
+    librust-syslog-dev <!upstream-cargo>,
+    librust-thiserror-dev <!upstream-cargo>,
+    librust-tokio-dev <!upstream-cargo>,
+    librust-void-dev <!upstream-cargo>,
 Standards-Version: 4.6.1
 
 Package: hippotat-client

diff --git a/debian/rules b/debian/rules
index c98b3f595aebc4cfc3d1f3343b0e8167d23d915b..292ee9a8b3e9e71354d0d64141381e852c81825c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -8,9 +8,9 @@ override_dh_installinit:
 
 # For local testing with upstream dependencies:
 #    NAILING_CARGO=nailing-cargo make check
-#    NAILING_CARGO=nailing-cargo dpkg-buildpackage -Pcargo-upstream -uc -
+#    NAILING_CARGO=nailing-cargo dpkg-buildpackage -Pupstream-cargo -uc -
 
-ifeq (,$(filter cargo-upstream, $(DEB_BUILD_PROFILES)))
+ifeq (,$(filter upstream-cargo, $(DEB_BUILD_PROFILES)))
 
 include /usr/share/dpkg/architecture.mk
 include /usr/share/dpkg/buildflags.mk

diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
index fb49316579002c602eafc1222b7e5650b04d4eff..3b1025c575496cc93247050e855c574a5046a73b 100644 (file)
--- a/debian/source.lintian-overrides
+++ b/debian/source.lintian-overrides
@@ -1,2 +1,2 @@
 # This is registered (at https://wiki.debian.org/BuildProfileSpe):
-hippotat source: invalid-profile-name-in-source-relation cargo-upstream *
+hippotat source: invalid-profile-name-in-source-relation upstream-cargo *

diff --git a/debian/update-build-deps b/debian/update-build-deps
index 9edd0294f3d0f37a90608b2adc961fe85d985dd5..002fca1e13d8538fcc35e7df6b1f19a47cc0beda 100755 (executable)
--- a/debian/update-build-deps
+++ b/debian/update-build-deps
@@ -10,7 +10,7 @@ our %need_features = qw(
 
 while (<I>) {
   if (m{^\# debian/update-build-deps}i...m{^\S}) {
-    next if m{^ +librust[-+a-z0-9]+ \<!cargo-upstream\>,?\s*$};
+    next if m{^ +librust[-+a-z0-9]+ \<!upstream-cargo\>,?\s*$};
     if (m{^\S} && !m{^\#}i) {
       local ($_);
       open C, "Cargo.toml" or die $!;
@@ -21,7 +21,7 @@ while (<I>) {
        next if m{path ?= ?\"};
        $p =~ y/_/-/;
        my $f = $need_features{$p} // '';
-       print O "    librust-$p$f-dev <!cargo-upstream>,\n" or die $!;
+       print O "    librust-$p$f-dev <!upstream-cargo>,\n" or die $!;
       }
       C->error and die $!;
     }