[SCM] slv2/master: Introduce multi-arch.

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b216a566ae0e0a0340b05523e1378720c01aa155
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Wed Feb 11 20:11:18 2015 +0100

    Introduce multi-arch.

diff --git a/debian/control b/debian/control
index cc796a1..0539655 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,7 @@ Uploaders: Free Ekanayaka <freee at debian.org>,
  Alessio Treglia <alessio at debian.org>,
  Adrian Knoth <adi at drcomp.erfurt.thur.de>,
  Jaromír Mikeš <mira.mikes at seznam.cz>
-Build-Depends: dh-exec (>=0.3),
- debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
  python,
  librdf0-dev (>= 1.0.13-2),
  libraptor2-dev (>= 2.0.0-2),
diff --git a/debian/libslv2-9.install b/debian/libslv2-9.install
index 87c6daa..75d5ba4 100644
--- a/debian/libslv2-9.install
+++ b/debian/libslv2-9.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libslv2.so.9* /usr/lib/${DEB_HOST_MULTIARCH}/
+usr/lib/*/libslv2.so.9*
diff --git a/debian/libslv2-dev.install b/debian/libslv2-dev.install
index b4a2166..001006b 100644
--- a/debian/libslv2-dev.install
+++ b/debian/libslv2-dev.install
@@ -1,4 +1,3 @@
-#! /usr/bin/dh-exec
-usr/include/slv2/* /usr/include/slv2/
-usr/lib/libslv2.so /usr/lib/${DEB_HOST_MULTIARCH}/
-usr/lib/pkgconfig/* /usr/lib/pkgconfig/
+usr/include/slv2/*
+usr/lib/*/libslv2.so
+usr/lib/*/pkgconfig/*
diff --git a/debian/rules b/debian/rules
index d264a32..c09d91c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,15 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 WAF = ./waf
 
 %:
 	dh $@
 
 override_dh_auto_configure:
-	LINKFLAGS="-ldl" $(WAF) configure   --prefix=/usr  --build-docs
+	LINKFLAGS="-ldl" $(WAF) configure   --prefix=/usr  --build-docs --libdir=usr/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_auto_build:
 	$(WAF)
diff --git a/debian/slv2-doc.install b/debian/slv2-doc.install
index 0262ffe..7914253 100644
--- a/debian/slv2-doc.install
+++ b/debian/slv2-doc.install
@@ -1 +1 @@
-usr/share/doc/slv2/* usr/share/doc/slv2/
+usr/share/doc/slv2/*
diff --git a/debian/slv2-jack.install b/debian/slv2-jack.install
index 7d7c33e..1df36c6 100644
--- a/debian/slv2-jack.install
+++ b/debian/slv2-jack.install
@@ -1 +1 @@
-usr/bin/* usr/bin/
+usr/bin/*

-- 
slv2 packaging