And, really include the modified patch..
Riku
diff --git a/debian/control b/debian/control index 0ac632b..10b5960 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian X Strike Force <debia...@lists.debian.org> Uploaders: David Nusinow <dnusi...@debian.org>, Cyril Brulebois <k...@debian.org> Build-Depends: - debhelper (>= 5), + debhelper (>= 8.1.3), libtool, automake, zlib1g-dev, @@ -17,7 +17,9 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libpciaccess.git Package: libpciaccess0 Section: libs Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same Suggests: pciutils Description: Generic PCI access library for X Provides functionality for X to access the PCI bus and devices @@ -36,6 +38,7 @@ Package: libpciaccess-dev Section: libdevel Architecture: any Depends: libpciaccess0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same Description: Generic PCI access library for X - development files Provides functionality for X to access the PCI bus and devices in a platform-independant way. diff --git a/debian/libpciaccess-dev.install b/debian/libpciaccess-dev.install index 4797855..304f643 100644 --- a/debian/libpciaccess-dev.install +++ b/debian/libpciaccess-dev.install @@ -1,4 +1,4 @@ -usr/lib/pkgconfig -usr/lib/lib*.a -usr/lib/lib*.so +usr/lib/*/pkgconfig +usr/lib/*/lib*.a +usr/lib/*/lib*.so usr/include diff --git a/debian/libpciaccess0-udeb.install b/debian/libpciaccess0-udeb.install index 413fe77..723e1b6 100644 --- a/debian/libpciaccess0-udeb.install +++ b/debian/libpciaccess0-udeb.install @@ -1 +1 @@ -usr/lib/libpciaccess.so.0* +usr/lib/*/libpciaccess.so.0* /usr/lib diff --git a/debian/libpciaccess0.install b/debian/libpciaccess0.install index 413fe77..782ff72 100644 --- a/debian/libpciaccess0.install +++ b/debian/libpciaccess0.install @@ -1 +1 @@ -usr/lib/libpciaccess.so.0* +usr/lib/*/libpciaccess.so.0* diff --git a/debian/rules b/debian/rules index 9d64d5a..1339c6f 100755 --- a/debian/rules +++ b/debian/rules @@ -13,6 +13,7 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) MAKEFLAGS += -j$(NUMJOBS) endif +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) @@ -33,6 +34,7 @@ build/config.status: configure --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ --with-pciids-path=\$${prefix}/share/misc \ + --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ --with-zlib \ $(confflags) \ CFLAGS="$(CFLAGS)"
