From 9d97b9ccc3e43f6b98afa89fb50b2ab7cde8a765 Mon Sep 17 00:00:00 2001 From: Cyril Brulebois Date: Sun, 26 Jun 2011 23:37:11 +0200 Subject: Revert multiarch support. --- debian/changelog | 4 ++++ debian/compat | 2 +- debian/control | 17 +---------------- debian/libdrm-dev.install | 6 +++--- debian/libdrm-intel1.install | 2 +- debian/libdrm-nouveau1a.install | 2 +- debian/libdrm-radeon1.install | 2 +- debian/libdrm2.install | 2 +- debian/libkms1.install | 2 +- 9 files changed, 14 insertions(+), 25 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6e4a194b..da135060 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ libdrm (2.4.26-1~bpo60+1) UNRELEASED; urgency=low * Rebuild for squeeze-backports. + * Revert multiarch support (no such thing in squeeze): + - Lower debhelper build-dep and compat + - Drop Multi-Arch and Pre-Depends fields. + - Replace β€œ/usr/lib/*” with β€œ/usr/lib” again in .install files. -- Cyril Brulebois Sun, 26 Jun 2011 23:12:58 +0200 diff --git a/debian/compat b/debian/compat index ec635144..7f8f011e 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +7 diff --git a/debian/control b/debian/control index 71d057bd..a1f9f92d 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian X Strike Force Uploaders: Cyril Brulebois Build-Depends: - debhelper (>= 8.1.2ubuntu2), + debhelper (>= 7.2.7), dh-autoreconf, quilt, libx11-dev, @@ -43,8 +43,6 @@ 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 @@ -61,7 +59,6 @@ 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 @@ -77,8 +74,6 @@ 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 @@ -92,7 +87,6 @@ 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 @@ -107,8 +101,6 @@ 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 @@ -122,7 +114,6 @@ 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 @@ -137,8 +128,6 @@ 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 @@ -152,7 +141,6 @@ 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 @@ -165,8 +153,6 @@ 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. @@ -176,7 +162,6 @@ 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 76f28fa2..6cd8ddd2 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 23861696..149ef107 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 6c550808..b19813f5 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 158f5592..24e5a6b7 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 6e2fd9b1..c2f2241f 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 84efd1f3..2d29800f 100644 --- a/debian/libkms1.install +++ b/debian/libkms1.install @@ -1 +1 @@ -usr/lib/*/libkms.so.1* +usr/lib/libkms.so.1* -- cgit v1.2.3