libdrm: Changes to 'ubuntu'
debian/changelog | 6 ++++++
debian/control | 17 ++++++++++++++++-
debian/libdrm-dev.install | 6 +++---
debian/libdrm-intel1.install | 1 -
debian/libdrm-intel1.install.in | 1 +
debian/libdrm-nouveau1a.install | 1 -
debian/libdrm-nouveau1a.install.in | 1 +
debian/libdrm-radeon1.install | 1 -
debian/libdrm-radeon1.install.in | 1 +
debian/libdrm2.install | 1 -
debian/libdrm2.install.in | 1 +
debian/libkms1.install | 1 -
debian/libkms1.install.in | 1 +
debian/rules | 11 +++++++++++
14 files changed, 41 insertions(+), 9 deletions(-)
New commits:
commit d21b4bac7d3d2fa0c1346665325d2b58919d5dca
Author: Steve Langasek <steve.langasek@linaro.org>
Date: Sat Mar 19 20:53:09 2011 -0700
releasing version 2.4.23-1ubuntu4
diff --git a/debian/changelog b/debian/changelog
index 5c40f52..45825fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-libdrm (2.4.23-1ubuntu4) UNRELEASED; urgency=low
+libdrm (2.4.23-1ubuntu4) natty; urgency=low
* Build for multiarch.
- -- Steve Langasek <steve.langasek@ubuntu.com> Sat, 19 Mar 2011 20:43:29 -0700
+ -- Steve Langasek <steve.langasek@ubuntu.com> Sat, 19 Mar 2011 20:53:05 -0700
libdrm (2.4.23-1ubuntu3) natty; urgency=low
commit f515ccc61b617c435f7ddb32550c855d155a45f2
Author: Steve Langasek <steve.langasek@linaro.org>
Date: Sat Mar 19 20:53:01 2011 -0700
the rest of these packages are also now multi-arch: same for free
diff --git a/debian/control b/debian/control
index 859c3c1..e402c2c 100644
--- a/debian/control
+++ b/debian/control
@@ -76,6 +76,8 @@ Package: libdrm-intel1
Section: libs
Architecture: linux-any kfreebsd-any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: Userspace interface to intel-specific kernel DRM services -- runtime
This library implements the userspace interface to the intel-specific kernel
DRM services. DRM stands for "Direct Rendering Manager", which is the
@@ -87,6 +89,7 @@ Section: debug
Priority: extra
Architecture: linux-any kfreebsd-any
Depends: libdrm-intel1 (= ${binary:Version}), ${misc:Depends}
+Multi-Arch: same
Description: Userspace interface to intel-specific kernel DRM services -- debugging symbols
This library implements the userspace interface to the kernel DRM services.
DRM stands for "Direct Rendering Manager", which is the kernelspace portion
@@ -102,6 +105,8 @@ Depends: ${shlibs:Depends},
${misc:Depends},
Breaks: libdrm-nouveau1
Replaces: libdrm-nouveau1
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: Userspace interface to nouveau-specific kernel DRM services -- runtime
This library implements the userspace interface to the nouveau-specific kernel
DRM services. DRM stands for "Direct Rendering Manager", which is the
@@ -116,6 +121,7 @@ Depends: libdrm-nouveau1a (= ${binary:Version}),
${misc:Depends},
Breaks: libdrm-nouveau1-dbg
Replaces: libdrm-nouveau1-dbg
+Multi-Arch: same
Description: Userspace interface to nouveau-specific kernel DRM -- debugging symbols
This library implements the userspace interface to the kernel DRM services.
DRM stands for "Direct Rendering Manager", which is the kernelspace portion
@@ -130,6 +136,8 @@ Architecture: linux-any
Depends:
${shlibs:Depends},
${misc:Depends},
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: Userspace interface to radeon-specific kernel DRM services -- runtime
This library implements the userspace interface to the radeon-specific kernel
DRM services. DRM stands for "Direct Rendering Manager", which is the
@@ -143,6 +151,7 @@ Architecture: linux-any
Depends:
libdrm-radeon1 (= ${binary:Version}),
${misc:Depends},
+Multi-Arch: same
Description: Userspace interface to radeon-specific kernel DRM services -- debugging symbols
This library implements the userspace interface to the kernel DRM services.
DRM stands for "Direct Rendering Manager", which is the kernelspace portion
commit 42e5e23fbdb2874e32a843631cead7bc2e7420db
Author: Steve Langasek <steve.langasek@linaro.org>
Date: Sat Mar 19 20:43:44 2011 -0700
Build for multiarch.
diff --git a/debian/changelog b/debian/changelog
index d55cf91..5c40f52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.23-1ubuntu4) UNRELEASED; urgency=low
+
+ * Build for multiarch.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com> Sat, 19 Mar 2011 20:43:29 -0700
+
libdrm (2.4.23-1ubuntu3) natty; urgency=low
* Change Conflicts to Breaks/Replaces as per debian policy 7.4
diff --git a/debian/control b/debian/control
index c72ccf0..859c3c1 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Maintainer: Ubuntu X-SWAT <ubuntu-x@lists.ubuntu.com>
XSBC-Original-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 (>= 7.2.7),
+ debhelper (>= 8.1.2ubuntu2),
libx11-dev,
dpkg-dev (>= 1.13.19),
quilt (>= 0.40),
@@ -44,6 +44,8 @@ Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends},
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Description: Userspace interface to kernel DRM services -- runtime
This library implements the userspace interface to the kernel DRM
services. DRM stands for "Direct Rendering Manager", which is the
@@ -60,6 +62,7 @@ Architecture: any
Depends:
libdrm2 (= ${binary:Version}),
${misc:Depends},
+Multi-Arch: same
Description: Userspace interface to kernel DRM services -- debugging symbols
This library implements the userspace interface to the kernel DRM
services. DRM stands for "Direct Rendering Manager", which is the
@@ -152,6 +155,8 @@ Package: libkms1
Section: libs
Architecture: linux-any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Description: Userspace interface to kernel DRM buffer management
This library implements a unified userspace interface to the different buffer
management interfaces of the kernel DRM hardware drivers.
@@ -161,6 +166,7 @@ Section: debug
Priority: extra
Architecture: linux-any
Depends: libkms1 (= ${binary:Version}), ${misc:Depends}
+Multi-Arch: same
Description: Userspace interface to kernel DRM buffer management -- debugging symbols
This library implements a unified userspace interface to the different buffer
management interfaces of the kernel DRM hardware drivers.
diff --git a/debian/libdrm-dev.install b/debian/libdrm-dev.install
index 6cd8ddd..76f28fa 100644
--- a/debian/libdrm-dev.install
+++ b/debian/libdrm-dev.install
@@ -1,4 +1,4 @@
usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
diff --git a/debian/libdrm-intel1.install b/debian/libdrm-intel1.install
deleted file mode 100644
index dc7beed..0000000
--- a/debian/libdrm-intel1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libdrm_intel.so.1* /lib
diff --git a/debian/libdrm-intel1.install.in b/debian/libdrm-intel1.install.in
new file mode 100644
index 0000000..00a0524
--- /dev/null
+++ b/debian/libdrm-intel1.install.in
@@ -0,0 +1 @@
+usr/lib/${DEB_HOST_MULTIARCH}/libdrm_intel.so.1* /lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/libdrm-nouveau1a.install b/debian/libdrm-nouveau1a.install
deleted file mode 100644
index 6ea6284..0000000
--- a/debian/libdrm-nouveau1a.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libdrm_nouveau.so.1* /lib
diff --git a/debian/libdrm-nouveau1a.install.in b/debian/libdrm-nouveau1a.install.in
new file mode 100644
index 0000000..289a854
--- /dev/null
+++ b/debian/libdrm-nouveau1a.install.in
@@ -0,0 +1 @@
+usr/lib/${DEB_HOST_MULTIARCH}/libdrm_nouveau.so.1* /lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/libdrm-radeon1.install b/debian/libdrm-radeon1.install
deleted file mode 100644
index 4aa8bb7..0000000
--- a/debian/libdrm-radeon1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libdrm_radeon.so.1* /lib
diff --git a/debian/libdrm-radeon1.install.in b/debian/libdrm-radeon1.install.in
new file mode 100644
index 0000000..bd5bae4
--- /dev/null
+++ b/debian/libdrm-radeon1.install.in
@@ -0,0 +1 @@
+usr/lib/${DEB_HOST_MULTIARCH}/libdrm_radeon.so.1* /lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/libdrm2.install b/debian/libdrm2.install
deleted file mode 100644
index 22eb5e2..0000000
--- a/debian/libdrm2.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libdrm.so.2* /lib
diff --git a/debian/libdrm2.install.in b/debian/libdrm2.install.in
new file mode 100644
index 0000000..9c3e62d
--- /dev/null
+++ b/debian/libdrm2.install.in
@@ -0,0 +1 @@
+usr/lib/${DEB_HOST_MULTIARCH}/libdrm.so.2* /lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/libkms1.install b/debian/libkms1.install
deleted file mode 100644
index e72408b..0000000
--- a/debian/libkms1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libkms.so.1* /lib
diff --git a/debian/libkms1.install.in b/debian/libkms1.install.in
new file mode 100644
index 0000000..60cb59f
--- /dev/null
+++ b/debian/libkms1.install.in
@@ -0,0 +1 @@
+usr/lib/${DEB_HOST_MULTIARCH}/libkms.so.1* /lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/rules b/debian/rules
index 1c84464..80a1435 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,7 @@ include debian/xsfbs/xsfbs.mk
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
confflags += --build=$(DEB_HOST_GNU_TYPE)
@@ -76,6 +77,7 @@ build/config.status: configure
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
--enable-static=yes \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
$(confflags) \
CFLAGS="$(CFLAGS)"
@@ -99,6 +101,9 @@ clean: xsfclean
rm -f compile config.guess config.sub configure depcomp install-sh
rm -f ltmain.sh missing INSTALL aclocal.m4 config.h.in mkinstalldirs
rm -f libdrm.pc libdrm/config.h.in
+ rm -f debian/libdrm-intel1.install debian/libdrm-nouveau1a.install \
+ debian/libdrm-radeon1.install debian/libdrm2.install \
+ debian/libkms1.install
dh_clean
@@ -106,6 +111,12 @@ install: build
dh_testdir
dh_testroot
dh_prep
+ for file in libdrm-intel1.install libdrm-nouveau1a.install \
+ libdrm-radeon1.install libdrm2.install libkms1.install; \
+ do \
+ sed -e"s,\$${DEB_HOST_MULTIARCH},${DEB_HOST_MULTIARCH},g" \
+ debian/$${file}.in > debian/$$file; \
+ done
dh_installdirs
cd build && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
Reply to: