libdrm: Changes to 'debian-unstable'
debian/changelog | 14 ++++++++++++++
debian/compat | 2 +-
debian/control | 19 +++++++++++++++++--
debian/libdrm-dev.install | 6 +++---
debian/libdrm-intel1.install | 2 +-
debian/libdrm-nouveau1a.install | 2 +-
debian/libdrm-radeon1.install | 2 +-
debian/libdrm-radeon1.lintian-overrides | 1 +
debian/libdrm2.install | 2 +-
debian/libkms1.install | 2 +-
debian/libkms1.lintian-overrides | 1 +
11 files changed, 42 insertions(+), 11 deletions(-)
New commits:
commit b7b99dbe72246771a0c1365bc5b25f76ac36db7f
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 9 20:06:00 2011 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 39b568d..80053d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,6 @@
-libdrm (2.4.25-3) UNRELEASED; urgency=low
+libdrm (2.4.25-3) unstable; urgency=low
+
+ * Team upload.
[ Steve Langasek ]
* Build for multiarch.
@@ -8,7 +10,7 @@ libdrm (2.4.25-3) UNRELEASED; urgency=low
use that for private symbols).
* Bump Standards-Version to 3.9.2.
- -- Julien Cristau <jcristau@debian.org> Thu, 09 Jun 2011 19:51:16 +0200
+ -- Julien Cristau <jcristau@debian.org> Thu, 09 Jun 2011 20:05:53 +0200
libdrm (2.4.25-2) unstable; urgency=low
commit 514f38a13b15767ef4f1d4f0487aaea56f5d4436
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 9 20:03:29 2011 +0200
Bump Standards-Version to 3.9.2.
diff --git a/debian/changelog b/debian/changelog
index 3e3cd96..39b568d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ libdrm (2.4.25-3) UNRELEASED; urgency=low
[ Julien Cristau ]
* Add lintian overrides for symbols-declares-dependency-on-other-package (we
use that for private symbols).
+ * Bump Standards-Version to 3.9.2.
-- Julien Cristau <jcristau@debian.org> Thu, 09 Jun 2011 19:51:16 +0200
diff --git a/debian/control b/debian/control
index 1a21fbc..7b3673d 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
pkg-config,
libpthread-stubs0-dev,
libudev-dev [linux-any],
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Section: libs
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libdrm
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libdrm.git
commit cb38517b4494dedf1325a8ffbe3bcc0798ae14c4
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 9 20:01:26 2011 +0200
Add lintian overrides for symbols-declares-dependency-on-other-package
We use that for private symbols.
diff --git a/debian/changelog b/debian/changelog
index 18ef67e..3e3cd96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ libdrm (2.4.25-3) UNRELEASED; urgency=low
[ Steve Langasek ]
* Build for multiarch.
+ [ Julien Cristau ]
+ * Add lintian overrides for symbols-declares-dependency-on-other-package (we
+ use that for private symbols).
+
-- Julien Cristau <jcristau@debian.org> Thu, 09 Jun 2011 19:51:16 +0200
libdrm (2.4.25-2) unstable; urgency=low
diff --git a/debian/libdrm-radeon1.lintian-overrides b/debian/libdrm-radeon1.lintian-overrides
new file mode 100644
index 0000000..0e452e0
--- /dev/null
+++ b/debian/libdrm-radeon1.lintian-overrides
@@ -0,0 +1 @@
+libdrm-radeon1: symbols-declares-dependency-on-other-package libdrm-radeon-private
diff --git a/debian/libkms1.lintian-overrides b/debian/libkms1.lintian-overrides
new file mode 100644
index 0000000..0617799
--- /dev/null
+++ b/debian/libkms1.lintian-overrides
@@ -0,0 +1 @@
+symbols-declares-dependency-on-other-package libkms-private
commit ce8ce08657202ca8a254f8fc02a3d3f6d9d3dabb
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 9 19:57:13 2011 +0200
Add changelog entry
diff --git a/debian/changelog b/debian/changelog
index 0d1a16c..18ef67e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdrm (2.4.25-3) UNRELEASED; urgency=low
+
+ [ Steve Langasek ]
+ * Build for multiarch.
+
+ -- Julien Cristau <jcristau@debian.org> Thu, 09 Jun 2011 19:51:16 +0200
+
libdrm (2.4.25-2) unstable; urgency=low
* Upload to unstable.
commit a3853a0540b739370fbeb6f252df15b3c4ec629a
Author: Steve Langasek <steve.langasek@linaro.org>
Date: Sat Mar 19 20:55:26 2011 -0700
the rest of these packages are also multiarch clean; mark them as such
diff --git a/debian/control b/debian/control
index fef5cab..be025b0 100644
--- a/debian/control
+++ b/debian/control
@@ -77,6 +77,8 @@ Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
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
@@ -90,6 +92,7 @@ Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
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
@@ -104,6 +107,8 @@ Architecture: linux-any
Depends: ${shlibs:Depends},
${misc:Depends},
Conflicts: 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
@@ -117,6 +122,7 @@ Architecture: linux-any
Depends: libdrm-nouveau1a (= ${binary:Version}),
${misc:Depends},
Conflicts: 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
@@ -131,6 +137,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
@@ -144,6 +152,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 bb14fd7d6ba25d989527cc1fd5a61a76aca417eb
Author: Steve Langasek <steve.langasek@linaro.org>
Date: Sat Mar 19 20:24:41 2011 -0700
Build for multiarch
Install the libraries in the multiarch paths as described at
<http://wiki.debian.org/Multiarch/Implementation>.
diff --git a/debian/control b/debian/control
index 2ac055d..fef5cab 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: 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),
@@ -43,6 +43,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
@@ -59,6 +61,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
@@ -153,6 +156,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.
@@ -162,6 +167,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
index 149ef10..2386169 100644
--- a/debian/libdrm-intel1.install
+++ b/debian/libdrm-intel1.install
@@ -1 +1 @@
-usr/lib/libdrm_intel.so.1*
+usr/lib/*/libdrm_intel.so.1*
diff --git a/debian/libdrm-nouveau1a.install b/debian/libdrm-nouveau1a.install
index b19813f..6c55080 100644
--- a/debian/libdrm-nouveau1a.install
+++ b/debian/libdrm-nouveau1a.install
@@ -1 +1 @@
-usr/lib/libdrm_nouveau.so.1*
+usr/lib/*/libdrm_nouveau.so.1*
diff --git a/debian/libdrm-radeon1.install b/debian/libdrm-radeon1.install
index 24e5a6b..158f559 100644
--- a/debian/libdrm-radeon1.install
+++ b/debian/libdrm-radeon1.install
@@ -1 +1 @@
-usr/lib/libdrm_radeon.so.1*
+usr/lib/*/libdrm_radeon.so.1*
diff --git a/debian/libdrm2.install b/debian/libdrm2.install
index c2f2241..6e2fd9b 100644
--- a/debian/libdrm2.install
+++ b/debian/libdrm2.install
@@ -1 +1 @@
-usr/lib/libdrm.so.2*
+usr/lib/*/libdrm.so.2*
diff --git a/debian/libkms1.install b/debian/libkms1.install
index 2d29800..84efd1f 100644
--- a/debian/libkms1.install
+++ b/debian/libkms1.install
@@ -1 +1 @@
-usr/lib/libkms.so.1*
+usr/lib/*/libkms.so.1*
diff --git a/debian/rules b/debian/rules
index 4d838ba..557304c 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)
@@ -79,6 +80,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)"
Reply to: