diff mbox

please add multi-arch support for m4

Message ID 20110907092908.GA28842@afflict.kos.to
State Accepted
Headers show

Commit Message

Riku Voipio Sept. 7, 2011, 9:29 a.m. UTC 
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 mbox

Patch

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 <debian-x@lists.debian.org>
 Uploaders: Julien Danjou <acid@debian.org>,
            Arnaud Fontaine <arnau@debian.org>
-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: