From patchwork Tue Aug 23 10:51:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 3618 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 82CE423F41 for ; Tue, 23 Aug 2011 10:51:31 +0000 (UTC) Received: from mail-bw0-f52.google.com (mail-bw0-f52.google.com [209.85.214.52]) by fiordland.canonical.com (Postfix) with ESMTP id 6B166A1807D for ; Tue, 23 Aug 2011 10:51:31 +0000 (UTC) Received: by bkbzs2 with SMTP id zs2so6815591bkb.11 for ; Tue, 23 Aug 2011 03:51:31 -0700 (PDT) Received: by 10.204.13.81 with SMTP id b17mr1454869bka.278.1314096691044; Tue, 23 Aug 2011 03:51:31 -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.204.41.75 with SMTP id n11cs206405bke; Tue, 23 Aug 2011 03:51:30 -0700 (PDT) Received: by 10.224.188.71 with SMTP id cz7mr2197158qab.259.1314096689994; Tue, 23 Aug 2011 03:51:29 -0700 (PDT) Received: from afflict.kos.to (afflict.kos.to. [92.243.29.197]) by mx.google.com with ESMTPS id dw9si60643qab.12.2011.08.23.03.51.29 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 23 Aug 2011 03:51:29 -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 4A86C2669D; Tue, 23 Aug 2011 10:51:28 +0000 (UTC) Date: Tue, 23 Aug 2011 13:51:28 +0300 From: Riku Voipio To: submit@bugs.debian.org Subject: please add multi-arch support for gpm Message-ID: <20110823105128.GC15357@afflict.kos.to> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Package: gpm Version: 1.20.4-3.4 Severity: normal User: debian-dpkg@lists.debian.org Usertags: multiarch Tags: patch Hi, The attached patch converts gpm to multiarch paths and adds the relevant Multi-Arch: fields to debian/control. Since gpm is bottom dependency installed by default when installing toolchain, we need a early conversion of gpm to be able to take advantage of multiarch. Riku diff -urN orig/gpm-1.20.4//debian/control gpm-1.20.4//debian/control --- orig/gpm-1.20.4//debian/control 2011-08-23 11:19:32.000000000 +0300 +++ gpm-1.20.4//debian/control 2011-08-23 13:21:05.938530001 +0300 @@ -8,7 +7,7 @@ Homepage: http://unix.schottelius.org/gpm/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-gpm/ Vcs-Svn: svn://svn.debian.org/svn/pkg-gpm/trunk/ -Build-Depends: autoconf, quilt (>= 0.4), debhelper (>= 6.0.7), mawk | awk, +Build-Depends: autoconf, quilt (>= 0.4), debhelper (>= 8.1.3), mawk | awk, bison, texlive-base, texinfo, texi2html Package: gpm @@ -16,6 +15,7 @@ Section: misc Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, debianutils (>= 1.7), ucf (>= 0.28), lsb-base +Multi-Arch: foreign Conflicts: libgpmg1 Description: General Purpose Mouse interface This package provides a daemon that captures mouse events when the system @@ -30,6 +30,8 @@ Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same Conflicts: gpm (<< 1.20.3~pre3) Suggests: gpm Description: General Purpose Mouse - shared library @@ -42,6 +44,7 @@ Section: libdevel Architecture: any Depends: libgpm2 (= ${binary:Version}), libc6-dev | libc-dev, ${misc:Depends} +Multi-Arch: same Conflicts: libgpmg1-dev (<< 1.20.4) Replaces: libgpmg1-dev (<< 1.20.4) Provides: libgpmg1-dev diff -urN orig/gpm-1.20.4//debian/libgpm2.install gpm-1.20.4//debian/libgpm2.install --- orig/gpm-1.20.4//debian/libgpm2.install 2011-08-23 11:19:32.000000000 +0300 +++ gpm-1.20.4//debian/libgpm2.install 2011-08-23 12:32:40.504692001 +0300 @@ -1,2 +1 @@ -src/lib/libgpm.so.2.0.0 usr/lib diff -urN orig/gpm-1.20.4//debian/libgpm2.links gpm-1.20.4//debian/libgpm2.links --- orig/gpm-1.20.4//debian/libgpm2.links 2011-08-23 11:19:32.000000000 +0300 +++ gpm-1.20.4//debian/libgpm2.links 1970-01-01 02:00:00.000000000 +0200 @@ -1,2 +0,0 @@ -usr/lib/libgpm.so.2.0.0 usr/lib/libgpm.so.2 - diff -urN orig/gpm-1.20.4//debian/libgpm-dev.install gpm-1.20.4//debian/libgpm-dev.install --- orig/gpm-1.20.4//debian/libgpm-dev.install 2011-08-23 11:19:32.000000000 +0300 +++ gpm-1.20.4//debian/libgpm-dev.install 2011-08-23 12:32:44.524692001 +0300 @@ -1,2 +1 @@ src/headers/gpm.h usr/include/ -src/lib/libgpm.a usr/lib/ diff -urN orig/gpm-1.20.4//debian/libgpm-dev.links gpm-1.20.4//debian/libgpm-dev.links --- orig/gpm-1.20.4//debian/libgpm-dev.links 2011-08-23 11:19:32.000000000 +0300 +++ gpm-1.20.4//debian/libgpm-dev.links 1970-01-01 02:00:00.000000000 +0200 @@ -1,2 +0,0 @@ -usr/lib/libgpm.so.2 usr/lib/libgpm.so - diff -urN orig/gpm-1.20.4//debian/rules gpm-1.20.4//debian/rules --- orig/gpm-1.20.4//debian/rules 2011-08-23 11:19:32.000000000 +0300 +++ gpm-1.20.4//debian/rules 2011-08-23 13:31:34.218530001 +0300 @@ -17,6 +17,7 @@ export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) confflags += --build $(DEB_HOST_GNU_TYPE) @@ -68,8 +69,9 @@ dh_testroot dh_clean -k - dh_installdirs - dh_install + dh_installdirs -pgpm + dh_install -pgpm + $(INSTALL_PROGRAM) debian/gpm.apm \ debian/gpm/etc/apm/event.d/gpm @@ -78,6 +80,14 @@ $(INSTALL_PROGRAM) contrib/scripts/microtouch-setup \ debian/gpm/usr/sbin/gpm-microtouch-setup + mkdir -p debian/libgpm2/usr/lib/$(DEB_HOST_MULTIARCH) + $(INSTALL_PROGRAM) src/lib/libgpm.so.2.0.0 debian/libgpm2/usr/lib/$(DEB_HOST_MULTIARCH) + ln -s libgpm.so.2.0.0 debian/libgpm2/usr/lib/$(DEB_HOST_MULTIARCH)/libgpm.so.2 + + mkdir -p debian/libgpm-dev/usr/lib/$(DEB_HOST_MULTIARCH) + ln -s libgpm.so.2 debian/libgpm-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libgpm.so + $(INSTALL_PROGRAM) src/lib/libgpm.a debian/libgpm-dev/usr/lib/$(DEB_HOST_MULTIARCH) + dh_installinfo dh_installman dh_installdocs