From patchwork Mon Jan 2 15:14:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 6027 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 97E5E23E10 for ; Mon, 2 Jan 2012 15:14:16 +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 7F3D6A1853C for ; Mon, 2 Jan 2012 15:14:16 +0000 (UTC) Received: by eaac11 with SMTP id c11so14733927eaa.11 for ; Mon, 02 Jan 2012 07:14:16 -0800 (PST) Received: by 10.205.120.11 with SMTP id fw11mr5650269bkc.89.1325517256230; Mon, 02 Jan 2012 07:14:16 -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 ac16cs315241bkc; Mon, 2 Jan 2012 07:14:16 -0800 (PST) Received: by 10.224.116.211 with SMTP id n19mr16585150qaq.67.1325517254119; Mon, 02 Jan 2012 07:14:14 -0800 (PST) Received: from afflict.kos.to (afflict.kos.to. [92.243.29.197]) by mx.google.com with ESMTPS id b10si30897072qao.33.2012.01.02.07.14.13 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 02 Jan 2012 07:14:13 -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 DA7D126513; Mon, 2 Jan 2012 15:14:11 +0000 (UTC) Date: Mon, 2 Jan 2012 17:14:11 +0200 From: Riku Voipio To: submit@bugs.debian.org Subject: Please convert libfontenc to multiarch Message-ID: <20120102151411.GA2193@afflict.kos.to> MIME-Version: 1.0 Content-Disposition: inline X-Debbugs-CC: vorlon@debian.org X-message-flag: Warning: message not sent with a DRM-Certified client User-Agent: Mutt/1.5.18 (2008-05-17) Package: libfontenc Version: 1:1.1.0-1 User: multiarch-devel@lists.alioth.debian.org Usertags: multiarch Tags: patch Hi, the attached patch does an straightrorward multiarch conversion of libfontenc1 Riku >From 317780117638f896e40333d7bac5d37c4d1ba539 Mon Sep 17 00:00:00 2001 From: Riku Voipio Date: Mon, 2 Jan 2012 16:50:43 +0200 Subject: [PATCH] libfontenc: multiarch conversion The following patch converts libfontench to multi-arch --- debian/changelog | 6 ++++++ debian/control | 5 ++++- debian/libfontenc-dev.install | 6 +++--- debian/libfontenc1-udeb.install | 2 +- debian/libfontenc1.install | 2 +- debian/rules | 2 ++ 6 files changed, 17 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 830dce6..52a263a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libfontenc (1:1.1.0-1.1) unstable; urgency=low + + * Multi-Arch conversion + + -- Riku Voipio Mon, 02 Jan 2012 16:28:19 +0200 + libfontenc (1:1.1.0-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 2149c3c..b7274d1 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian X Strike Force Uploaders: David Nusinow , Cyril Brulebois Build-Depends: - debhelper (>= 5.0.0), + debhelper (>= 8.1.3), x11proto-core-dev (>= 6.8.99.15+cvs.20050722), zlib1g-dev, pkg-config, @@ -20,6 +20,8 @@ Package: libfontenc1 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same Description: X11 font encoding library libfontenc is a library which helps font libraries portably determine and deal with different encodings of fonts. @@ -60,6 +62,7 @@ Package: libfontenc-dev Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libfontenc1 (= ${binary:Version}), zlib1g-dev +Multi-Arch: same Description: X11 font encoding library (development headers) libfontenc is a library which helps font libraries portably determine and deal with different encodings of fonts. diff --git a/debian/libfontenc-dev.install b/debian/libfontenc-dev.install index fd2e598..9929f91 100644 --- a/debian/libfontenc-dev.install +++ b/debian/libfontenc-dev.install @@ -1,4 +1,4 @@ usr/include/X11/* -usr/lib/libfontenc.a -usr/lib/libfontenc.so -usr/lib/pkgconfig/fontenc.pc +usr/lib/*/libfontenc.a +usr/lib/*/libfontenc.so +usr/lib/*/pkgconfig/fontenc.pc diff --git a/debian/libfontenc1-udeb.install b/debian/libfontenc1-udeb.install index c3876f6..16b37f9 100644 --- a/debian/libfontenc1-udeb.install +++ b/debian/libfontenc1-udeb.install @@ -1 +1 @@ -usr/lib/libfontenc.so.1* +usr/lib/*/libfontenc.so.1* diff --git a/debian/libfontenc1.install b/debian/libfontenc1.install index c3876f6..16b37f9 100644 --- a/debian/libfontenc1.install +++ b/debian/libfontenc1.install @@ -1 +1 @@ -usr/lib/libfontenc.so.1* +usr/lib/*/libfontenc.so.1* diff --git a/debian/rules b/debian/rules index 8c867eb..7526477 100755 --- a/debian/rules +++ b/debian/rules @@ -23,6 +23,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) @@ -40,6 +41,7 @@ build-stamp: mkdir -p build cd build && \ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ + --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ --infodir=\$${prefix}/share/info $(confflags) \ --with-encodingsdir=\$${datadir}/fonts/X11/encodings \ CFLAGS="$(CFLAGS)" -- 1.7.5.4