[mupen64plus-video-z64] 44/161: Add multiarch support
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 06:20:25 UTC 2015
This is an automated email from the git hooks/post-receive script.
ecsv-guest pushed a commit to branch master
in repository mupen64plus-video-z64.
commit 5d54bc2e80f84ab87423f6e9d915f7e766cc5171
Author: Sven Eckelmann <sven at narfation.org>
Date: Sat Apr 23 13:31:04 2011 +0200
Add multiarch support
---
debian/changelog | 1 +
debian/control | 9 ++++++++-
debian/mupen64plus-video-z64.install | 2 +-
debian/rules | 4 +++-
4 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3731aa2..681f653 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mupen64plus-video-z64 (1.99.4-2) UNRELEASED; urgency=low
* Upgraded to policy 3.9.2, no changes required
* Update Vcs-* fields to new anonscm.debian.org URLs in debian/control
+ * Add multiarch support
-- Sven Eckelmann <sven at narfation.org> Fri, 22 Apr 2011 18:12:52 +0200
diff --git a/debian/control b/debian/control
index d2b9890..00e6156 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,8 @@ Homepage: http://code.google.com/p/mupen64plus/
Vcs-Git: git://anonscm.debian.org/collab-maint/mupen64plus-video-z64.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/mupen64plus-video-z64.git
Build-Depends:
- debhelper (>= 8.0.0),
+ debhelper (>= 8.1.3),
+ dpkg-dev (>= 1.16.0),
hardening-includes,
libgl1-mesa-dev | libgl-dev,
libglew1.5-dev | libglew-dev,
@@ -18,6 +19,9 @@ Build-Depends:
Package: mupen64plus-video-z64
Architecture: any-i386 any-amd64
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
Depends:
${misc:Depends},
${shlibs:Depends},
@@ -38,6 +42,9 @@ Package: mupen64plus-video-z64-dbg
Section: debug
Priority: extra
Architecture: any-i386 any-amd64
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
Depends:
${misc:Depends},
mupen64plus-video-z64 (= ${binary:Version}),
diff --git a/debian/mupen64plus-video-z64.install b/debian/mupen64plus-video-z64.install
index 5b2a8dc..3e52113 100644
--- a/debian/mupen64plus-video-z64.install
+++ b/debian/mupen64plus-video-z64.install
@@ -1 +1 @@
-usr/lib/mupen64plus/
+usr/lib/*/mupen64plus/
diff --git a/debian/rules b/debian/rules
index 630ab07..f3f8c12 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/
+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)/mupen64plus"
%:
dh $@ --sourcedirectory="projects/unix" --parallel --list-missing
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-z64.git
More information about the Pkg-games-commits
mailing list