From patchwork Wed Sep 7 09:29:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 3956 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 4078823EF7 for ; Wed, 7 Sep 2011 09:29:17 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id A23FCA18355 for ; Wed, 7 Sep 2011 09:29:11 +0000 (UTC) Received: by fxd18 with SMTP id 18so536984fxd.11 for ; Wed, 07 Sep 2011 02:29:11 -0700 (PDT) Received: by 10.223.76.201 with SMTP id d9mr1790312fak.119.1315387751403; Wed, 07 Sep 2011 02:29:11 -0700 (PDT) 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.152.11.8 with SMTP id m8cs132716lab; Wed, 7 Sep 2011 02:29:11 -0700 (PDT) Received: by 10.224.186.137 with SMTP id cs9mr4825079qab.71.1315387750187; Wed, 07 Sep 2011 02:29:10 -0700 (PDT) Received: from afflict.kos.to (afflict.kos.to. [92.243.29.197]) by mx.google.com with ESMTPS id dw9si10487897qab.32.2011.09.07.02.29.09 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 07 Sep 2011 02:29:10 -0700 (PDT) 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 1A59A266A4; Wed, 7 Sep 2011 09:29:08 +0000 (UTC) Date: Wed, 7 Sep 2011 12:29:08 +0300 From: Riku Voipio To: submit@bugs.debian.org Subject: please add multi-arch support for m4 Message-ID: <20110907092908.GA28842@afflict.kos.to> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Package: m4 Version: 1.4.16-2 Severity: normal User: debian-dpkg@lists.debian.org Usertags: multiarch Tags: patch Hi, The attached patch adds Multi-Arch: foreign field to m4, to annotate the fact that a m4 of foreign architecture can satisfy (build-)depends of m4. Riku diff -urN orig/xcb-util-0.3.8//debian/control xcb-util-0.3.8//debian/control --- orig/xcb-util-0.3.8//debian/control 2011-05-06 14:16:44.000000000 +0300 +++ xcb-util-0.3.8//debian/control 2011-09-05 16:18:27.325006001 +0300 @@ -4,8 +4,8 @@ Maintainer: Debian X Strike Force Uploaders: Julien Danjou , Arnaud Fontaine -Build-Depends: cdbs, - debhelper (>= 5), +Build-Depends: cdbs ( >= 0.4.93), + debhelper (>= 8.1.3), libxcb1-dev (>= 1.6), gperf, pkg-config, @@ -24,7 +24,9 @@ Package: libxcb-util0 Section: libs Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same Description: utility libraries for X C Binding -- atom, aux and event This package contains the library files needed to run software using libxcb-util. @@ -51,6 +53,7 @@ Depends: libxcb-util0 (= ${binary:Version}), libxcb1-dev, ${misc:Depends} +Multi-Arch: same Description: utility libraries for X C Binding -- atom, aux and event This package contains the header and library files needed to build software using libxcb-util. diff -urN orig/xcb-util-0.3.8//debian/libxcb-util0-dev.install xcb-util-0.3.8//debian/libxcb-util0-dev.install --- orig/xcb-util-0.3.8//debian/libxcb-util0-dev.install 2011-05-06 14:16:44.000000000 +0300 +++ xcb-util-0.3.8//debian/libxcb-util0-dev.install 2011-09-05 16:02:36.805006002 +0300 @@ -1,4 +1,4 @@ usr/include/xcb/*.h -usr/lib/libxcb-util.a -usr/lib/libxcb-util.so -usr/lib/pkgconfig/*.pc +usr/lib/*/libxcb-util.a +usr/lib/*/libxcb-util.so +usr/lib/*/pkgconfig/*.pc diff -urN orig/xcb-util-0.3.8//debian/libxcb-util0.install xcb-util-0.3.8//debian/libxcb-util0.install --- orig/xcb-util-0.3.8//debian/libxcb-util0.install 2011-05-06 14:16:44.000000000 +0300 +++ xcb-util-0.3.8//debian/libxcb-util0.install 2011-09-05 16:02:41.515006002 +0300 @@ -1 +1 @@ -usr/lib/libxcb-util.so.* +usr/lib/*/libxcb-util.so.* diff -urN orig/xcb-util-0.3.8//debian/rules xcb-util-0.3.8//debian/rules --- orig/xcb-util-0.3.8//debian/rules 2011-05-06 14:16:44.000000000 +0300 +++ xcb-util-0.3.8//debian/rules 2011-09-05 16:34:25.525006002 +0300 @@ -9,6 +9,8 @@ ORIG_MAJOR=$(shell git describe upstream | cut -d- -f1) ORIG_GIT=$(shell git describe upstream | cut -d- -f2) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) post-patches:: configure-stamp configure-stamp: