Package: libsndfile
Version: 1.0.25-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch
Hi Erik,
Please find attached a patch to libsndfile to transition it to use of the
multiarch library paths as described at
<http://wiki.debian.org/Multiarch/Implementation>. This patch has been
tested and included in Ubuntu Oneiric. I would encourage you to apply this
patch in Debian as well, since libsndfile is pretty low in the audio stack
included in ia32-libs, which we would like to get rid of for wheezy.
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 2011-07-21 15:29:06 +0000
+++ debian/control 2011-08-12 19:39:18 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Erik de Castro Lopo <er...@mega-nerd.com>
DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.0), pkg-config,
+Build-Depends: debhelper (>= 8.1.3), pkg-config,
libvorbis-dev (>= 1.2.3), libflac-dev (>= 1.1.4-3),
libasound2-dev [linux-any]
Standards-Version: 3.9.2
@@ -27,6 +27,8 @@
Package: libsndfile1
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Library for reading/writing audio files
libsndfile is a library of C routines for reading and writing files containing
=== modified file 'debian/libsndfile1-dev.install'
--- debian/libsndfile1-dev.install 2009-02-17 19:21:03 +0000
+++ debian/libsndfile1-dev.install 2011-08-12 19:39:18 +0000
@@ -1,6 +1,6 @@
usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.la
-usr/lib/lib*.so
-usr/lib/pkgconfig/sndfile.pc
+usr/lib/*/lib*.a
+usr/lib/*/lib*.la
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/sndfile.pc
usr/share/doc/libsndfile1-dev/html/*
=== modified file 'debian/libsndfile1.install'
--- debian/libsndfile1.install 2007-04-07 13:07:14 +0000
+++ debian/libsndfile1.install 2011-08-12 19:39:18 +0000
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
=== modified file 'debian/rules'
--- debian/rules 2011-03-23 20:50:15 +0000
+++ debian/rules 2011-08-12 19:39:18 +0000
@@ -9,7 +9,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 +21,7 @@
config.status: configure
dh_testdir
#autoreconf -f
- ./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
@@ -54,7 +54,7 @@
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
- set -e; for FILE in debian/tmp/usr/lib/*.la; \
+ set -e; for FILE in debian/tmp/usr/lib/*/*.la; \
do \
sed -i "/dependency_libs/ s/'.*'/''/" $$FILE; \
done
@@ -79,7 +79,7 @@
dh_makeshlibs -plibsndfile1
dh_installdeb -a
dh_shlibdeps -plibsndfile1
- dh_shlibdeps -psndfile-programs -ldebian/tmp/usr/lib
+ dh_shlibdeps -psndfile-programs -ldebian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
dh_gencontrol -a
dh_md5sums -a
dh_builddeb -a
