On Mon, Jan 02, 2012 at 04:27:53PM +0100, Cyril Brulebois wrote:
> Same bug as in #654251:
>
> > diff --git a/debian/libxfont1-udeb.install b/debian/libxfont1-udeb.install
> > index e73e376..02a72ba 100644
> > --- a/debian/libxfont1-udeb.install
> > +++ b/debian/libxfont1-udeb.install
> > @@ -1,2 +1,2 @@
> > -usr/lib/libXfont.so.1*
> > +usr/lib/*/libXfont.so.1*
Corrected patch applied. The alternative to the attached patch is add --libdir
only
to the main package, and not touch the udeb.install file. But that made
--fail-missing
unhappy as the development libraries in /usr/lib/ got installed nowhere.
Riku
>From 94d658851667df9c762d151360c3ce6d27907db1 Mon Sep 17 00:00:00 2001
From: Riku Voipio <riku.voi...@linaro.org>
Date: Mon, 2 Jan 2012 16:49:24 +0200
Subject: [PATCH] Convert to Multi-Arch
This patch converts libxfont to multiarch
---
debian/control | 5 ++++-
debian/libxfont-dev.install | 6 +++---
debian/libxfont1-udeb.install | 2 +-
debian/libxfont1.install | 2 +-
debian/rules | 2 ++
5 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/debian/control b/debian/control
index 4b5fd8e..4d01073 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusi...@debian.org>, Drew Parsons <dpars...@debian.org>, Cyril Brulebois <k...@debian.org>
Build-Depends:
- debhelper (>= 8),
+ debhelper (>= 8.1.3),
dh-autoreconf,
quilt,
pkg-config,
@@ -27,6 +27,8 @@ Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: xprint (<< 2:1.6.0-1)
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: X11 font rasterisation library
libXfont provides various services for X servers, most notably font
selection and rasterisation (through external libraries).
@@ -67,6 +69,7 @@ Package: libxfont-dev
Section: libdevel
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libxfont1 (= ${binary:Version}), libx11-dev, x11proto-core-dev, x11proto-fonts-dev, libfreetype6-dev, libfontenc-dev (>= 1:1.0.1-1)
+Multi-Arch: same
Description: X11 font rasterisation library (development headers)
libXfont provides various services for X servers, most notably font
selection and rasterisation (through external libraries).
diff --git a/debian/libxfont-dev.install b/debian/libxfont-dev.install
index edf16a3..75740c9 100644
--- a/debian/libxfont-dev.install
+++ b/debian/libxfont-dev.install
@@ -1,7 +1,7 @@
usr/include/X11/*
-usr/lib/libXfont.a
-usr/lib/libXfont.so
-usr/lib/pkgconfig/xfont.pc
+usr/lib/*/libXfont.a
+usr/lib/*/libXfont.so
+usr/lib/*/pkgconfig/xfont.pc
# Extra doc, under noinst_* in doc/Makefile.am:
../../build-main/doc/*.html usr/share/doc/libxfont-dev/
diff --git a/debian/libxfont1-udeb.install b/debian/libxfont1-udeb.install
index e73e376..9ba7aa1 100644
--- a/debian/libxfont1-udeb.install
+++ b/debian/libxfont1-udeb.install
@@ -1,2 +1,2 @@
-usr/lib/libXfont.so.1*
+usr/lib/*/libXfont.so.1* usr/lib/
diff --git a/debian/libxfont1.install b/debian/libxfont1.install
index e73e376..02a72ba 100644
--- a/debian/libxfont1.install
+++ b/debian/libxfont1.install
@@ -1,2 +1,2 @@
-usr/lib/libXfont.so.1*
+usr/lib/*/libXfont.so.1*
diff --git a/debian/rules b/debian/rules
index 11814cc..65116cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,7 @@ CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
CFLAGS += -Wall
CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
CONFFLAGS += \
--enable-fc \
@@ -15,6 +16,7 @@ CONFFLAGS += \
--enable-bdfformat \
--enable-devel-docs \
--without-fop \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
CFLAGS="$(CFLAGS)" \
CPPFLAGS="$(CPPFLAGS)" \
LDFLAGS="$(LDFLAGS)"
--
1.7.5.4
