Package: libsamplerate
Version: 0.1.7-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch

Hi Erik,

Please find attached a patch to libsamplerate to transition it to use of the
multiarch library paths as described at
<http://wiki.debian.org/Multiarch/Implementation>.  As with libsndfile, this
patch has been tested and included in Ubuntu Oneiric.  I would encourage you
to apply this patch in Debian as well, since libsamplerate is part of the
audio stack included in ia32-libs, which we would like to get rid of for
wheezy.

Note that I have examined the -dev package and confirmed that it contains no
architecture-specific headers, so I have marked theis package Multi-Arch:
same in addition to the runtime library package.

Thanks,
--
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
slanga...@ubuntu.com                                     vor...@debian.org
=== modified file 'debian/control'
--- debian/control	2009-10-07 21:46:20 +0000
+++ debian/control	2011-08-12 18:32:35 +0000
@@ -3,13 +3,15 @@
 Priority: optional
 Maintainer: Erik de Castro Lopo <er...@mega-nerd.com>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>> 7.0.0), fftw3-dev, libsndfile1-dev, quilt
+Build-Depends: debhelper (>> 8.1.3), fftw3-dev, libsndfile1-dev, quilt
 Standards-Version: 3.8.3
 Homepage: http://www.mega-nerd.com/SRC/
 
 Package: libsamplerate0
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}
 Description: Audio sample rate conversion library
  libsamplerate (aka Secret Rabbit Code) is a library for audio rate conversion.
@@ -33,6 +36,7 @@
 Conflicts: libsamplerate-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libsamplerate0 (= ${binary:Version}), pkg-config
 Description: Development files for audio sample rate conversion
  libsamplerate (aka Secret Rabbit Code) is a library for audio rate conversion.

=== modified file 'debian/libsamplerate0-dev.install'
--- debian/libsamplerate0-dev.install	2007-04-07 01:36:51 +0000
+++ debian/libsamplerate0-dev.install	2011-08-12 18:32:35 +0000
@@ -1,5 +1,5 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.la
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.a
+usr/lib/*/lib*.la
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*

=== modified file 'debian/libsamplerate0.install'
--- debian/libsamplerate0.install	2007-04-07 01:36:51 +0000
+++ debian/libsamplerate0.install	2011-08-12 18:32:35 +0000
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*

=== modified file 'debian/rules'
--- debian/rules	2009-10-07 21:46:20 +0000
+++ debian/rules	2011-08-12 18:32:35 +0000
@@ -11,6 +11,7 @@
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_MULTIARCH  ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
@@ -21,7 +22,7 @@
 
 config.status: configure
 	dh_testdir
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
 
 
 build: patch build-stamp

Reply via email to