libx11: Changes to 'ubuntu'
debian/changelog | 23 +++++++++++++++++++++++
debian/control | 6 ++----
debian/rules | 1 +
3 files changed, 26 insertions(+), 4 deletions(-)
New commits:
commit 0a62f6a566168db507caa36b0ff32c95d2e566a7
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Tue Jun 14 12:05:43 2011 +0300
Update the changelog for upload
and add an entry that was mistakenly dropped during merge.
diff --git a/debian/changelog b/debian/changelog
index a90b9c4..675ff22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libx11 (2:1.4.3-2ubuntu1) oneiric; urgency=low
+
+ * Merge from Debian unstable, remaining changes:
+ - Add Latin locale.
+ - Add Klingon locale.
+ - Add 102_double_arrows_Compose.patch: compose keys for double arrows
+ (LP: 680143)
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 14 Jun 2011 10:16:56 +0300
+
libx11 (2:1.4.3-2) unstable; urgency=low
* Team upload.
@@ -11,6 +21,16 @@ libx11 (2:1.4.3-2) unstable; urgency=low
-- Julien Cristau <jcristau@debian.org> Sat, 11 Jun 2011 14:06:01 +0200
+libx11 (2:1.4.3-1ubuntu1) oneiric; urgency=low
+
+ * Merge from Debian unstable, remaining changes:
+ - Add Latin locale.
+ - Add Klingon locale.
+ - Add 102_double_arrows_Compose.patch: compose keys for double arrows
+ - build for multiarch.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com> Sun, 22 May 2011 09:15:13 -0700
+
libx11 (2:1.4.3-1) unstable; urgency=low
* New upstream release:
commit a52e9d1917fe40afa031c7e563452d2cf9b83836
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 11 13:52:38 2011 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index ea75777..b1acda4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,6 @@
-libx11 (2:1.4.3-2) UNRELEASED; urgency=low
+libx11 (2:1.4.3-2) unstable; urgency=low
+
+ * Team upload.
[ Steve Langasek ]
* Build for multiarch.
@@ -7,7 +9,7 @@ libx11 (2:1.4.3-2) UNRELEASED; urgency=low
* Bump Standards-Version to 3.9.2.
* Properly clean up libtool m4 files.
- -- Julien Cristau <jcristau@debian.org> Tue, 07 Jun 2011 15:58:38 +0200
+ -- Julien Cristau <jcristau@debian.org> Sat, 11 Jun 2011 14:06:01 +0200
libx11 (2:1.4.3-1) unstable; urgency=low
commit b7f648ba582526195ca0b14b0545dadfce80ef92
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 11 14:05:48 2011 +0200
Properly clean up libtool m4 files.
diff --git a/debian/changelog b/debian/changelog
index 135c98a..ea75777 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libx11 (2:1.4.3-2) UNRELEASED; urgency=low
[ Julien Cristau ]
* Bump Standards-Version to 3.9.2.
+ * Properly clean up libtool m4 files.
-- Julien Cristau <jcristau@debian.org> Tue, 07 Jun 2011 15:58:38 +0200
diff --git a/debian/rules b/debian/rules
index a5a003a..18c069f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,6 +78,7 @@ clean: xsfclean
rm -rf autom4te.cache */autom4te.cache
rm -rf build
rm -f aclocal.m4 compile config.guess config.sub configure
+ rm -f m4/lt*.m4 m4/libtool.m4
rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
rm -f src/config.h.in
find -name Makefile.in -delete
commit 8df8485f625be83140f93417341e237382706b18
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 11 13:52:16 2011 +0200
Bump Standards-Version to 3.9.2.
diff --git a/debian/changelog b/debian/changelog
index 623df34..135c98a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ libx11 (2:1.4.3-2) UNRELEASED; urgency=low
[ Steve Langasek ]
* Build for multiarch.
+ [ Julien Cristau ]
+ * Bump Standards-Version to 3.9.2.
+
-- Julien Cristau <jcristau@debian.org> Tue, 07 Jun 2011 15:58:38 +0200
libx11 (2:1.4.3-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 2f334e8..dc43b8b 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Build-Depends:
xmlto,
xorg-sgml-doctools (>= 1:1.5),
w3m,
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libx11
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libx11.git
commit 14635b418f88211ffa97caa78e6ecc90f94c0e12
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jun 7 15:58:53 2011 +0200
Add changelog entry
diff --git a/debian/changelog b/debian/changelog
index 8415cb7..623df34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libx11 (2:1.4.3-2) UNRELEASED; urgency=low
+
+ [ Steve Langasek ]
+ * Build for multiarch.
+
+ -- Julien Cristau <jcristau@debian.org> Tue, 07 Jun 2011 15:58:38 +0200
+
libx11 (2:1.4.3-1) unstable; urgency=low
* New upstream release:
commit bbadca777d5dd10d5f638c61662f6bd1e8c7d6ef
Author: Steve Langasek <steve.langasek@ubuntu.com>
Date: Mon Mar 21 23:35:44 2011 -0700
install udeb contents to /usr/lib only, not to the multiarch path
diff --git a/debian/libx11-6-udeb.install b/debian/libx11-6-udeb.install
index f85cbb1..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
commit 9daeb18c9ffa71023e3a2249126b54e1ece434fd
Author: Steve Langasek <steve.langasek@ubuntu.com>
Date: Mon Mar 21 23:34:50 2011 -0700
bump dpkg-dev multiarch b-d; add missing Pre-Depends:
diff --git a/debian/control b/debian/control
index fde8113..67e4cd9 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
- dpkg-dev (>= 1.15.8.10ubuntu1+multiarch.1),
+ dpkg-dev (>= 1.16.0),
pkg-config,
xtrans-dev,
x11proto-core-dev (>= 7.0.13),
@@ -33,6 +33,7 @@ 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
@@ -127,6 +128,7 @@ 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
commit 8a3ac024dc9bd0fc3d3500974551b9234ed8ab3a
Author: Steve Langasek <steve.langasek@canonical.com>
Date: Mon Feb 21 20:37:32 2011 -0800
Build for multiarch.
diff --git a/debian/control b/debian/control
index b433eda..fde8113 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
- dpkg-dev (>= 1.15.3),
+ dpkg-dev (>= 1.15.8.10ubuntu1+multiarch.1),
pkg-config,
xtrans-dev,
x11proto-core-dev (>= 7.0.13),
@@ -33,6 +33,7 @@ Depends:
${shlibs:Depends},
${misc:Depends},
libx11-data,
+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
@@ -77,6 +78,7 @@ Depends:
${shlibs:Depends},
${misc:Depends},
libx11-6 (= ${binary:Version}),
+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
@@ -125,6 +127,7 @@ Architecture: any
Depends:
${shlibs:Depends},
${misc: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.
@@ -146,6 +149,7 @@ Depends:
${shlibs:Depends},
${misc:Depends},
libx11-xcb1 (= ${binary:Version}),
+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..f85cbb1 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*
# 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 \
Reply to: