debian/changelog | 3 +++
debian/control | 5 ++++-
debian/rules | 10 ++++++++++
3 files changed, 17 insertions(+), 1 deletion(-)
New commits:
commit 1bc4850c0f1e561440083ea30744498311bbff00
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Apr 14 18:10:23 2010 +0200
Make xserver-xorg-core provide ABI-versioned virtual packages for drivers
to depend on.
This is a first step in making our ABI handling saner (see #573371).
diff --git a/debian/changelog b/debian/changelog
index e107850..3c2cf57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,9 @@ xorg-server (2:1.7.6-3) UNRELEASED; urgency=low
[ Julien Cristau ]
* Remove from debian/rules an obsolete reference to
/usr/share/debhelper/dh_make/debianm/rules.
+ * Make xserver-xorg-core provide ABI-versioned virtual packages for drivers
+ to depend on. This is a first step in making our ABI handling saner (see
+ #573371).
-- Cyril Brulebois <k...@debian.org> Mon, 05 Apr 2010 20:25:26 +0200
diff --git a/debian/control b/debian/control
index b6820ae..f00054c 100644
--- a/debian/control
+++ b/debian/control
@@ -111,7 +111,10 @@ Replaces:
xserver-xorg (<< 6.8.2-38),
xserver-xfree86 (<< 1:7.0.0),
xserver-common (<< 7)
-Provides: xserver
+Provides:
+ xserver,
+ ${videoabi},
+ ${inputabi},
Description: Xorg X server - core server
The Xorg X server is an X server for several architectures and operating
systems, which is derived from the XFree86 4.x series of X servers.
diff --git a/debian/rules b/debian/rules
index fa194e5..6a44ad0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -265,6 +265,8 @@ binary-deb:
dh_md5sums
dh_builddeb
+serverminver = $(shell cat debian/serverminver)
+
# Build architecture-dependent files here.
binary-arch: build install
$(MAKE) -f debian/rules DH_OPTIONS=-s binary-initial
@@ -273,6 +275,14 @@ binary-arch: build install
dh_installchangelogs -s ChangeLog
dh_install $(DH_INSTALL_OPTIONS) -s --sourcedir=debian/tmp
--list-missing
$(INSTALL) -d $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg
+ # XXX might want to only extract the major ABI versions?
+ abi_videodrv=`PKG_CONFIG_DIR=debian/tmp/main/usr/lib/pkgconfig
pkg-config --variable=abi_videodrv xorg-server`; \
+ echo videoabi=xorg-video-abi-$$abi_videodrv >
debian/xserver-xorg-core.substvars && \
+ echo "xorg-video-abi-$$abi_videodrv, xserver-xorg-core (>=
$(serverminver))" > debian/xserver-xorg-dev/usr/share/xserver-xorg/videodrvdep
+ abi_xinput=`PKG_CONFIG_DIR=debian/tmp/main/usr/lib/pkgconfig pkg-config
--variable=abi_xinput xorg-server`; \
+ echo inputabi=xorg-input-abi-$$abi_xinput >>
debian/xserver-xorg-core.substvars && \
+ echo "xorg-input-abi-$$abi_xinput, xserver-xorg-core (>=
$(serverminver))" > debian/xserver-xorg-dev/usr/share/xserver-xorg/xinputdep
+
$(INSTALL) -m644 $(CURDIR)/debian/videoabiver \
$(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg/videoabiver
$(INSTALL) -m644 $(CURDIR)/debian/inputabiver \
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1o268v-0004xm...@alioth.debian.org
