debian/changelog | 6 ++++++
debian/control | 10 +++++++++-
debian/libx11-6-udeb.install | 2 +-
debian/libx11-6.install | 2 +-
debian/libx11-dev.install | 6 +++---
debian/libx11-xcb-dev.install | 6 +++---
debian/libx11-xcb1.install | 2 +-
debian/rules | 3 +++
8 files changed, 27 insertions(+), 10 deletions(-)
New commits:
commit 505d319aaa0cbb9205c41417bdb37d118fc29534
Author: Steve Langasek <steve.langa...@ubuntu.com>
Date: Sat Apr 9 01:43:05 2011 -0700
FFe LP: #733501: build for multiarch, patch dropped in previous merge.
diff --git a/debian/changelog b/debian/changelog
index ed0d959..2495e71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libx11 (2:1.4.2-1ubuntu3) natty; urgency=low
+
+ * FFe LP: #733501: build for multiarch, patch dropped in previous merge.
+
+ -- Steve Langasek <steve.langa...@ubuntu.com> Sat, 09 Apr 2011 01:42:23 -0700
+
libx11 (2:1.4.2-1ubuntu2) natty; urgency=low
* Fix the debian/patch/series file (FTBFS).
diff --git a/debian/control b/debian/control
index c033b93..267c7bf 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ XSBC-Original-Maintainer: Debian X Strike Force
<debian-x@lists.debian.org>
Uploaders: Cyril Brulebois <k...@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
- dpkg-dev (>= 1.15.3),
+ dpkg-dev (>= 1.16.0~ubuntu4),
pkg-config,
xtrans-dev,
x11proto-core-dev (>= 7.0.13),
@@ -34,6 +34,8 @@ Depends:
${shlibs:Depends},
${misc:Depends},
libx11-data,
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: X11 client-side library
This package provides a client interface to the X Window System, otherwise
known as 'Xlib'. It provides a complete API for the basic functions of the
@@ -78,6 +80,8 @@ Depends:
${shlibs:Depends},
${misc:Depends},
libx11-6 (= ${binary:Version}),
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: X11 client-side library (debug package)
This package provides a client interface to the X Window System, otherwise
known as 'Xlib'. It provides a complete API for the basic functions of the
@@ -126,6 +130,8 @@ Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends},
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: Xlib/XCB interface library
libX11-xcb provides functions needed by clients which take advantage of
Xlib/XCB to mix calls to both Xlib and XCB over the same X connection.
@@ -147,6 +153,8 @@ Depends:
${shlibs:Depends},
${misc:Depends},
libx11-xcb1 (= ${binary:Version}),
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: Xlib/XCB interface library (debug package)
libX11-xcb provides functions needed by clients which take advantage of
Xlib/XCB to mix calls to both Xlib and XCB over the same X connection.
diff --git a/debian/libx11-6-udeb.install b/debian/libx11-6-udeb.install
index 1625015..e148c78 100644
--- a/debian/libx11-6-udeb.install
+++ b/debian/libx11-6-udeb.install
@@ -1,5 +1,5 @@
# from libx11-6:
-usr/lib/libX11.so.6*
+usr/lib/*/libX11.so.6* usr/lib
# from libx11-data:
usr/share/X11/XErrorDB
diff --git a/debian/libx11-6.install b/debian/libx11-6.install
index 480164b..1bd7fa2 100644
--- a/debian/libx11-6.install
+++ b/debian/libx11-6.install
@@ -1 +1 @@
-usr/lib/libX11.so.6*
+usr/lib/*/libX11.so.6*
diff --git a/debian/libx11-dev.install b/debian/libx11-dev.install
index 5d38303..94e03cd 100644
--- a/debian/libx11-dev.install
+++ b/debian/libx11-dev.install
@@ -1,6 +1,6 @@
usr/include/X11/*
usr/share/man/man3/*
-usr/lib/libX11.a
-usr/lib/libX11.so
-usr/lib/pkgconfig/x11.pc
+usr/lib/*/libX11.a
+usr/lib/*/libX11.so
+usr/lib/*/pkgconfig/x11.pc
usr/share/doc/libX11/* usr/share/doc/libx11-dev
diff --git a/debian/libx11-xcb-dev.install b/debian/libx11-xcb-dev.install
index 4afc18e..641a49d 100644
--- a/debian/libx11-xcb-dev.install
+++ b/debian/libx11-xcb-dev.install
@@ -1,6 +1,6 @@
usr/include/X11/Xlib-xcb.h
usr/share/man/man3/XGetXCBConnection.3
usr/share/man/man3/XSetEventQueueOwner.3
-usr/lib/libX11-xcb.a
-usr/lib/libX11-xcb.so
-usr/lib/pkgconfig/x11-xcb.pc
+usr/lib/*/libX11-xcb.a
+usr/lib/*/libX11-xcb.so
+usr/lib/*/pkgconfig/x11-xcb.pc
diff --git a/debian/libx11-xcb1.install b/debian/libx11-xcb1.install
index 04e114f..635eda6 100644
--- a/debian/libx11-xcb1.install
+++ b/debian/libx11-xcb1.install
@@ -1 +1 @@
-usr/lib/libX11-xcb.so.1*
+usr/lib/*/libX11-xcb.so.1*
diff --git a/debian/rules b/debian/rules
index 5a6221d..a5a003a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,6 +36,8 @@ endif
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
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)
+
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
confflags += --build=$(DEB_HOST_GNU_TYPE)
else
@@ -56,6 +58,7 @@ build-stamp: configure $(STAMP_DIR)/genscripts
--prefix=/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
--enable-specs \
--with-xmlto \
--without-fop \
--
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/e1q8tle-00023u...@alioth.debian.org
