[glfw] 13/18: Enable multiarch (Closes: #732436)

[James Cowgill]

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

jcowgill-guest pushed a commit to branch master
in repository glfw.

commit 1c5827274cd606cd0f0de83d60ed3063ae7e90ff
Author: James Cowgill <james410 at cowgill.org.uk>
Date:   Sat Jun 20 22:20:50 2015 +0100

    Enable multiarch (Closes: #732436)
---
 debian/control             | 2 ++
 debian/libglfw-dev.install | 5 +++--
 debian/libglfw-dev.links   | 3 ++-
 debian/libglfw2.install    | 2 +-
 debian/rules               | 4 ++++
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index dd68beb..ae7f24e 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,7 @@ Homepage: http://www.glfw.org/
 Package: libglfw2
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Shared libraries portable framework for OpenGL application development
  GLFW is a free, Open Source, framework for OpenGL application
@@ -31,6 +32,7 @@ Description: Shared libraries portable framework for OpenGL application developm
 Package: libglfw-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libglfw2 (= ${binary:Version}),
          libglu1-mesa-dev | libglu-dev,
          mesa-common-dev,
diff --git a/debian/libglfw-dev.install b/debian/libglfw-dev.install
old mode 100644
new mode 100755
index a861cb9..366873a
--- a/debian/libglfw-dev.install
+++ b/debian/libglfw-dev.install
@@ -1,3 +1,4 @@
+#!/usr/bin/dh-exec
 usr/include/*
-usr/lib/lib*.a
-usr/lib/pkgconfig/libglfw.pc
+usr/lib/libglfw.a            usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/pkgconfig/libglfw.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
diff --git a/debian/libglfw-dev.links b/debian/libglfw-dev.links
old mode 100644
new mode 100755
index 1cc2f1c..e06d908
--- a/debian/libglfw-dev.links
+++ b/debian/libglfw-dev.links
@@ -1 +1,2 @@
-usr/lib/libglfw.so.2 usr/lib/libglfw.so
+#!/usr/bin/dh-exec
+usr/lib/${DEB_HOST_MULTIARCH}/libglfw.so.2 usr/lib/${DEB_HOST_MULTIARCH}/libglfw.so
diff --git a/debian/libglfw2.install b/debian/libglfw2.install
index 6dd9832..80621b3 100755
--- a/debian/libglfw2.install
+++ b/debian/libglfw2.install
@@ -1,2 +1,2 @@
 #!/usr/bin/dh-exec
-usr/lib/libglfw.so => usr/lib/libglfw.so.2
+usr/lib/libglfw.so => usr/lib/${DEB_HOST_MULTIARCH}/libglfw.so.2
diff --git a/debian/rules b/debian/rules
index cecd865..ba683ef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,15 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
+
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 %:
 	dh $@
 
 override_dh_auto_build:
 	$(MAKE) x11
 	$(MAKE) -C lib/x11 -f Makefile.x11 PREFIX=/usr libglfw.pc
+	sed -i 's,/lib,/lib/$(DEB_HOST_MULTIARCH),' lib/x11/libglfw.pc
 
 override_dh_auto_install:
 	$(MAKE) PREFIX=$(CURDIR)/debian/tmp/usr x11-dist-install

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