debian/changelog | 12 ++++++++++++ debian/control | 7 +++++-- debian/libxext-dev.install | 6 +++--- debian/libxext6-udeb.install | 2 +- debian/libxext6.install | 2 +- debian/rules | 2 ++ 6 files changed, 24 insertions(+), 7 deletions(-)
New commits: commit 76ed357e72c4c99379f034148ed28c2ca9f4e110 Author: Julien Cristau <[email protected]> Date: Sat Jun 11 15:47:39 2011 +0200 Upload to unstable diff --git a/debian/changelog b/debian/changelog index 918416c..58b31eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,6 @@ -libxext (2:1.3.0-2) UNRELEASED; urgency=low +libxext (2:1.3.0-2) unstable; urgency=low + + * Team upload. [ Steve Langasek ] * Build for multiarch. @@ -6,7 +8,7 @@ libxext (2:1.3.0-2) UNRELEASED; urgency=low [ Julien Cristau ] * Bump Standards-Version to 3.9.2. - -- Julien Cristau <[email protected]> Sat, 11 Jun 2011 15:44:48 +0200 + -- Julien Cristau <[email protected]> Sat, 11 Jun 2011 15:47:31 +0200 libxext (2:1.3.0-1) unstable; urgency=low commit e0ecdafd11d96cb2af4a899b45780cb6b12f7fbd Author: Julien Cristau <[email protected]> Date: Sat Jun 11 15:47:29 2011 +0200 Bump Standards-Version to 3.9.2. diff --git a/debian/changelog b/debian/changelog index 43de026..918416c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ libxext (2:1.3.0-2) UNRELEASED; urgency=low [ Steve Langasek ] * Build for multiarch. + [ Julien Cristau ] + * Bump Standards-Version to 3.9.2. + -- Julien Cristau <[email protected]> Sat, 11 Jun 2011 15:44:48 +0200 libxext (2:1.3.0-1) unstable; urgency=low diff --git a/debian/control b/debian/control index fe41424..8c0deb1 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends: xorg-sgml-doctools (>= 1:1.7), w3m, xsltproc, -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxext Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxext.git commit 19fc2067b4da1edfafd6a6bd309c3056b0d9024c Author: Julien Cristau <[email protected]> Date: Sat Jun 11 15:45:06 2011 +0200 Add changelog entry for multiarch diff --git a/debian/changelog b/debian/changelog index fca7ea3..43de026 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libxext (2:1.3.0-2) UNRELEASED; urgency=low + + [ Steve Langasek ] + * Build for multiarch. + + -- Julien Cristau <[email protected]> Sat, 11 Jun 2011 15:44:48 +0200 + libxext (2:1.3.0-1) unstable; urgency=low * New upstream release. commit 5281ab1a6e010057a014f8a8f18b25a49995ea0d Author: Steve Langasek <[email protected]> Date: Wed Mar 23 22:50:52 2011 -0700 build for multiarch diff --git a/debian/control b/debian/control index 40180c8..677181f 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian X Strike Force <[email protected]> Uploaders: Cyril Brulebois <[email protected]> Build-Depends: - debhelper (>= 5.0.0), + debhelper (>= 8.1.3), libx11-dev (>= 2:1.3.3-2), x11proto-core-dev (>= 7.0.13), x11proto-xext-dev (>= 7.0.99.2), @@ -24,6 +24,8 @@ Package: libxext6 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same Description: X11 miscellaneous extension library libXext provides an X Window System client interface to several extensions to the X protocol. @@ -69,6 +71,7 @@ Section: debug Architecture: any Priority: extra Depends: ${shlibs:Depends}, ${misc:Depends}, libxext6 (= ${binary:Version}) +Multi-Arch: same Description: X11 miscellaneous extensions library (debug package) libXext provides an X Window System client interface to several extensions to the X protocol. diff --git a/debian/libxext-dev.install b/debian/libxext-dev.install index d393f8f..2daba6e 100644 --- a/debian/libxext-dev.install +++ b/debian/libxext-dev.install @@ -1,7 +1,7 @@ usr/share/man/man3/* -usr/lib/libXext.a -usr/lib/libXext.so -usr/lib/pkgconfig/xext.pc +usr/lib/*/libXext.a +usr/lib/*/libXext.so +usr/lib/*/pkgconfig/xext.pc usr/include/X11/extensions/ usr/share/doc/libXext/*.html usr/share/doc/libxext-dev usr/share/doc/libXext/*.txt usr/share/doc/libxext-dev diff --git a/debian/libxext6-udeb.install b/debian/libxext6-udeb.install index 5c9aabf..f9bfa82 100644 --- a/debian/libxext6-udeb.install +++ b/debian/libxext6-udeb.install @@ -1 +1 @@ -usr/lib/libXext.so.6* +usr/lib/*/libXext.so.6* usr/lib diff --git a/debian/libxext6.install b/debian/libxext6.install index 5c9aabf..3915821 100644 --- a/debian/libxext6.install +++ b/debian/libxext6.install @@ -1 +1 @@ -usr/lib/libXext.so.6* +usr/lib/*/libXext.so.6* diff --git a/debian/rules b/debian/rules index d1ce2af..039c136 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) @@ -40,6 +41,7 @@ build-stamp: mkdir -p build cd build && \ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ + --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ --infodir=\$${prefix}/share/info $(confflags) \ --with-xmlto \ --without-fop \ -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
