libxcomposite: Changes to 'debian-unstable'
debian/changelog | 14 ++++++++++++++
debian/control | 9 ++++++---
debian/libxcomposite-dev.install | 6 +++---
debian/libxcomposite1.install | 2 +-
debian/rules | 9 +++++++--
5 files changed, 31 insertions(+), 9 deletions(-)
New commits:
commit ed9998f5928d61aa2894da63e0378c0e6679093f
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 11 15:03:11 2011 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index aa830bd..515f1dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,6 @@
-libxcomposite (1:0.4.3-2) UNRELEASED; urgency=low
+libxcomposite (1:0.4.3-2) unstable; urgency=low
+
+ * Team upload.
[ Steve Langasek ]
* Build for multiarch.
@@ -8,7 +10,7 @@ libxcomposite (1:0.4.3-2) UNRELEASED; urgency=low
* Bump Standards-Version to 3.9.2.
* Add build-indep and build-arch d/rules targets.
- -- Julien Cristau <jcristau@debian.org> Sat, 11 Jun 2011 14:56:54 +0200
+ -- Julien Cristau <jcristau@debian.org> Sat, 11 Jun 2011 15:02:58 +0200
libxcomposite (1:0.4.3-1) unstable; urgency=low
commit b3587a2c7f5aabf89ac52698eea3413401d10597
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 11 15:02:56 2011 +0200
Add build-indep and build-arch d/rules targets.
diff --git a/debian/changelog b/debian/changelog
index 42fe7a4..aa830bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ libxcomposite (1:0.4.3-2) UNRELEASED; urgency=low
[ Julien Cristau ]
* Remove David Nusinow and Brice Goglin from Uploaders.
* Bump Standards-Version to 3.9.2.
+ * Add build-indep and build-arch d/rules targets.
-- Julien Cristau <jcristau@debian.org> Sat, 11 Jun 2011 14:56:54 +0200
diff --git a/debian/rules b/debian/rules
index 5ee514b..9d1e37b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,10 @@ else
endif
-build: build-stamp
+build: build-arch build-indep
+build-indep:
+build-arch: build-stamp
+
build-stamp:
dh_testdir
autoreconf -vfi
@@ -96,4 +99,4 @@ binary-indep: build install
# Nothing to do
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build-indep build-arch build clean binary-indep binary-arch binary install
commit 8ef24d75e741313a5a460f381454abf615430967
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 11 15:00:19 2011 +0200
Bump Standards-Version to 3.9.2.
diff --git a/debian/changelog b/debian/changelog
index 8af0a14..42fe7a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libxcomposite (1:0.4.3-2) UNRELEASED; urgency=low
[ Julien Cristau ]
* Remove David Nusinow and Brice Goglin from Uploaders.
+ * Bump Standards-Version to 3.9.2.
-- Julien Cristau <jcristau@debian.org> Sat, 11 Jun 2011 14:56:54 +0200
diff --git a/debian/control b/debian/control
index ecf9421..b3b3354 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
automake,
libtool,
xutils-dev (>= 1:7.5+4),
-Standards-Version: 3.9.0
+Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxcomposite
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxcomposite.git
commit c470a62a3350804cff407b2601d03fe2a0ce2f71
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 11 14:59:06 2011 +0200
Remove David Nusinow and Brice Goglin from Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 8e454cb..8af0a14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ libxcomposite (1:0.4.3-2) UNRELEASED; urgency=low
[ Steve Langasek ]
* Build for multiarch.
+ [ Julien Cristau ]
+ * Remove David Nusinow and Brice Goglin from Uploaders.
+
-- Julien Cristau <jcristau@debian.org> Sat, 11 Jun 2011 14:56:54 +0200
libxcomposite (1:0.4.3-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index b19e719..ecf9421 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libxcomposite
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>, Cyril Brulebois <kibi@debian.org>
+Uploaders: Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 8.1.2ubuntu2),
libx11-dev (>= 1:0.99.2),
commit 0a76d1ec06239e28e04cc1925b8787c630026936
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 11 14:58:33 2011 +0200
Add changelog entry for multiarch
diff --git a/debian/changelog b/debian/changelog
index 476bb21..8e454cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libxcomposite (1:0.4.3-2) UNRELEASED; urgency=low
+
+ [ Steve Langasek ]
+ * Build for multiarch.
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 11 Jun 2011 14:56:54 +0200
+
libxcomposite (1:0.4.3-1) unstable; urgency=low
* New upstream release.
commit 786ed6a05fd2104896c76b2d26923ed29e2ccd62
Author: Steve Langasek <steve.langasek@ubuntu.com>
Date: Tue Mar 22 21:39:52 2011 -0700
build for multiarch
diff --git a/debian/control b/debian/control
index edb3059..b19e719 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>, Brice Goglin <bgoglin@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
- debhelper (>= 5.0.0),
+ debhelper (>= 8.1.2ubuntu2),
libx11-dev (>= 1:0.99.2),
libxfixes-dev (>= 1:3.0.0-4),
x11proto-composite-dev (>= 1:0.4),
@@ -21,6 +21,8 @@ Package: libxcomposite1
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: X11 Composite extension library
libXcomposite provides an X Window System client interface to the Composite
extension to the X protocol.
@@ -39,6 +41,7 @@ Architecture: any
Section: debug
Priority: extra
Depends: ${shlibs:Depends}, ${misc:Depends}, libxcomposite1 (= ${binary:Version})
+Multi-Arch: same
Description: X11 Composite extension library (debug package)
libXcomposite provides an X Window System client interface to the Composite
extension to the X protocol.
diff --git a/debian/libxcomposite-dev.install b/debian/libxcomposite-dev.install
index 2ed0b17..ac3b7e6 100644
--- a/debian/libxcomposite-dev.install
+++ b/debian/libxcomposite-dev.install
@@ -1,5 +1,5 @@
usr/include/X11/*
-usr/lib/libXcomposite.a
-usr/lib/libXcomposite.so
-usr/lib/pkgconfig/xcomposite.pc
+usr/lib/*/libXcomposite.a
+usr/lib/*/libXcomposite.so
+usr/lib/*/pkgconfig/xcomposite.pc
usr/share/man/man3/*
diff --git a/debian/libxcomposite1.install b/debian/libxcomposite1.install
index f0ac83f..01783b9 100644
--- a/debian/libxcomposite1.install
+++ b/debian/libxcomposite1.install
@@ -1 +1 @@
-usr/lib/libXcomposite.so.1*
+usr/lib/*/libXcomposite.so.1*
diff --git a/debian/rules b/debian/rules
index 27db421..5ee514b 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) \
CFLAGS="$(CFLAGS)"
cd build && $(MAKE)
Reply to: