debian/changelog | 12 ++++++++++++
debian/compat | 2 +-
debian/control | 7 +++++--
debian/libxfixes-dev.install | 6 +++---
debian/libxfixes3-udeb.install | 2 +-
debian/libxfixes3.install | 2 +-
6 files changed, 23 insertions(+), 8 deletions(-)
New commits:
commit e381eac44b55ebca80e165be2f842ec17d75c6c4
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Jun 11 16:01:28 2011 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 4c4edce..14f231b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,6 @@
-libxfixes (1:5.0-3) UNRELEASED; urgency=low
+libxfixes (1:5.0-3) unstable; urgency=low
+
+ * Team upload.
[ Steve Langasek ]
* Build for multiarch.
@@ -6,7 +8,7 @@ libxfixes (1:5.0-3) UNRELEASED; urgency=low
[ Julien Cristau ]
* Bump Standards-Version to 3.9.2.
- -- Julien Cristau <jcris...@debian.org> Sat, 11 Jun 2011 15:59:02 +0200
+ -- Julien Cristau <jcris...@debian.org> Sat, 11 Jun 2011 16:01:20 +0200
libxfixes (1:5.0-2) unstable; urgency=low
commit 5ab0efb502fcf0760e9cdccb213a073cb5601c9b
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Jun 11 16:01:06 2011 +0200
Bump Standards-Version to 3.9.2.
diff --git a/debian/changelog b/debian/changelog
index 1622220..4c4edce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ libxfixes (1:5.0-3) UNRELEASED; urgency=low
[ Steve Langasek ]
* Build for multiarch.
+ [ Julien Cristau ]
+ * Bump Standards-Version to 3.9.2.
+
-- Julien Cristau <jcris...@debian.org> Sat, 11 Jun 2011 15:59:02 +0200
libxfixes (1:5.0-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 578f7d1..a507388 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
pkg-config,
quilt,
xutils-dev (>= 1:7.5+4),
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxfixes
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxfixes.git
commit 1c550915b07dea4a287cc8a961e878ffe6725e65
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Jun 11 16:00:51 2011 +0200
Add changelog entry for multiarch
diff --git a/debian/changelog b/debian/changelog
index 890d803..1622220 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libxfixes (1:5.0-3) UNRELEASED; urgency=low
+
+ [ Steve Langasek ]
+ * Build for multiarch.
+
+ -- Julien Cristau <jcris...@debian.org> Sat, 11 Jun 2011 15:59:02 +0200
+
libxfixes (1:5.0-2) unstable; urgency=low
[ Julien Cristau ]
commit 2ad243862b2a6b54c06df1c6971f266462e97ce2
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Wed May 25 14:50:26 2011 +0300
Bump compat level to 9
to use the multiarch library path on configure
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
commit 45a5d628cc48ce57af3cfa67cf14d4dbde2a4eb4
Author: Steve Langasek <steve.langa...@ubuntu.com>
Date: Wed Mar 23 22:58:24 2011 -0700
build for multiarch
diff --git a/debian/control b/debian/control
index 7bbb57b..64559ef 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 <dnusi...@debian.org>, Drew Parsons
<dpars...@debian.org>, Cyril Brulebois <k...@debian.org>
Build-Depends:
- debhelper (>= 5),
+ debhelper (>= 8.1.3),
libx11-dev (>= 2:1.3.3-2),
x11proto-fixes-dev (>= 4.0),
pkg-config,
@@ -20,6 +20,8 @@ Package: libxfixes3
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: X11 miscellaneous 'fixes' extension library
libXfixes provides an X Window System client interface to the 'XFIXES'
extension to the X protocol.
@@ -45,6 +47,7 @@ Section: debug
Architecture: any
Priority: extra
Depends: ${shlibs:Depends}, ${misc:Depends}, libxfixes3 (= ${binary:Version})
+Multi-Arch: same
Description: X11 miscellaneous 'fixes' extension library (debug package)
libXfixes provides an X Window System client interface to the 'XFIXES'
extension to the X protocol.
diff --git a/debian/libxfixes-dev.install b/debian/libxfixes-dev.install
index 10f16fc..27c523f 100644
--- a/debian/libxfixes-dev.install
+++ b/debian/libxfixes-dev.install
@@ -1,4 +1,4 @@
usr/include/X11/*
-usr/lib/libXfixes.a
-usr/lib/libXfixes.so
-usr/lib/pkgconfig/xfixes.pc
+usr/lib/*/libXfixes.a
+usr/lib/*/libXfixes.so
+usr/lib/*/pkgconfig/xfixes.pc
diff --git a/debian/libxfixes3-udeb.install b/debian/libxfixes3-udeb.install
index 7d2fef1..ab058dc 100644
--- a/debian/libxfixes3-udeb.install
+++ b/debian/libxfixes3-udeb.install
@@ -1 +1 @@
-usr/lib/libXfixes.so.3*
+usr/lib/*/libXfixes.so.3* usr/lib
diff --git a/debian/libxfixes3.install b/debian/libxfixes3.install
index 7d2fef1..5647aad 100644
--- a/debian/libxfixes3.install
+++ b/debian/libxfixes3.install
@@ -1 +1 @@
-usr/lib/libXfixes.so.3*
+usr/lib/*/libXfixes.so.3*
diff --git a/debian/rules b/debian/rules
index adc0f4f..67c6680 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: $(STAMP_DIR)/patch
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)
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qvoqn-0006c0...@vasks.debian.org
