This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch master in repository mupen64plus-input-sdl.
commit fbd72e968eda6bc29ac0963f8121f40dcb962e6f Author: Sven Eckelmann <[email protected]> Date: Sat Apr 23 13:31:03 2011 +0200 Add multiarch support --- debian/changelog | 1 + debian/control | 9 ++++++++- debian/mupen64plus-input-sdl.install | 2 +- debian/rules | 4 +++- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 781f89e..372a7e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ mupen64plus-input-sdl (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 <[email protected]> Fri, 22 Apr 2011 18:12:33 +0200 diff --git a/debian/control b/debian/control index 3548678..587a406 100644 --- a/debian/control +++ b/debian/control @@ -9,13 +9,17 @@ Homepage: http://code.google.com/p/mupen64plus/ Vcs-Git: git://anonscm.debian.org/collab-maint/mupen64plus-input-sdl.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/mupen64plus-input-sdl.git Build-Depends: - debhelper (>= 8.0.0), + debhelper (>= 8.1.3), + dpkg-dev (>= 1.16.0), hardening-includes, libmupen64plus-dev, libsdl1.2-dev, Package: mupen64plus-input-sdl Architecture: any-i386 any-amd64 +Multi-Arch: same +Pre-Depends: + ${misc:Pre-Depends}, Depends: ${misc:Depends}, ${shlibs:Depends}, @@ -32,6 +36,9 @@ Package: mupen64plus-input-sdl-dbg Section: debug Priority: extra Architecture: any-i386 any-amd64 +Multi-Arch: same +Pre-Depends: + ${misc:Pre-Depends}, Depends: ${misc:Depends}, mupen64plus-input-sdl (= ${binary:Version}), diff --git a/debian/mupen64plus-input-sdl.install b/debian/mupen64plus-input-sdl.install index 18c70a5..a1dbf54 100644 --- a/debian/mupen64plus-input-sdl.install +++ b/debian/mupen64plus-input-sdl.install @@ -1,2 +1,2 @@ -usr/lib/mupen64plus/ +usr/lib/*/mupen64plus/ usr/share/mupen64plus/ diff --git a/debian/rules b/debian/rules index 32eb5fa..8421acb 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-input-sdl.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
