From patchwork Mon Aug 22 13:20:03 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 3602 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 7829123F41 for ; Mon, 22 Aug 2011 13:20:07 +0000 (UTC) Received: from mail-yw0-f52.google.com (mail-yw0-f52.google.com [209.85.213.52]) by fiordland.canonical.com (Postfix) with ESMTP id 1B5DBA180B8 for ; Mon, 22 Aug 2011 13:20:07 +0000 (UTC) Received: by ywo7 with SMTP id 7so5050669ywo.11 for ; Mon, 22 Aug 2011 06:20:06 -0700 (PDT) Received: by 10.150.170.13 with SMTP id s13mr2337520ybe.48.1314019206514; Mon, 22 Aug 2011 06:20:06 -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.150.157.17 with SMTP id f17cs196464ybe; Mon, 22 Aug 2011 06:20:05 -0700 (PDT) Received: by 10.224.209.200 with SMTP id gh8mr1377841qab.365.1314019205091; Mon, 22 Aug 2011 06:20:05 -0700 (PDT) Received: from afflict.kos.to (afflict.kos.to. [92.243.29.197]) by mx.google.com with ESMTPS id fp9si10637165qab.114.2011.08.22.06.20.04 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 22 Aug 2011 06:20:04 -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 425842669D; Mon, 22 Aug 2011 13:20:03 +0000 (UTC) Date: Mon, 22 Aug 2011 16:20:03 +0300 From: Riku Voipio To: submit@bugs.debian.org Subject: please add multi-arch support for readline6 Message-ID: <20110822132003.GA10979@afflict.kos.to> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Package: readline6 Version: 6.2-2 Severity: wishlist User: debian-dpkg@lists.debian.org Usertags: multiarch Tags: patch Hi, The attached patch converts libreadline6 to multiarch paths and adds the relevant Multi-Arch: fields to debian/control. Riku diff -urN old/readline6-6.2//debian/control readline6-6.2//debian/control --- old/readline6-6.2//debian/control 2011-04-23 15:51:29.000000000 +0300 +++ readline6-6.2//debian/control 2011-08-22 15:36:05.192285001 +0300 @@ -3,7 +3,7 @@ Priority: important Maintainer: Matthias Klose Standards-Version: 3.9.2 -Build-Depends: debhelper (>= 5), lsb-release, +Build-Depends: debhelper (>= 8.1.3), lsb-release, libncurses5-dev (>= 5.6), lib32ncurses5-dev [amd64 ppc64], lib64ncurses5-dev [i386 powerpc sparc s390], mawk | awk, texinfo, autotools-dev, @@ -12,6 +12,8 @@ Package: libreadline6 Architecture: any Depends: readline-common, ${shlibs:Depends}, ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same Section: libs Priority: important Description: GNU readline and history libraries, run-time libraries @@ -54,6 +56,7 @@ Architecture: any Depends: libreadline6-dev (= ${binary:Version}), ${misc:Depends} Conflicts: libreadline-gplv2-dev +Multi-Arch: same Section: libdevel Priority: optional Description: GNU readline and history libraries, development files @@ -71,6 +74,7 @@ Section: libdevel Priority: optional Depends: libreadline6 (= ${binary:Version}), libncurses5-dev, dpkg (>= 1.15.4) | install-info, ${misc:Depends} +Multi-Arch: same Conflicts: libreadline5-dev, libreadline-gplv2-dev Description: GNU readline and history libraries, development files The GNU readline library aids in the consistency of user interface diff -urN old/readline6-6.2//debian/rules readline6-6.2//debian/rules --- old/readline6-6.2//debian/rules 2010-11-22 11:46:23.000000000 +0200 +++ readline6-6.2//debian/rules 2011-08-22 15:44:12.502285001 +0300 @@ -9,6 +9,8 @@ DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) 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=$(DEB_HOST_GNU_TYPE)-gcc else @@ -109,7 +111,8 @@ cd $(builddir) && \ CC=$(CC) $(srcdir)/configure \ --with-curses --prefix=/usr\ - --host=$(DEB_HOST_GNU_TYPE) + --host=$(DEB_HOST_GNU_TYPE) \ + --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) ifneq ($(build32),) rm -rf $(builddir32) @@ -211,9 +214,9 @@ : # move $(p_rl) dh_installdirs -p$(p_rl) \ etc \ - lib \ + lib/$(DEB_HOST_MULTIARCH) \ usr/share/doc - cp -a $(d)/usr/lib/lib{history,readline}.so.* $(d_rl)/lib/ + cp -a $(d)/usr/lib/$(DEB_HOST_MULTIARCH)/lib{history,readline}.so.* $(d_rl)/lib/$(DEB_HOST_MULTIARCH)/ # cp -a $(d)/usr/lib/lib{history,readline}.so.$(libversion) $(d_rl)/lib/ # ln -s libhistory.so.$(libversion) \ # $(d_rl)/lib/libhistory.so.$(soversion) @@ -238,7 +241,7 @@ dh_installdirs -p$(p_rlg) \ usr/lib/debug \ usr/share/doc - mv $(d)/usr/lib/lib{history,readline}.so.$(libversion) \ + mv $(d)/usr/lib/$(DEB_HOST_MULTIARCH)/lib{history,readline}.so.$(libversion) \ $(d_rlg)/usr/lib/debug/. ln -s libhistory.so.$(libversion) \ $(d_rlg)/usr/lib/debug/libhistory.so.$(soversion) @@ -247,12 +250,12 @@ : # move $(p_rld) dh_installdirs -p$(p_rld) \ - usr/lib \ + usr/lib/$(DEB_HOST_MULTIARCH)/ \ usr/share/doc \ usr/share/info - ln -s /lib/libhistory.so.$(soversion) $(d_rld)/usr/lib/libhistory.so - ln -s /lib/libreadline.so.$(soversion) $(d_rld)/usr/lib/libreadline.so - mv $(d)/usr/lib/lib{history,readline}.a $(d_rld)/usr/lib/. + ln -s /lib/libhistory.so.$(soversion) $(d_rld)/usr/lib/$(DEB_HOST_MULTIARCH)/libhistory.so + ln -s /lib/libreadline.so.$(soversion) $(d_rld)/usr/lib/$(DEB_HOST_MULTIARCH)/libreadline.so + mv $(d)/usr/lib/$(DEB_HOST_MULTIARCH)/lib{history,readline}.a $(d_rld)/usr/lib/$(DEB_HOST_MULTIARCH)/. mv $(d)/usr/include $(d_rld)/usr/. mv $(d)/usr/share/info/{readline.info,history.info} \ $(d_rld)/usr/share/info/.