From patchwork Mon Jan 2 15:18:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 6028 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 5768223F72 for ; Mon, 2 Jan 2012 15:19:03 +0000 (UTC) Received: from mail-ey0-f180.google.com (mail-ey0-f180.google.com [209.85.215.180]) by fiordland.canonical.com (Postfix) with ESMTP id 46D43A1853C for ; Mon, 2 Jan 2012 15:19:03 +0000 (UTC) Received: by eaac11 with SMTP id c11so14738174eaa.11 for ; Mon, 02 Jan 2012 07:19:03 -0800 (PST) Received: by 10.205.132.148 with SMTP id hu20mr8663729bkc.96.1325517542992; Mon, 02 Jan 2012 07:19:02 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.205.82.144 with SMTP id ac16cs315326bkc; Mon, 2 Jan 2012 07:19:02 -0800 (PST) Received: by 10.224.202.130 with SMTP id fe2mr2350123qab.16.1325517541008; Mon, 02 Jan 2012 07:19:01 -0800 (PST) Received: from afflict.kos.to (afflict.kos.to. [92.243.29.197]) by mx.google.com with ESMTPS id i18si17035814qcv.152.2012.01.02.07.19.00 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 02 Jan 2012 07:19:00 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of nchip@afflict.kos.to designates 92.243.29.197 as permitted sender) client-ip=92.243.29.197; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of nchip@afflict.kos.to designates 92.243.29.197 as permitted sender) smtp.mail=nchip@afflict.kos.to Received: by afflict.kos.to (Postfix, from userid 1000) id 6978626513; Mon, 2 Jan 2012 15:18:59 +0000 (UTC) Date: Mon, 2 Jan 2012 17:18:59 +0200 From: Riku Voipio To: submit@bugs.debian.org Subject: please add multi-arch support for libxfont Message-ID: <20120102151859.GA2253@afflict.kos.to> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Package: libxfont Version: 1:1.4.4-1 Severity: normal User: multiarch-devel@lists.alioth.debian.org Usertags: multiarch Tags: patch Hi, Another rather straightforward multiarch conversion. Riku >From 22386f6b4aef96c04bef653c878a2966b2fe64ea Mon Sep 17 00:00:00 2001 From: Riku Voipio 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 Uploaders: David Nusinow , Drew Parsons , Cyril Brulebois 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..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* 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