Package: liboil
Version: 0.3.17-2
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch
In Ubuntu, the attached patch was applied to make liboil compatible with
multiarch, as described at
<http://wiki.debian.org/Multiarch/Implementation>.
The most important changes are:
- Move /usr/bin/oil-bugreport to the liboil0.3-dev package.
- Switch to debhelper compat level 9.
Thanks for considering the patch.
diff -u liboil-0.3.17/debian/liboil0.3.install liboil-0.3.17/debian/liboil0.3.install
--- liboil-0.3.17/debian/liboil0.3.install
+++ liboil-0.3.17/debian/liboil0.3.install
@@ -1,2 +1 @@
-debian/tmp/usr/lib/liboil-0.3.so.*
-debian/tmp/usr/bin/*
+debian/tmp/usr/lib/*/liboil-0.3.so.*
diff -u liboil-0.3.17/debian/liboil0.3-dev.install liboil-0.3.17/debian/liboil0.3-dev.install
--- liboil-0.3.17/debian/liboil0.3-dev.install
+++ liboil-0.3.17/debian/liboil0.3-dev.install
@@ -1,4 +1,5 @@
-debian/tmp/usr/lib/liboil-0.3.so
-debian/tmp/usr/lib/liboil-0.3.a
+debian/tmp/usr/bin/*
+debian/tmp/usr/lib/*/liboil-0.3.so
+debian/tmp/usr/lib/*/liboil-0.3.a
debian/tmp/usr/include/liboil-0.3
-debian/tmp/usr/lib/pkgconfig/liboil-0.3.pc
+debian/tmp/usr/lib/*/pkgconfig/liboil-0.3.pc
diff -u liboil-0.3.17/debian/changelog liboil-0.3.17/debian/changelog
diff -u liboil-0.3.17/debian/control liboil-0.3.17/debian/control
--- liboil-0.3.17/debian/control
+++ liboil-0.3.17/debian/control
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Maintainers of GStreamer packages <pkg-gstreamer-maintain...@lists.alioth.debian.org>
Uploaders: Sebastian Dröge <sl...@debian.org>
-Build-Depends: cdbs,
- debhelper (>= 6),
+Build-Depends: cdbs (>= 0.4.93~),
+ debhelper (>= 8.1.3~),
dpkg-dev (>= 1.14.13),
autotools-dev,
gtk-doc-tools
@@ -14,6 +14,8 @@
Package: liboil0.3
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends}
Description: Library of Optimized Inner Loops
@@ -36,6 +38,8 @@
${misc:Depends}
Provides: liboil-dev
Suggests: liboil0.3-doc
+Breaks: liboil0.3 (<< 0.3.17-3~)
+Replaces: liboil0.3 (<< 0.3.17-3~)
Description: Library of Optimized Inner Loops (development headers)
Liboil is a collection of functions that often benefit from having
special implementations on various architectures or CPUs. Each function
diff -u liboil-0.3.17/debian/rules liboil-0.3.17/debian/rules
--- liboil-0.3.17/debian/rules
+++ liboil-0.3.17/debian/rules
@@ -5,7 +5,7 @@
include /usr/share/cdbs/1/rules/simple-patchsys.mk
DEB_DH_STRIP_ARGS := --dbg-package=liboil0.3-dbg
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-static
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-static --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
DEB_DH_MAKESHLIBS_ARGS_ALL += -- -c4
diff -u liboil-0.3.17/debian/compat liboil-0.3.17/debian/compat
--- liboil-0.3.17/debian/compat
+++ liboil-0.3.17/debian/compat
@@ -1 +1 @@
-6
+9
