debian/changelog | 13 +++++++++++++ debian/control | 9 ++++++--- debian/libxau-dev.install | 6 +++--- debian/libxau6-udeb.install | 2 +- debian/libxau6.install | 2 +- debian/rules | 2 ++ 6 files changed, 26 insertions(+), 8 deletions(-)
New commits: commit 4391c7eb37f2158e9b272e14f28816fb2a7f0f27 Author: Julien Cristau <[email protected]> Date: Wed Jun 8 19:59:35 2011 +0200 Upload to unstable diff --git a/debian/changelog b/debian/changelog index 7de8bfe..9d7fc35 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,6 @@ -libxau (1:1.0.6-2) UNRELEASED; urgency=low +libxau (1:1.0.6-2) unstable; urgency=low + + * Team upload. [ Steve Langasek ] * Build for multiarch. @@ -7,7 +9,7 @@ libxau (1:1.0.6-2) UNRELEASED; urgency=low * Remove David Nusinow from Uploaders. * Bump Standards-Version to 3.9.2. - -- Julien Cristau <[email protected]> Wed, 08 Jun 2011 19:52:34 +0200 + -- Julien Cristau <[email protected]> Wed, 08 Jun 2011 19:59:21 +0200 libxau (1:1.0.6-1) unstable; urgency=low commit a9013c9b47384df3bed8f8139a382fe66880339f Author: Julien Cristau <[email protected]> Date: Wed Jun 8 19:59:14 2011 +0200 Bump Standards-Version to 3.9.2. diff --git a/debian/changelog b/debian/changelog index b3b4163..7de8bfe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ libxau (1:1.0.6-2) UNRELEASED; urgency=low [ Julien Cristau ] * Remove David Nusinow from Uploaders. + * Bump Standards-Version to 3.9.2. -- Julien Cristau <[email protected]> Wed, 08 Jun 2011 19:52:34 +0200 diff --git a/debian/control b/debian/control index a99bfd2..b0c0186 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: automake, libtool, xutils-dev (>= 1:7.5+1), -Standards-Version: 3.9.0 +Standards-Version: 3.9.2 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxau Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxau.git commit 07db8d361c34d653f689f0dcb8328127ed036759 Author: Julien Cristau <[email protected]> Date: Wed Jun 8 19:55:32 2011 +0200 Remove David Nusinow from Uploaders. diff --git a/debian/changelog b/debian/changelog index ec1283f..b3b4163 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ libxau (1:1.0.6-2) UNRELEASED; urgency=low [ Steve Langasek ] * Build for multiarch. + [ Julien Cristau ] + * Remove David Nusinow from Uploaders. + -- Julien Cristau <[email protected]> Wed, 08 Jun 2011 19:52:34 +0200 libxau (1:1.0.6-1) unstable; urgency=low diff --git a/debian/control b/debian/control index c036f68..a99bfd2 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: libxau Section: x11 Priority: optional Maintainer: Debian X Strike Force <[email protected]> -Uploaders: David Nusinow <[email protected]>, Cyril Brulebois <[email protected]> +Uploaders: Cyril Brulebois <[email protected]> Build-Depends: debhelper (>= 8.1.3), pkg-config, commit 15a796c2d04455a95bacc3cbf1149b6aada9c212 Author: Julien Cristau <[email protected]> Date: Wed Jun 8 19:55:10 2011 +0200 Add changelog entry for multiarch changes diff --git a/debian/changelog b/debian/changelog index 003a782..ec1283f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libxau (1:1.0.6-2) UNRELEASED; urgency=low + + [ Steve Langasek ] + * Build for multiarch. + + -- Julien Cristau <[email protected]> Wed, 08 Jun 2011 19:52:34 +0200 + libxau (1:1.0.6-1) unstable; urgency=low * New upstream release commit 2c097c7d235ddaecaf1a5d00570cd622c836674e Author: Steve Langasek <[email protected]> Date: Tue Mar 22 02:13:41 2011 -0700 build for multiarch diff --git a/debian/control b/debian/control index 7086d38..c036f68 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian X Strike Force <[email protected]> Uploaders: David Nusinow <[email protected]>, Cyril Brulebois <[email protected]> Build-Depends: - debhelper (>= 5.0.0), + debhelper (>= 8.1.3), pkg-config, x11proto-core-dev, quilt, @@ -22,6 +22,8 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same Description: X11 authorisation library This package provides the main interface to the X11 authorisation handling, which controls authorisation for X connections, both client-side and @@ -50,6 +52,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libxau6 (= ${binary:Version}), +Multi-Arch: same Description: X11 authorisation library (debug package) This package provides the main interface to the X11 authorisation handling, which controls authorisation for X connections, both client-side and diff --git a/debian/libxau-dev.install b/debian/libxau-dev.install index 661394d..8b2e696 100644 --- a/debian/libxau-dev.install +++ b/debian/libxau-dev.install @@ -1,5 +1,5 @@ usr/include/X11/* usr/share/man/man3/* -usr/lib/libXau.a -usr/lib/libXau.so -usr/lib/pkgconfig/xau.pc +usr/lib/*/libXau.a +usr/lib/*/libXau.so +usr/lib/*/pkgconfig/xau.pc diff --git a/debian/libxau6-udeb.install b/debian/libxau6-udeb.install index 6398da5..e1160fe 100644 --- a/debian/libxau6-udeb.install +++ b/debian/libxau6-udeb.install @@ -1 +1 @@ -usr/lib/libXau.so.6* +usr/lib/*/libXau.so.6* usr/lib diff --git a/debian/libxau6.install b/debian/libxau6.install index 6398da5..b428eca 100644 --- a/debian/libxau6.install +++ b/debian/libxau6.install @@ -1 +1 @@ -usr/lib/libXau.so.6* +usr/lib/*/libXau.so.6* diff --git a/debian/rules b/debian/rules index d3a6350..daf708c 100755 --- a/debian/rules +++ b/debian/rules @@ -26,6 +26,7 @@ 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 @@ -42,6 +43,7 @@ build/config.status: configure --prefix=/usr \ --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ + --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ $(confflags) \ CFLAGS="$(CFLAGS)" -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
