[Python-modules-commits] [pyotherside] 02/02: Use dh-exec instead of an .install.in file to subst DEB_HOST_MULTIARCH

[Dmitry Shachnev]

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

mitya57 pushed a commit to branch master
in repository pyotherside.

commit 406d7f35bc7bbbeb8bec148bd45b49138713d802
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Jan 22 11:10:52 2016 +0300

    Use dh-exec instead of an .install.in file to subst DEB_HOST_MULTIARCH
---
 debian/changelog                    | 3 +++
 debian/control                      | 1 +
 debian/pyotherside-tests.install    | 3 +++
 debian/pyotherside-tests.install.in | 2 --
 debian/rules                        | 8 --------
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9e7b422..7143ce7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,9 @@ pyotherside (1.4.0-2) UNRELEASED; urgency=medium
     python3-dev
   * Fix autopkgtest to use the path containing DEB_HOST_MULTIARCH
 
+  [ Dmitry Shachnev ]
+  * Use dh-exec instead of an .install.in file to subst DEB_HOST_MULTIARCH
+
  -- Sylvain Pineau <sylvain.pineau at canonical.com>  Thu, 21 Jan 2016 00:10:59 +0100
 
 pyotherside (1.4.0-1) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index cf8f0d0..94d1d82 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Zygmunt Krynicki <zygmunt.krynicki at canonical.com>
 Uploaders: Marco Trevisan (Treviño) <marco at ubuntu.com>,
            Sylvain Pineau <sylvain.pineau at canonical.com>
 Build-Depends: debhelper (>= 9),
+               dh-exec,
                python3-dev,
                python3-sphinx,
                qt5-qmake,
diff --git a/debian/pyotherside-tests.install b/debian/pyotherside-tests.install
new file mode 100755
index 0000000..b1a938d
--- /dev/null
+++ b/debian/pyotherside-tests.install
@@ -0,0 +1,3 @@
+#! /usr/bin/dh-exec
+tests/test_*/ /usr/lib/${DEB_HOST_MULTIARCH}/pyotherside/tests
+tests/tests /usr/lib/${DEB_HOST_MULTIARCH}/pyotherside/tests
diff --git a/debian/pyotherside-tests.install.in b/debian/pyotherside-tests.install.in
deleted file mode 100644
index 9cacdf0..0000000
--- a/debian/pyotherside-tests.install.in
+++ /dev/null
@@ -1,2 +0,0 @@
-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 cfacfcd..cc1b477 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,14 +10,6 @@ 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