debian/changelog | 12 ++++++++++-- debian/control | 9 ++++++--- debian/libice-dev.install | 6 +++--- debian/libice6.install | 2 +- debian/rules | 2 ++ 5 files changed, 22 insertions(+), 9 deletions(-)
New commits: commit f4b050bf093057cc0be0065c5c200d4b141dd774 Author: Julien Cristau <[email protected]> Date: Thu Jun 9 20:47:08 2011 +0200 Upload to unstable diff --git a/debian/changelog b/debian/changelog index 76341a7..d8b0530 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,6 @@ -libice (2:1.0.7-2) UNRELEASED; urgency=low +libice (2:1.0.7-2) unstable; urgency=low + + * Team upload. [ Julien Cristau ] * Drop Pre-Depends on x11-common, only needed for upgrades from the @@ -9,7 +11,7 @@ libice (2:1.0.7-2) UNRELEASED; urgency=low [ Steve Langasek ] * Build for multiarch. - -- Julien Cristau <[email protected]> Thu, 28 Apr 2011 14:03:20 +0200 + -- Julien Cristau <[email protected]> Thu, 09 Jun 2011 20:46:55 +0200 libice (2:1.0.7-1) unstable; urgency=low commit e20e6d00f304810564ad469317de7f43c05fae8e Author: Julien Cristau <[email protected]> Date: Thu Jun 9 20:39:18 2011 +0200 Bump Standards-Version to 3.9.2. diff --git a/debian/changelog b/debian/changelog index a5775d5..76341a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ libice (2:1.0.7-2) UNRELEASED; urgency=low * Drop Pre-Depends on x11-common, only needed for upgrades from the monolith. * Remove David Nusinow from Uploaders. + * Bump Standards-Version to 3.9.2. [ Steve Langasek ] * Build for multiarch. diff --git a/debian/control b/debian/control index 50a9976..4be2336 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-Depends: xutils-dev (>= 1:7.5+5), # doc: xmlto, xorg-sgml-doctools (>= 1:1.5), w3m, -Standards-Version: 3.8.3 +Standards-Version: 3.9.2 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libice Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libice.git commit e47ef9e3688abe041fd87305c513a9003eabec6a Author: Julien Cristau <[email protected]> Date: Thu Jun 9 20:38:58 2011 +0200 Remove David Nusinow from Uploaders. diff --git a/debian/changelog b/debian/changelog index 23d85ae..a5775d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ libice (2:1.0.7-2) UNRELEASED; urgency=low [ Julien Cristau ] * Drop Pre-Depends on x11-common, only needed for upgrades from the monolith. + * Remove David Nusinow from Uploaders. [ Steve Langasek ] * Build for multiarch. diff --git a/debian/control b/debian/control index 861a042..50a9976 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: libice Section: x11 Priority: optional Maintainer: Debian X Strike Force <[email protected]> -Uploaders: David Nusinow <[email protected]>, Drew Parsons <[email protected]>, Cyril Brulebois <[email protected]> +Uploaders: Drew Parsons <[email protected]>, Cyril Brulebois <[email protected]> Build-Depends: debhelper (>= 8.1.3), quilt, commit 73085a98d11f61535332a30deb53439533fbe883 Author: Julien Cristau <[email protected]> Date: Thu Jun 9 20:37:41 2011 +0200 Changelog entry diff --git a/debian/changelog b/debian/changelog index 9883d54..23d85ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ libice (2:1.0.7-2) UNRELEASED; urgency=low + [ Julien Cristau ] * Drop Pre-Depends on x11-common, only needed for upgrades from the monolith. + [ Steve Langasek ] + * Build for multiarch. + -- Julien Cristau <[email protected]> Thu, 28 Apr 2011 14:03:20 +0200 libice (2:1.0.7-1) unstable; urgency=low commit 3bd9eec9e05269da0fec18ff254ed7dae9503015 Author: Steve Langasek <[email protected]> Date: Wed Mar 23 22:17:32 2011 -0700 build for multiarch diff --git a/debian/control b/debian/control index c32faac..1f2f272 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]>, Drew Parsons <[email protected]>, Cyril Brulebois <[email protected]> Build-Depends: - debhelper (>= 5.0.0), + debhelper (>= 8.1.3), quilt, pkg-config, x11proto-core-dev, @@ -22,6 +22,8 @@ Package: libice6 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same Description: X11 Inter-Client Exchange library This package provides the main interface to the X11 Inter-Client Exchange library, which allows for communication of data between X clients. @@ -37,6 +39,7 @@ Architecture: any Section: debug Priority: extra Depends: ${shlibs:Depends}, ${misc:Depends}, libice6 (= ${binary:Version}) +Multi-Arch: same Description: X11 Inter-Client Exchange library (debug package) This package provides the main interface to the X11 Inter-Client Exchange library, which allows for communication of data between X clients. diff --git a/debian/libice-dev.install b/debian/libice-dev.install index 75a4362..82b271b 100644 --- a/debian/libice-dev.install +++ b/debian/libice-dev.install @@ -1,7 +1,7 @@ usr/include/X11/* -usr/lib/libICE.a -usr/lib/libICE.so -usr/lib/pkgconfig/ice.pc +usr/lib/*/libICE.a +usr/lib/*/libICE.so +usr/lib/*/pkgconfig/ice.pc usr/share/doc/libICE/*.html usr/share/doc/libice-dev/ usr/share/doc/libICE/*.css usr/share/doc/libice-dev/ usr/share/doc/libICE/*.txt usr/share/doc/libice-dev/ diff --git a/debian/libice6.install b/debian/libice6.install index 5f5d14d..62c87c7 100644 --- a/debian/libice6.install +++ b/debian/libice6.install @@ -1 +1 @@ -usr/lib/libICE.so.6* +usr/lib/*/libICE.so.6* diff --git a/debian/rules b/debian/rules index 3c8b0cb..3afc86f 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) @@ -43,6 +44,7 @@ build-stamp: configure test -d build || mkdir build cd build && \ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ + --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ --infodir=\$${prefix}/share/info $(confflags) \ CFLAGS="$(CFLAGS)" cd build && $(MAKE) -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
