libdrm: Changes to 'debian-unstable'
debian/changelog | 1 +
debian/control | 3 ++-
debian/rules | 6 ------
3 files changed, 3 insertions(+), 7 deletions(-)
New commits:
commit a88e94deeaf9f642a108ef3b57436a534dc353e0
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Mar 15 00:28:11 2010 +0100
Add back the drm headers in libdrm-dev.
diff --git a/debian/changelog b/debian/changelog
index 6f8766d..4b1ba28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libdrm (2.4.18-3) UNRELEASED; urgency=low
* Include full SONAME in libdrm*.install to prevent accidental breakage.
+ * Add back the drm headers in libdrm-dev.
-- Julien Cristau <jcristau@debian.org> Sun, 07 Mar 2010 15:31:51 +0100
diff --git a/debian/control b/debian/control
index 13708bf..65f013a 100644
--- a/debian/control
+++ b/debian/control
@@ -20,11 +20,12 @@ Package: libdrm-dev
Section: libdevel
Architecture: any
Depends:
- linux-libc-dev (>= 2.6.32) [linux-any],
libdrm2 (= ${binary:Version}),
libdrm-intel1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
libdrm-radeon1 (= ${binary:Version}) [linux-any],
${misc:Depends},
+Replaces:
+ linux-libc-dev (<< 2.6.32-10)
Description: Userspace interface to kernel DRM services -- development files
This library implements the userspace interface to the kernel DRM
services. DRM stands for "Direct Rendering Manager", which is the
diff --git a/debian/rules b/debian/rules
index 6eaef3d..dede329 100755
--- a/debian/rules
+++ b/debian/rules
@@ -103,12 +103,6 @@ install: build
dh_installdirs
cd build && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-ifeq (linux, $(DEB_HOST_ARCH_OS))
- # remove files provided by linux-libc-dev
- for file in drm_mode.h drm_sarea.h drm.h i915_drm.h mga_drm.h r128_drm.h radeon_drm.h savage_drm.h sis_drm.h via_drm.h; do \
- rm -f debian/tmp/usr/include/drm/$$file; \
- done
-endif
# Build architecture-independent files here.
binary-indep: build install
Reply to: