Here's the patch I made (based on one from Benjamin Drung) that makes multiarch work for me.

Once again I can hear the sounds in my games.


diff -purN opus-1.1~alpha+20130512/debian/compat multiarch/debian/compat
--- opus-1.1~alpha+20130512/debian/compat	2013-06-30 12:35:46.000000000 +0200
+++ multiarch/debian/compat	2013-06-29 12:09:17.000000000 +0200
@@ -1 +1 @@
-5
+9
diff -purN opus-1.1~alpha+20130512/debian/control multiarch/debian/control
--- opus-1.1~alpha+20130512/debian/control	2013-06-30 12:35:46.000000000 +0200
+++ multiarch/debian/control	2013-06-30 12:26:14.000000000 +0200
@@ -2,7 +2,7 @@ Source: opus
 Section: sound
 Priority: optional
 Maintainer: Ron Lee <[email protected]>
-Build-Depends: debhelper (>= 5), doxygen
+Build-Depends: debhelper (>= 9), doxygen
 Standards-Version: 3.9.4.0
 Homepage: http://www.opus-codec.org
 Vcs-Git: git://git.debian.org/users/ron/opus.git
@@ -11,7 +11,9 @@ Vcs-Browser: http://git.debian.org/?p=us
 Package: libopus0
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}
+Multi-Arch: same
+Pre-Depends: multiarch-support
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: opus-tools
 Description: Opus codec runtime library
  The Opus codec is designed for interactive speech and audio transmission over
@@ -40,7 +42,8 @@ Description: Opus codec runtime library
 Package: libopus-dev
 Section: libdevel
 Architecture: any
-Depends: libopus0 (= ${binary:Version})
+Multi-Arch: same
+Depends: libopus0 (= ${binary:Version}), ${misc:Depends}
 Description: Opus codec library development files
  The Opus codec is designed for interactive speech and audio transmission over
  the Internet. It is designed by the IETF Codec Working Group and incorporates
@@ -69,13 +72,15 @@ Package: libopus-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: libopus0 (= ${binary:Version})
+Multi-Arch:same
+Depends: libopus0 (= ${binary:Version}), ${misc:Depends}
 Description: debugging symbols for libopus
  This package provides the detached debug symbols for libopus.
 
 Package: libopus-doc
 Section: doc
 Architecture: all
+Depends: ${misc:Depends}
 Description: libopus API documentation
  This package contains the developer documentation for libopus.
 
diff -purN opus-1.1~alpha+20130512/debian/libopus0.install multiarch/debian/libopus0.install
--- opus-1.1~alpha+20130512/debian/libopus0.install	2013-06-30 12:35:46.000000000 +0200
+++ multiarch/debian/libopus0.install	2013-06-29 12:09:17.000000000 +0200
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff -purN opus-1.1~alpha+20130512/debian/libopus-dev.install multiarch/debian/libopus-dev.install
--- opus-1.1~alpha+20130512/debian/libopus-dev.install	2013-06-30 12:35:46.000000000 +0200
+++ multiarch/debian/libopus-dev.install	2013-06-29 12:09:17.000000000 +0200
@@ -1,4 +1,4 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/opus.pc
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/opus.pc
diff -purN opus-1.1~alpha+20130512/debian/rules multiarch/debian/rules
--- opus-1.1~alpha+20130512/debian/rules	2013-06-30 12:35:46.000000000 +0200
+++ multiarch/debian/rules	2013-06-29 12:17:41.000000000 +0200
@@ -1,149 +1,15 @@
 #!/usr/bin/make -f
-# Ron Lee 2003 - 2012
-
-#export DH_VERBOSE=1
-export DH_OPTIONS
-
-SHELL = /bin/bash
-
-NUM_CPUS = $(shell getconf _NPROCESSORS_ONLN 2>/dev/null)
-PARALLEL = $(subst parallel=,,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-NJOBS    = -j$(or $(PARALLEL),$(NUM_CPUS),1)
-
-
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-
-
-# -fstack-protector-all is added by the default autoconf tests.
-HARD_CPPFLAGS = -D_FORTIFY_SOURCE=2
-HARD_CFLAGS   = -Wformat=2
-HARD_LDFLAGS  = -Wl,-z,now
-
-ifneq (,$(filter-out $(DEB_HOST_ARCH), alpha hppa arm))
-	HARD_CFLAGS += -fstack-protector --param ssp-buffer-size=4
-endif
-ifneq (,$(filter-out $(DEB_HOST_ARCH), ia64 hppa avr32))
-	HARD_LDFLAGS += -Wl,-z,relro
-endif
-
-# Keep dpkg-buildpackage the hell out of messing with our compile flags,
-# we should trust upstream to know better than it what to use here.
-# We explicitly re-add -g and -O2 here, since by explicitly overriding
-# these variables, we otherwise disable autoconf adding them by default.
-CPPFLAGS = $(HARD_CPPFLAGS)
-CFLAGS   = $(HARD_CFLAGS) -g -O2
-CXXFLAGS = $(HARD_CFLAGS) -g -O2
-LDFLAGS  = $(HARD_LDFLAGS)
-
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS = -g -O0
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	BUILD_TARGET = check-opus
-else
-	BUILD_TARGET = opus
-endif
-
 
 ifneq (,$(filter $(DEB_HOST_ARCH), arm armel mips mipsel))
 	EXTRA_CONFIG_FLAGS = --enable-fixed-point
 endif
 
+%:
+	dh $@
 
+override_dh_auto_configure:
+	dh_auto_configure -- $(EXTRA_CONFIG_FLAGS)
 
-objdir := objs
-
-
-clean:
-	dh_testdir
-	dh_testroot
-	$(RM) -r $(objdir)
-	$(RM) *-stamp
-	dh_clean
-
-
-$(objdir)/config.status: configure
-	dh_testdir
-	mkdir -p $(objdir)
-	cd $(objdir) &&	../configure --disable-maintainer-mode		\
-				     --host=$(DEB_HOST_GNU_TYPE)	\
-				     --build=$(DEB_BUILD_GNU_TYPE)	\
-				     --prefix=/usr			\
-				     $(EXTRA_CONFIG_FLAGS)		\
-				     CPPFLAGS="$(CPPFLAGS)"		\
-				     CFLAGS="$(CFLAGS)"			\
-				     CXXFLAGS="$(CXXFLAGS)"		\
-				     LDFLAGS="$(LDFLAGS)"
-
-build: build-arch build-indep
-
-build-arch: build-arch-stamp
-build-arch-stamp: $(objdir)/config.status
-	dh_testdir
-	$(MAKE) $(NJOBS) -C $(objdir) $(BUILD_TARGET)
-	touch $@
-
-build-indep: build-indep-stamp
-build-indep-stamp: $(objdir)/config.status
-	dh_testdir
-	$(MAKE) $(NJOBS) -C $(objdir) docs
-	touch $@
-
-
-install: install-arch install-indep
-
-install-arch: install-arch-stamp
-install-arch-stamp: build-arch
-	dh_testdir
-	$(MAKE) -C $(objdir) install-opus DESTDIR=$(CURDIR)/debian/tmp
-	touch $@
-
-install-indep: install-indep-stamp
-install-indep-stamp: build-indep
-	dh_testdir
-	$(MAKE) -C $(objdir) install-docs DESTDIR=$(CURDIR)/debian/tmp
-	touch $@
-
-
-binary: binary-arch binary-indep
-
-binary-indep: DH_OPTIONS = -i
-binary-indep: install-indep
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installchangelogs
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary-arch: DH_OPTIONS = -a
-binary-arch: install-arch
-	dh_testdir
-	dh_testroot
-	dh_install --sourcedir=debian/tmp
-	dh_installdocs
-	dh_installchangelogs
-	dh_strip --dbg-package=libopus-dbg
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-
-.PHONY: clean build build-arch build-indep install install-arch install-indep \
-	binary binary-arch binary-indep
+override_dh_test:
+	$(MAKE) check
 
diff -purN opus-1.1~alpha+20130512/debian/source/format multiarch/debian/source/format
--- opus-1.1~alpha+20130512/debian/source/format	1970-01-01 01:00:00.000000000 +0100
+++ multiarch/debian/source/format	2013-06-29 12:09:17.000000000 +0200
@@ -0,0 +1 @@
+3.0 (quilt)

Reply via email to