debian/changelog | 10 ++++++++--
debian/control | 36 ++++++++++++++++++++++++++++++++++--
debian/libdrm-dev.install | 1 -
debian/libdrm-intel1.install | 1 +
debian/libdrm-intel1.symbols | 36 ++++++++++++++++++++++++++++++++++++
debian/libdrm2.install | 2 +-
debian/libdrm2.shlibs | 1 -
debian/rules | 6 ++++--
8 files changed, 84 insertions(+), 9 deletions(-)
New commits:
commit ed71e828c924436c6808570a746d32bd240654c8
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date: Thu Nov 27 09:38:32 2008 +0200
Various changes from drm-snapshot.
* Add a new package for the intel-specific bits (libdrm-intel1)
* Build-depend on pkg-config and libpthread-stubs0-dev (closes: #502078).
* Don't mention *.la in libdrm-dev.install.
* Make libdrm-dev depend on libdrm-intel1.
diff --git a/debian/changelog b/debian/changelog
index 2a0a424..99b1df1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,20 @@
libdrm (2.4.1-1) UNRELEASED; urgency=low
* New upstream release. (closes: #505740)
- * Bump the shlibs to 2.4.1.
* debian/rules:
-Run autoreconf at build time, build-depend on automake and libtool.
(closes: #482727)
-Add a debian/libdrm2.symbols file and '-c4' parameter to dh_makeshlibs
to fail if new symbols are added. Don't use Debian versions for now.
- -- Timo Aaltonen <[EMAIL PROTECTED]> Tue, 25 Nov 2008 13:15:26 +0200
+ [ Julien Cristau ]
+ * Add a new package for the intel-specific bits (libdrm-intel1)
+ * Build-depend on pkg-config and libpthread-stubs0-dev (closes: #502078).
+ Thanks, Frank Lichtenheld!
+ * Don't mention *.la in libdrm-dev.install.
+ * Make libdrm-dev depend on libdrm-intel1.
+
+ -- Timo Aaltonen <[EMAIL PROTECTED]> Thu, 27 Nov 2008 09:33:05 +0200
libdrm (2.3.1-2) unstable; urgency=high
diff --git a/debian/control b/debian/control
index 6e86d53..38fcf72 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libdrm
Priority: optional
Maintainer: Debian X Strike Force <[email protected]>
Uploaders: Thierry Reding <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL
PROTECTED]>, David Nusinow <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5.0.0), libx11-dev, dpkg-dev (>= 1.13.19), quilt
(>= 0.40), automake, libtool
+Build-Depends: debhelper (>= 5.0.0), libx11-dev, dpkg-dev (>= 1.13.19), quilt
(>= 0.40), automake, libtool, pkg-config, libpthread-stubs0-dev
Standards-Version: 3.7.3
Section: libs
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libdrm
@@ -11,7 +11,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libdrm.git
Package: libdrm-dev
Section: libdevel
Architecture: any
-Depends: libdrm2 (= ${binary:Version})
+Depends: libdrm2 (= ${binary:Version}), libdrm-intel1 (= ${binary:Version})
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
@@ -47,3 +47,35 @@ Description: Userspace interface to kernel DRM services --
debugging symbols
OpenGL drivers.
.
This package provides debugging symbols for the libdrm2 package.
+
+Package: libdrm-intel1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+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
+ kernelspace portion of the "Direct Rendering Infrastructure" (DRI). The DRI is
+ currently used on Linux to provide hardware-accelerated OpenGL drivers.
+ .
+ This package is built from a snapshot of DRM development code, to provide the
+ features necessary for testing new X.org drivers. Do NOT expect this package
+ to be stable!
+
+Package: libdrm-intel1-dbg
+Section: libdevel
+Priority: extra
+Architecture: any
+Depends: libdrm-intel1 (= ${binary:Version}), ${misc:Depends}
+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
+ of the "Direct Rendering Infrastructure" (DRI). The DRI is currently used on
+ Linux to provide hardware-accelerated OpenGL drivers.
+ .
+ This package is built from a snapshot of DRM development code, to provide the
+ features necessary for testing new X.org drivers. Do NOT expect this package
+ to be stable!
+ .
+ This package provides the debugging symbols for the libdrm-intel1 package.
+
diff --git a/debian/libdrm-dev.install b/debian/libdrm-dev.install
index 68a175d..6cd8ddd 100644
--- a/debian/libdrm-dev.install
+++ b/debian/libdrm-dev.install
@@ -2,4 +2,3 @@ usr/include/*
usr/lib/lib*.a
usr/lib/lib*.so
usr/lib/pkgconfig/*
-usr/lib/*.la
diff --git a/debian/libdrm-intel1.install b/debian/libdrm-intel1.install
new file mode 100644
index 0000000..49a26fc
--- /dev/null
+++ b/debian/libdrm-intel1.install
@@ -0,0 +1 @@
+usr/lib/libdrm_intel.so.*
diff --git a/debian/libdrm-intel1.symbols b/debian/libdrm-intel1.symbols
new file mode 100644
index 0000000..95bbd40
--- /dev/null
+++ b/debian/libdrm-intel1.symbols
@@ -0,0 +1,36 @@
+libdrm_intel.so.1 libdrm2 #MINVER#
+ [EMAIL PROTECTED] 2.4.1
+ [EMAIL PROTECTED] 2.4.1
+ [EMAIL PROTECTED] 2.4.1
+ [EMAIL PROTECTED] 2.4.1
+ [EMAIL PROTECTED] 2.4.1
+ [EMAIL PROTECTED] 2.4.1
+ [EMAIL PROTECTED] 2.4.1
+ [EMAIL PROTECTED] 2.4.1
+ [EMAIL PROTECTED] 2.4.1
+ [EMAIL PROTECTED] 2.4.1
+ [EMAIL PROTECTED] 2.4.1
+ [EMAIL PROTECTED] 2.4.1
+ [EMAIL PROTECTED] 2.4.1
+ [EMAIL PROTECTED] 2.4.1
+ [EMAIL PROTECTED] 2.4.1
+ [EMAIL PROTECTED] 2.4.1
+ [EMAIL PROTECTED] 2.4.1
+ [EMAIL PROTECTED] 2.4.1
+ [EMAIL PROTECTED] 2.4.1
+ [EMAIL PROTECTED] 2.4.1
+ [EMAIL PROTECTED] 2.4.1
+ [EMAIL PROTECTED] 2.4.1
+ [EMAIL PROTECTED] 2.4.1
+ [EMAIL PROTECTED] 2.4.1
+ [EMAIL PROTECTED] 2.4.1
+ [EMAIL PROTECTED] 2.4.1
+ [EMAIL PROTECTED] 2.4.1
+ [EMAIL PROTECTED] 2.4.1
+ [EMAIL PROTECTED] 2.4.1
+ [EMAIL PROTECTED] 2.4.1
+ [EMAIL PROTECTED] 2.4.1
+ [EMAIL PROTECTED] 2.4.1
+ [EMAIL PROTECTED] 2.4.1
+ [EMAIL PROTECTED] 2.4.1
+ [EMAIL PROTECTED] 2.4.1
diff --git a/debian/libdrm2.install b/debian/libdrm2.install
index d0dbfd1..9a2ba56 100644
--- a/debian/libdrm2.install
+++ b/debian/libdrm2.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/libdrm.so.*
diff --git a/debian/libdrm2.shlibs b/debian/libdrm2.shlibs
deleted file mode 100644
index 556e7f0..0000000
--- a/debian/libdrm2.shlibs
+++ /dev/null
@@ -1 +0,0 @@
-libdrm 2 libdrm2 (>= 2.4.1)
diff --git a/debian/rules b/debian/rules
index e77d3dd..b59865b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,13 +85,15 @@ binary-arch: build install
dh_installchangelogs ChangeLog
dh_installdocs
dh_installexamples
- dh_install --sourcedir=debian/tmp -Xlibdrm.la --list-missing
+ dh_install -s --sourcedir=debian/tmp -X.la --list-missing
dh_link
dh_strip -plibdrm2 --dbg-package=libdrm2-dbg
+ dh_strip -plibdrm-intel1 --dbg-package=libdrm-intel1-dbg
dh_strip
dh_compress
dh_fixperms
- dh_makeshlibs -- -c4
+ dh_makeshlibs -plibdrm2 -V'libdrm2 (>=2.4.1)' -- -c4
+ dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (>=2.4.1)' -- -c4
dh_installdeb
dh_shlibdeps
dh_gencontrol
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
