[med-svn] [libtabixpp] 01/01: add multiarch support

[Sascha Steinbiss]

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

sascha-guest pushed a commit to branch master
in repository libtabixpp.

commit b4193cec6b5f63f57cbbfca472dc68dbfb4581a2
Author: Sascha Steinbiss <sascha at steinbiss.name>
Date:   Tue Dec 15 06:32:53 2015 +0000

    add multiarch support
---
 debian/control                  |  3 +++
 debian/libtabixpp0-dev.links    |  1 -
 debian/libtabixpp0-dev.links.in |  1 +
 debian/rules                    | 11 ++++++++---
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index ea34145..0f59742 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Homepage: https://github.com/ekg/tabixpp
 
 Package: libtabixpp0
 Architecture: any
+Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends}
@@ -29,6 +30,7 @@ Package: libtabixpp0-dev
 Provides: libtabixpp-dev
 Conflicts: libtabixpp-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: ${shlibs:Depends},
          ${misc:Depends},
@@ -40,6 +42,7 @@ Description: C++ wrapper to tabix indexer (development files)
 
 Package: libtabixpp0-dbg
 Architecture: any
+Multi-Arch: same
 Section: debug
 Priority: extra
 Depends: ${shlibs:Depends},
diff --git a/debian/libtabixpp0-dev.links b/debian/libtabixpp0-dev.links
deleted file mode 100644
index 35903fa..0000000
--- a/debian/libtabixpp0-dev.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libtabixpp.so.0 usr/lib/libtabixpp.so
\ No newline at end of file
diff --git a/debian/libtabixpp0-dev.links.in b/debian/libtabixpp0-dev.links.in
new file mode 100644
index 0000000..3556d75
--- /dev/null
+++ b/debian/libtabixpp0-dev.links.in
@@ -0,0 +1 @@
+usr/lib/@DEB_HOST_MULTIARCH@/libtabixpp.so.0 usr/lib/@DEB_HOST_MULTIARCH@/libtabixpp.so
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 99361ce..577b176 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,21 @@
 #!/usr/bin/make -f
 
 # DH_VERBOSE := 1
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 %:
 	dh $@
 
+override_dh_auto_configure:
+	dh_auto_configure
+	sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' \
+                debian/libtabixpp0-dev.links.in > debian/libtabixpp0-dev.links
+
 override_dh_auto_install:
 	mkdir -p debian/libtabixpp0-dev/usr/include
 	cp *hpp debian/libtabixpp0-dev/usr/include
-	mkdir -p debian/libtabixpp0/usr/lib
-	cp libtabixpp.so* debian/libtabixpp0/usr/lib/
-	dh_auto_install --
+	mkdir -p debian/libtabixpp0/usr/lib/$(DEB_HOST_MULTIARCH)/
+	cp libtabixpp.so* debian/libtabixpp0/usr/lib/$(DEB_HOST_MULTIARCH)/
 
 override_dh_strip:
 	dh_strip --dbg-package=libtabixpp0-dbg

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