Package: libogg
Version: 1.2.2~dfsg-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch
Hi Ron,
Please find attached a patch to libogg 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 will be uploaded shortly to Ubuntu Oneiric. I would encourage
you to apply this patch in Debian as well, since libogg 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
diff -u libogg-1.2.2~dfsg/debian/libogg0.install libogg-1.2.2~dfsg/debian/libogg0.install
--- libogg-1.2.2~dfsg/debian/libogg0.install
+++ libogg-1.2.2~dfsg/debian/libogg0.install
@@ -1 +1 @@
-usr/lib/libogg.so.*
+usr/lib/*/libogg.so.*
diff -u libogg-1.2.2~dfsg/debian/rules libogg-1.2.2~dfsg/debian/rules
--- libogg-1.2.2~dfsg/debian/rules
+++ libogg-1.2.2~dfsg/debian/rules
@@ -22,6 +22,7 @@
INSTALL_PROGRAM += -s
endif
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -42,6 +43,7 @@
mkdir -p $(objdir)
cd $(objdir) && ../configure --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--enable-static \
--prefix=/usr
diff -u libogg-1.2.2~dfsg/debian/control libogg-1.2.2~dfsg/debian/control
--- libogg-1.2.2~dfsg/debian/control
+++ libogg-1.2.2~dfsg/debian/control
@@ -2,7 +2,7 @@
Section: libs
Priority: optional
Maintainer: Ron Lee <r...@debian.org>
-Build-Depends: debhelper(>=5)
+Build-Depends: debhelper (>= 8.1.3)
Standards-Version: 3.9.2.0
Homepage: http://xiph.org/ogg/
Vcs-Git: git://git.debian.org/users/ron/libogg.git
@@ -10,8 +11,10 @@
Package: libogg0
Architecture: any
+Multi-Arch: same
Section: libs
Depends: ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
Description: Ogg bitstream library
Libogg is a library for manipulating ogg bitstreams. It handles
both making ogg bitstreams and getting packets from ogg bitstreams.
@@ -26,6 +29,7 @@
Package: libogg-dbg
Architecture: any
+Multi-Arch: same
Section: debug
Priority: extra
Depends: libogg0 (= ${binary:Version})
diff -u libogg-1.2.2~dfsg/debian/libogg-dev.install libogg-1.2.2~dfsg/debian/libogg-dev.install
--- libogg-1.2.2~dfsg/debian/libogg-dev.install
+++ libogg-1.2.2~dfsg/debian/libogg-dev.install
@@ -1,6 +1,6 @@
usr/include/*
-usr/lib/libogg.a
-usr/lib/libogg.so
-usr/lib/pkgconfig/ogg.pc
+usr/lib/*/libogg.a
+usr/lib/*/libogg.so
+usr/lib/*/pkgconfig/ogg.pc
usr/share/aclocal/ogg.m4
usr/share/doc/libogg-*/* usr/share/doc/libogg-dev/html
