libxi: Changes to 'debian-unstable'
debian/changelog | 12 ++++++++++++
debian/control | 7 +++++--
debian/libxi-dev.install | 6 +++---
debian/libxi6-udeb.install | 2 +-
debian/libxi6.install | 2 +-
debian/rules | 2 ++
6 files changed, 24 insertions(+), 7 deletions(-)
New commits:
commit 3dc1390e099d60a1c09e69ccda9c2b019d178080
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 11 16:14:45 2011 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 6fcee0c..64511cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,6 @@
-libxi (2:1.4.3-2) UNRELEASED; urgency=low
+libxi (2:1.4.3-2) unstable; urgency=low
+
+ * Team upload.
[ Steve Langasek ]
* Build for multiarch.
@@ -6,7 +8,7 @@ libxi (2:1.4.3-2) UNRELEASED; urgency=low
[ Julien Cristau ]
* Remove David Nusinow from Uploaders.
- -- Julien Cristau <jcristau@debian.org> Sat, 11 Jun 2011 16:10:55 +0200
+ -- Julien Cristau <jcristau@debian.org> Sat, 11 Jun 2011 16:14:32 +0200
libxi (2:1.4.3-1) unstable; urgency=low
commit 730f0432cf1041633244307a31739a84849951f4
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 11 16:14:21 2011 +0200
Remove David Nusinow from Uploaders.
diff --git a/debian/changelog b/debian/changelog
index eddab28..6fcee0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ libxi (2:1.4.3-2) UNRELEASED; urgency=low
[ Steve Langasek ]
* Build for multiarch.
+ [ Julien Cristau ]
+ * Remove David Nusinow from Uploaders.
+
-- Julien Cristau <jcristau@debian.org> Sat, 11 Jun 2011 16:10:55 +0200
libxi (2:1.4.3-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 188441f..7c4656c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libxi
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Drew Parsons <dparsons@debian.org>, Cyril Brulebois <kibi@debian.org>
+Uploaders: Drew Parsons <dparsons@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 8.1.3),
x11proto-core-dev (>= 7.0.13),
commit 51500559a99e4bf009a55c021e05e3cc75831418
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 11 16:11:17 2011 +0200
Add changelog entry for multiarch
diff --git a/debian/changelog b/debian/changelog
index fc50ec8..eddab28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libxi (2:1.4.3-2) UNRELEASED; urgency=low
+
+ [ Steve Langasek ]
+ * Build for multiarch.
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 11 Jun 2011 16:10:55 +0200
+
libxi (2:1.4.3-1) unstable; urgency=low
* New upstream release.
commit f694397c0bfca9fcd6f5b1a53756d3bc97c7e78f
Author: Steve Langasek <steve.langasek@ubuntu.com>
Date: Wed Mar 23 01:26:41 2011 -0700
fix up install path for udeb under multiarch
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 f2ffc8ec2ef6896f0e741dc486d2ae079c1effa0
Author: Steve Langasek <steve.langasek@ubuntu.com>
Date: Wed Mar 23 00:24:38 2011 -0700
build for multiarch
diff --git a/debian/control b/debian/control
index 594a4e0..cb515ca 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Drew Parsons <dparsons@debian.org>, Cyril Brulebois <kibi@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 (>= 1.9.99.902),
@@ -29,6 +29,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.
@@ -56,6 +58,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)"
Reply to: