[Python-modules-commits] [pyotherside] 01/05: Multi-Arch: foreign for pyotherside-tests is wrong

[Sylvain Pineau]

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

spineau-guest pushed a commit to branch master
in repository pyotherside.

commit 628c3c23f121e4b4341f674b23de6e12c7a76a91
Author: Sylvain Pineau <sylvain.pineau at canonical.com>
Date:   Thu Jan 21 00:19:44 2016 +0100

    Multi-Arch: foreign for pyotherside-tests is wrong
    
    It ships an ELF file in /usr/lib/pyotherside/tests/tests.
    Files must be installed in /usr/lib/${DEB_HOST_MULTIARCH}
---
 debian/control                      | 2 +-
 debian/pyotherside-tests.install    | 2 --
 debian/pyotherside-tests.install.in | 2 ++
 debian/rules                        | 8 ++++++++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index b23e65a..f216466 100644
--- a/debian/control
+++ b/debian/control
@@ -88,7 +88,7 @@ Description: asynchronous Python 3 Bindings for Qt 5 (documentation)
 
 Package: pyotherside-tests
 Section: misc
-Multi-Arch: foreign
+Multi-Arch: same
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: qml-module-io-thp-pyotherside (= ${binary:Version}),
diff --git a/debian/pyotherside-tests.install b/debian/pyotherside-tests.install
deleted file mode 100644
index 1ff0c57..0000000
--- a/debian/pyotherside-tests.install
+++ /dev/null
@@ -1,2 +0,0 @@
-tests/test_*/ /usr/lib/pyotherside/tests
-tests/tests /usr/lib/pyotherside/tests
diff --git a/debian/pyotherside-tests.install.in b/debian/pyotherside-tests.install.in
new file mode 100644
index 0000000..9cacdf0
--- /dev/null
+++ b/debian/pyotherside-tests.install.in
@@ -0,0 +1,2 @@
+tests/test_*/ /usr/lib/@DEB_HOST_MULTIARCH@/pyotherside/tests
+tests/tests /usr/lib/@DEB_HOST_MULTIARCH@/pyotherside/tests
diff --git a/debian/rules b/debian/rules
index 393f1d6..401be24 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,14 @@ override_dh_auto_build:
 	dh_auto_build
 	/usr/share/sphinx/scripts/python3/sphinx-build -b html docs build/sphinx/html
 
+override_dh_install:
+	set -e
+	for FILE in debian/*.install.in; \
+	do \
+		sed -e "s/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g" $$FILE > debian/`basename $$FILE .in`; \
+	done
+	dh_install
+
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf build

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pyotherside.git