debian/changelog | 4 ++++
debian/control | 7 +++++--
debian/libxcb-util0-dev.install | 6 +++---
debian/libxcb-util0.install | 2 +-
debian/rules | 2 ++
5 files changed, 15 insertions(+), 6 deletions(-)
New commits:
commit 317651922039b9b734d74ddd3678d50f1cd01c21
Author: Tom Ellis <trel...@ubuntu.com>
Date: Wed Feb 8 14:13:21 2012 +0200
Convert to multi-arch
diff --git a/debian/changelog b/debian/changelog
index 208f6a0..85b9ceb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
xcb-util (0.3.8-1) unstable; urgency=low
+ [ Arnaud Fontaine ]
* New upstream release.
+ xcb-util has been split up into several modules.
+ Build-Depends on libxcb1-dev >= 1.6. Closes: #544865.
@@ -8,6 +9,9 @@ xcb-util (0.3.8-1) unstable; urgency=low
+ Now maintain as part of pkg-xorg team.
* Switch to "3.0 (quilt)" source format.
+ [ Tom Ellis ]
+ * Convert to multi-arch. (LP: #925388)
+
-- Arnaud Fontaine <ar...@debian.org> Fri, 06 May 2011 21:44:09 +0900
xcb-util (0.3.6-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index d4997e4..9babb31 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: extra
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Julien Danjou <a...@debian.org>,
Arnaud Fontaine <ar...@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 @@ Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/lib/xcb-util.git
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 @@ Architecture: any
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 --git a/debian/libxcb-util0-dev.install b/debian/libxcb-util0-dev.install
index 489c554..7d0ad47 100644
--- a/debian/libxcb-util0-dev.install
+++ b/debian/libxcb-util0-dev.install
@@ -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 --git a/debian/libxcb-util0.install b/debian/libxcb-util0.install
index 7223d2c..bdc40ab 100644
--- a/debian/libxcb-util0.install
+++ b/debian/libxcb-util0.install
@@ -1 +1 @@
-usr/lib/libxcb-util.so.*
+usr/lib/*/libxcb-util.so.*
diff --git a/debian/rules b/debian/rules
index 8938b7d..7f1acee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,8 @@ DEB_DH_MAKESHLIBS_ARGS=-V
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:
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1rv6pa-0004rr...@vasks.debian.org
