Package: libmad
Version: 0.15.1b-6
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

Hi folks,

Please find attached a patch to libmad 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 Precise.

libmad0 is a dependency of libsdl-mixer1.2, which is included in ia32-libs
in Ubuntu but not in Debian; I don't know why specifically but we can safely
assume that someone requested this, and that it would therefore be useful to
Debian users to have this library cross-installable as well.

Thanks for considering the patch.
-- 
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	2008-03-15 13:51:31 +0000
+++ debian/control	2011-12-30 06:46:41 +0000
@@ -1,14 +1,16 @@
 Source: libmad
 Priority: optional
 Section: sound
-Build-Depends: debhelper (>= 5), gettext, cdbs, autotools-dev, quilt
+Build-Depends: debhelper (>= 8.1.3~), gettext, cdbs (>= 0.4.93~), autotools-dev, quilt
 Maintainer: Mad Maintainers <pkg-mad-maintain...@lists.alioth.debian.org>
 Uploaders: Kurt Roeckx <k...@roeckx.be>, Clément Stenac <zorg...@debian.org>, Sam Clegg <s...@debian.org>
 Standards-Version: 3.7.3
 
 Package: libmad0
 Architecture: any
+Multi-Arch: same
 Section: libs
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}
 Description: MPEG audio decoder library
  MAD is an MPEG audio decoder. It currently only supports the MPEG 1

=== modified file 'debian/libmad0-dev.install'
--- debian/libmad0-dev.install	2005-06-01 17:12:24 +0000
+++ debian/libmad0-dev.install	2011-12-30 03:27:45 +0000
@@ -1,5 +1,4 @@
 debian/tmp/usr/include/mad.h /usr/include
-debian/tmp/usr/lib/libmad.a /usr/lib
-debian/tmp/usr/lib/libmad.so /usr/lib
-debian/tmp/usr/lib/libmad.la /usr/lib
+debian/tmp/usr/lib/*/libmad.a
+debian/tmp/usr/lib/*/libmad.so
 debian/mad.pc /usr/lib/pkgconfig

=== modified file 'debian/libmad0.install'
--- debian/libmad0.install	2005-06-01 17:12:24 +0000
+++ debian/libmad0.install	2011-12-30 03:27:28 +0000
@@ -1 +1 @@
-debian/tmp/usr/lib/libmad.so.* /usr/lib
+debian/tmp/usr/lib/*/libmad.so.*

=== modified file 'debian/rules'
--- debian/rules	2008-03-15 13:51:31 +0000
+++ debian/rules	2011-12-30 06:44:09 +0000
@@ -10,22 +10,13 @@
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS=--enable-shared
+DEB_CONFIGURE_EXTRA_FLAGS=--enable-shared --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-profiling --enable-debugging
 else
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-profiling --disable-debugging
 endif
 
-build: build-stamp
-build-stamp:
-	dh_testdir
-
-	# Add here commands to compile the package.
-	./configure --prefix=/usr $(CONFIGURE_FLAGS)
-	$(MAKE)
-	touch build-stamp
-
 clean::
 	# annoying lintian errors
 	rm -f config.cache libz/config.log libz/config.status

Reply via email to