debian/changelog | 6 ++++++
debian/control | 5 ++++-
debian/libxi-dev.install | 6 +++---
debian/libxi6-udeb.install | 2 +-
debian/libxi6.install | 2 +-
debian/rules | 2 ++
6 files changed, 17 insertions(+), 6 deletions(-)
New commits:
commit 4becd4a66beca9c391ff6facc1a720c70f546148
Author: Steve Langasek <steve.langa...@ubuntu.com>
Date: Wed Mar 23 00:38:04 2011 -0700
FFe LP: #733501: build for multiarch.
diff --git a/debian/changelog b/debian/changelog
index 0c36b24..d26e303 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxi (2:1.4.1-1ubuntu2) natty; urgency=low
+
+ * FFe LP: #733501: build for multiarch.
+
+ -- Steve Langasek <steve.langa...@ubuntu.com> Wed, 23 Mar 2011 00:37:35 -0700
+
libxi (2:1.4.1-1ubuntu1) natty; urgency=low
* Add xi 2.1 support
diff --git a/debian/control b/debian/control
index 79591f3..c315f59 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Ubuntu X-SWAT <ubunt...@lists.ubuntu.com>
XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusi...@debian.org>, Drew Parsons
<dpars...@debian.org>, Cyril Brulebois <k...@debian.org>
Build-Depends:
- debhelper (>= 8.1.3),
+ debhelper (>= 8.1.2ubuntu2),
x11proto-core-dev (>= 7.0.13),
x11proto-xext-dev (>= 7.0.3),
x11proto-input-dev (>= 2.0.1-1ubuntu1),
diff --git a/debian/libxi6-udeb.install b/debian/libxi6-udeb.install
index 32abb0e..8ec79b8 100644
--- a/debian/libxi6-udeb.install
+++ b/debian/libxi6-udeb.install
@@ -1 +1 @@
-usr/lib/libXi.so.6*
+usr/lib/*/libXi.so.6* usr/lib
commit 6579a0f7ddc3223242214432505ee1f64ed7f493
Author: Steve Langasek <steve.langa...@ubuntu.com>
Date: Wed Mar 23 00:24:38 2011 -0700
build for multiarch
diff --git a/debian/control b/debian/control
index dc0887e..79591f3 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Ubuntu X-SWAT <ubunt...@lists.ubuntu.com>
XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusi...@debian.org>, Drew Parsons
<dpars...@debian.org>, Cyril Brulebois <k...@debian.org>
Build-Depends:
- debhelper (>= 5.0.0),
+ debhelper (>= 8.1.3),
x11proto-core-dev (>= 7.0.13),
x11proto-xext-dev (>= 7.0.3),
x11proto-input-dev (>= 2.0.1-1ubuntu1),
@@ -30,6 +30,8 @@ Package: libxi6
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: multiarch-support
+Multi-Arch: same
Description: X11 Input extension library
libXi provides an X Window System client interface to the XINPUT
extension to the X protocol.
@@ -57,6 +59,7 @@ Section: debug
Architecture: any
Priority: extra
Depends: ${shlibs:Depends}, ${misc:Depends}, libxi6 (= ${binary:Version})
+Multi-Arch: same
Description: X11 Input extension library (debug package)
libXi provides an X Window System client interface to the XINPUT
extension to the X protocol.
diff --git a/debian/libxi-dev.install b/debian/libxi-dev.install
index 1ddc544..dd8b3e3 100644
--- a/debian/libxi-dev.install
+++ b/debian/libxi-dev.install
@@ -1,6 +1,6 @@
-usr/lib/libXi.a
-usr/lib/libXi.so
-usr/lib/pkgconfig/xi.pc
+usr/lib/*/libXi.a
+usr/lib/*/libXi.so
+usr/lib/*/pkgconfig/xi.pc
usr/include/X11/extensions/
usr/share/doc/libXi/specs/*.html usr/share/doc/libxi-dev
usr/share/doc/libXi/specs/*.txt usr/share/doc/libxi-dev
diff --git a/debian/libxi6.install b/debian/libxi6.install
index 32abb0e..afccc4c 100644
--- a/debian/libxi6.install
+++ b/debian/libxi6.install
@@ -1 +1 @@
-usr/lib/libXi.so.6*
+usr/lib/*/libXi.so.6*
diff --git a/debian/rules b/debian/rules
index 7956d93..75fb414 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,7 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
endif
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
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)
@@ -42,6 +43,7 @@ build/config.status: configure
--infodir=\$${prefix}/share/info $(confflags) \
--with-xmlto \
--without-fop \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
CFLAGS="$(CFLAGS)"
--
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/e1q2jmx-0005po...@alioth.debian.org
