[mupen64plus-core] 74/310: Add multiarch support

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-core.

commit a6c7c81a68c39a19adbac378e2eab194c41e6e34
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sat Apr 23 13:01:32 2011 +0200

    Add multiarch support
---
 debian/changelog | 1 +
 debian/control   | 9 ++++++++-
 debian/rules     | 6 ++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 75a6aeb..b865011 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ mupen64plus-core (1.99.4-2) UNRELEASED; urgency=low
     - Add rjump_globber.patch. Prevent over-optimization of rjump related data
   * Upgraded to policy 3.9.2, no changes required
   * Update Vcs-* fields to new anonscm.debian.org URLs in debian/control
+  * Add multiarch support (Closes: #623767)
 
  -- Sven Eckelmann <sven at narfation.org>  Mon, 07 Mar 2011 21:46:08 +0100
 
diff --git a/debian/control b/debian/control
index e293498..4214f4d 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Vcs-Git: git://anonscm.debian.org/collab-maint/mupen64plus-core.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/mupen64plus-core.git
 Build-Depends:
  binutils-dev,
- debhelper (>= 8.0.0),
+ debhelper (>= 8.1.3),
+ dpkg-dev (>= 1.16.0),
  hardening-includes,
  libfreetype6-dev,
  libgl1-mesa-dev | libgl-dev,
@@ -22,6 +23,9 @@ Build-Depends:
 Package: libmupen64plus2
 Section: libs
 Architecture: any-i386 any-amd64
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
@@ -52,6 +56,9 @@ Package: libmupen64plus2-dbg
 Section: debug
 Priority: extra
 Architecture: any-i386 any-amd64
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
 Depends:
  ${misc:Depends},
  libmupen64plus2 (= ${binary:Version}),
diff --git a/debian/rules b/debian/rules
index 574a9fc..8be0685 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,8 @@ export CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS)
 export CXXFLAGS=$(shell dpkg-buildflags --get CXXFLAGS)
 export LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 DEB_BUILD_HARDENING_PIE:=0
 include /usr/share/hardening-includes/hardening.make
 CFLAGS += $(HARDENING_CFLAGS)
@@ -16,7 +18,7 @@ LDFLAGS += -Wl,--as-needed
 
 DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
 DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-MAKEOPTIONS = V=1 UNAME='$(DEB_HOST_ARCH_OS)' HOST_CPU='$(DEB_HOST_GNU_CPU)' APIDIR=/usr/include/mupen64plus/ DEBUG=1 PREFIX=/usr/ LDCONFIG=true
+MAKEOPTIONS = V=1 UNAME='$(DEB_HOST_ARCH_OS)' HOST_CPU='$(DEB_HOST_GNU_CPU)' APIDIR=/usr/include/mupen64plus/ DEBUG=1 PREFIX=/usr/ LIBDIR="/usr/lib/$(DEB_HOST_MULTIARCH)" LDCONFIG=true
 
 %:
 	dh $@ --sourcedirectory="projects/unix" --parallel --list-missing
@@ -29,7 +31,7 @@ override_dh_auto_build:
 
 override_dh_auto_install:
 	dh_auto_install -- $(MAKEOPTIONS)
-	cp -d "$(CURDIR)/projects/unix/libmupen64plus.so.2" "$(CURDIR)/debian/tmp/usr/lib/"
+	cp -d "$(CURDIR)/projects/unix/libmupen64plus.so.2" "$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/"
 
 override_dh_strip:
 	dh_strip -a --dbg-package=libmupen64plus2-dbg

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