Bug#635251: [libpciaccess0] support multiarch same
On Sun, 24 Jul 2011 15:13:06 +0200
Steve Langasek <vorlon@debian.org> wrote:
> On Sun, Jul 24, 2011 at 01:50:22PM +0200, gregory hainaut wrote:
> > diff -u libpciaccess-0.12.1/debian/control
> > libpciaccess-0.12.1/debian/control ---
> > libpciaccess-0.12.1/debian/control +++
> > libpciaccess-0.12.1/debian/control @@ -4,7 +4,7 @@
> > Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
> > Uploaders: David Nusinow <dnusinow@debian.org>, Cyril Brulebois
> > <kibi@debian.org> Build-Depends:
> > - debhelper (>= 5),
> > + debhelper (>= 8.0.3),
> > libtool,
> > automake,
> > zlib1g-dev,
>
> Should be 8.1.3, not 8.0.3.
>
> Cheers,
Thanks very much for the review.
Attach patch v2: fix debhelper dependency typo.
Best regards,
Gregory
diff -u libpciaccess-0.12.1/debian/rules libpciaccess-0.12.1/debian/rules
--- libpciaccess-0.12.1/debian/rules
+++ libpciaccess-0.12.1/debian/rules
@@ -13,6 +13,7 @@
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 @@
--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)"
diff -u libpciaccess-0.12.1/debian/control libpciaccess-0.12.1/debian/control
--- libpciaccess-0.12.1/debian/control
+++ libpciaccess-0.12.1/debian/control
@@ -4,7 +4,7 @@
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
- debhelper (>= 5),
+ debhelper (>= 8.1.3),
libtool,
automake,
zlib1g-dev,
@@ -17,7 +17,9 @@
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
diff -u libpciaccess-0.12.1/debian/libpciaccess-dev.install libpciaccess-0.12.1/debian/libpciaccess-dev.install
--- libpciaccess-0.12.1/debian/libpciaccess-dev.install
+++ libpciaccess-0.12.1/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 -u libpciaccess-0.12.1/debian/libpciaccess0-udeb.install libpciaccess-0.12.1/debian/libpciaccess0-udeb.install
--- libpciaccess-0.12.1/debian/libpciaccess0-udeb.install
+++ libpciaccess-0.12.1/debian/libpciaccess0-udeb.install
@@ -1 +1 @@
-usr/lib/libpciaccess.so.0*
+usr/lib/*/libpciaccess.so.0* /usr/lib
diff -u libpciaccess-0.12.1/debian/libpciaccess0.install libpciaccess-0.12.1/debian/libpciaccess0.install
--- libpciaccess-0.12.1/debian/libpciaccess0.install
+++ libpciaccess-0.12.1/debian/libpciaccess0.install
@@ -1 +1 @@
-usr/lib/libpciaccess.so.0*
+usr/lib/*/libpciaccess.so.0*
Reply to: