[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[lintian] 01/01: t/tests/files-multiarch-foreign-files: Ensure that we install to a multiarch directory on all architectures to prevent a FTBFS on, for example, i386. (Closes: #886163)



This is an automated email from the git hooks/post-receive script.

lamby pushed a commit to branch master
in repository lintian.

commit 95a56b3e3210a36c996a98d0aa1e6cfafad6bcb7
Author: Chris Lamb <lamby@debian.org>
Date:   Tue Jan 2 19:52:08 2018 +0000

    t/tests/files-multiarch-foreign-files: Ensure that we install to a multiarch directory on all architectures to prevent a FTBFS on, for example, i386. (Closes: #886163)
---
 debian/changelog                                          | 5 +++++
 t/tests/files-multiarch-foreign-files/debian/debian/rules | 8 +++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 62bb689..986c929 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,11 @@ lintian (2.5.68) UNRELEASED; urgency=medium
     + [CL] Warn about packages that ship (non-reproducible) Python
       Hypothesis examples.  (Closes: #886101)
 
+  * t/tests/files-multiarch-foreign-files:
+    + [CL] Ensure that we install to a multiarch directory on all
+      architectures to prevent a FTBFS on, for example, i386.
+      (Closes: #886163)
+
  -- Chris Lamb <lamby@debian.org>  Mon, 01 Jan 2018 15:41:06 +0000
 
 lintian (2.5.67) unstable; urgency=medium
diff --git a/t/tests/files-multiarch-foreign-files/debian/debian/rules b/t/tests/files-multiarch-foreign-files/debian/debian/rules
index a13c5b2..c59f00c 100755
--- a/t/tests/files-multiarch-foreign-files/debian/debian/rules
+++ b/t/tests/files-multiarch-foreign-files/debian/debian/rules
@@ -1,6 +1,12 @@
 #!/usr/bin/make -f
 
-DESTDIR = debian/$(shell dh_listpackages)/usr/lib/$(DEB_BUILD_GNU_TYPE)
+ifeq ($(DEB_BUILD_ARCH), x86_64-linux-gnu)
+	ARCH=i386-linux-gnu
+else
+	ARCH=x86_64-linux-gnu
+endif
+
+DESTDIR = debian/$(shell dh_listpackages)/usr/lib/$(ARCH)
 
 %:
 	dh $@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git


Reply to: