Fix issue with dh_missing --fail-missing

diff --git a/debian/changelog b/debian/changelog
index 1ce7833d46ed07f1e70837e9ace70d68c9bf82e1..c36f7c2daab905a80577794cb278795178460dd3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+rustc (1.52.0~beta.3+dfsg1-1~exp4) UNRELEASED; urgency=medium
+
+  * Fix issue with dh_missing --fail-missing
+
+ -- Ximin Luo <infinity0@debian.org>  Thu, 06 May 2021 01:52:10 +0100
+
 rustc (1.52.0~beta.3+dfsg1-1~exp3) experimental; urgency=medium
 
   * Fix Makefile addition syntax.

diff --git a/debian/not-installed b/debian/not-installed
index 755cc890004279410728d930fb34b96c16b40472..d36e13ed0173867829fdac21b25fac30946a099a 100644 (file)
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -6,7 +6,7 @@ usr/lib/rustlib/rust-installer-version
 usr/lib/rustlib/uninstall.sh
 
 # redundant copy of llvm-dwp, we already link it in rustc.links
-usr/bin/rust-llvm-dwp
+usr/lib/rustlib/*/bin/rust-llvm-dwp
 
 # docs, we already install into /usr/share/doc/rustc
 usr/share/doc/rust/*

diff --git a/debian/rules b/debian/rules
index 423e4e44c943903ebe74d1f8929903b1dcd064d9..5272d1e0a4542b5dc07fa562a3969421ad0aca6d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -371,7 +371,7 @@ override_dh_install-arch:
        dh_install -p$(LIBSTD_PKG) usr/lib/$(DEB_HOST_MULTIARCH)/
        dh_install -plibstd-rust-dev usr/lib/rustlib/$(DEB_HOST_RUST_TYPE)/lib/
 ifeq (true,$(BUILD_WINDOWS))
-       dh_install -plibstd-rust-dev-windows usr/lib/rustlib/*-pc-windows-gnu/lib/
+       dh_install -plibstd-rust-dev-windows usr/lib/rustlib/$(WINDOWS_ARCH)-pc-windows-gnu/lib/
 endif
 
 override_dh_install-indep: debian/rust-src.install debian/rust-src.links
@@ -401,6 +401,10 @@ override_dh_installdocs:
        dh_installdocs -X.tex -X.aux -X.log -X.out -X.toc
 
 override_dh_missing:
+       # if we did an arch-indep build then these artifacts exist but aren't installed
+       # so we remove them now to avoid false-positive in dh_missing --fail-missing
+       rm -rf debian/tmp/usr/lib/rustlib/$(DEB_HOST_RUST_TYPE)/lib/
+       rm -rf debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
        dh_missing --fail-missing
 
 override_dh_compress: