From patchwork Thu Aug 18 14:27:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 3506 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 9038823F22 for ; Thu, 18 Aug 2011 14:27:27 +0000 (UTC) Received: from mail-ew0-f52.google.com (mail-ew0-f52.google.com [209.85.215.52]) by fiordland.canonical.com (Postfix) with ESMTP id 83702A18146 for ; Thu, 18 Aug 2011 14:27:27 +0000 (UTC) Received: by ewy28 with SMTP id 28so1076014ewy.11 for ; Thu, 18 Aug 2011 07:27:27 -0700 (PDT) Received: by 10.213.14.67 with SMTP id f3mr1732014eba.56.1313677645858; Thu, 18 Aug 2011 07:27:25 -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.213.102.5 with SMTP id e5cs75950ebo; Thu, 18 Aug 2011 07:27:25 -0700 (PDT) Received: by 10.224.189.15 with SMTP id dc15mr689154qab.297.1313677644821; Thu, 18 Aug 2011 07:27:24 -0700 (PDT) Received: from afflict.kos.to (afflict.kos.to. [92.243.29.197]) by mx.google.com with ESMTPS id dy1si2888673qab.57.2011.08.18.07.27.23 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 18 Aug 2011 07:27:24 -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 C891D266A1; Thu, 18 Aug 2011 14:27:22 +0000 (UTC) Date: Thu, 18 Aug 2011 17:27:22 +0300 From: Riku Voipio To: submit@bugs.debian.org Subject: please add multi-arch support for libmagic1 Message-ID: <20110818142722.GA26255@afflict.kos.to> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Package: libmagic1 Version: 5.04-5 Severity: wishlist User: debian-dpkg@lists.debian.org Usertags: multiarch Tags: patch Hi, file and libmagic1 are one of the bottom dependencies in debian, and thus need early multiarch conversion. Any reverse dependencies of libmagic1 cant be (usefully) multiarch until libmagic1 is converted. The attached patch converts the version of file in git repository to multiarch paths and adds the relevant Multi-Arch: fields to debian/control. For more information, see: http://wiki.debian.org/Multiarch/Implementation Riku diff --git a/debian/control b/debian/control index 76bfd02..742e86d 100644 --- a/debian/control +++ b/debian/control @@ -5,8 +5,8 @@ Maintainer: Daniel Baumann Uploaders: Daniel Baumann , Judit Foglszinger Build-Depends: - debhelper (>= 7.4.3~), autotools-dev, python, python-all-dev, python-all-dbg, - python-support, quilt (>= 0.46-7), zlib1g-dev + debhelper (>= 8.1.3), autotools-dev, python, python-all-dev, python-all-dbg, + python-support, quilt (>= 0.46-7), zlib1g-dev, dpkg-dev (>= 1.16) Standards-Version: 3.9.0 Homepage: http://www.darwinsys.com/file/ Vcs-Browser: http://git.debian-maintainers.org/?p=daniel/file.git @@ -18,6 +18,7 @@ Section: utils Priority: standard Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, libmagic1 (= ${binary:Version}) +Multi-Arch: foreign Description: Determines file type using "magic" numbers File tests each argument in an attempt to classify it. There are three sets of tests, performed in this order: filesystem tests, magic number tests, and @@ -29,6 +30,8 @@ Section: libs Priority: standard Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Conflicts: file (<< 5.08-1) Suggests: file Description: File type determination library using "magic" numbers @@ -40,6 +43,7 @@ Section: libdevel Priority: optional Architecture: any Depends: ${misc:Depends}, libmagic1 (= ${binary:Version}) +Multi-Arch: same Suggests: file Description: File type determination library using "magic" numbers (development) This library can be used to classify files according to magic number tests. It diff --git a/debian/libmagic-dev.install b/debian/libmagic-dev.install index b2b06b3..8a0f33f 100644 --- a/debian/libmagic-dev.install +++ b/debian/libmagic-dev.install @@ -1,4 +1,4 @@ /usr/include -/usr/lib/*.a -/usr/lib/*.so +/usr/lib/*/*.a +/usr/lib/*/*.so /usr/share/man/man3 diff --git a/debian/libmagic1.install b/debian/libmagic1.install index 59fda7c..dd56ae3 100644 --- a/debian/libmagic1.install +++ b/debian/libmagic1.install @@ -1,4 +1,4 @@ /etc -/usr/lib/*.so.* +/usr/lib/*/*.so.* /usr/share/file /usr/share/man/man5 diff --git a/debian/rules b/debian/rules index e080767..5e1fc8d 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,7 @@ include /usr/share/quilt/quilt.make DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) CROSS= --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) CC=$(DEB_HOST_GNU_TYPE)-gcc LD=$(DEB_HOST_GNU_TYPE)-ld @@ -39,7 +40,7 @@ ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub endif - ./configure $(CROSS) --prefix=/usr --datadir=\$${prefix}/share --mandir=\$${prefix}/share/man --enable-fsect-man5 CFLAGS="$(CFLAGS)" + ./configure $(CROSS) --prefix=/usr --datadir=\$${prefix}/share --mandir=\$${prefix}/share/man --enable-fsect-man5 CFLAGS="$(CFLAGS)" --libdir=/\$${prefix}/lib/$(DEB_HOST_MULTIARCH) build: build-stamp build-stamp: config.status