diff options
| author | David Nusinow <dnusinow@debian.org> | 2007-02-21 21:37:52 -0500 |
|---|---|---|
| committer | David Nusinow <dnusinow@debian.org> | 2007-02-21 21:37:52 -0500 |
| commit | dacefd5a6bb9f786c78f35358273e3214c7492e9 (patch) | |
| tree | 47401d3db2139b6e8ebf5b7a0bf9fa034f8f9a64 | |
| parent | 9ed8b0c26438b90f187ef7c165d5a76cf8f340eb (diff) | |
| download | xutils-dev-dacefd5a6bb9f786c78f35358273e3214c7492e9.tar.gz | |
Update serverabi generation to also account for driver Provides
* Have the drivers use the file serverminver instead of serverabiver in order
to generate the versioned dependency on the server. This is clearer
naming.
* Use serverabiver to actually store the server's video ABI version. This
is used to generate the Provides: line for drivers so the server can
depend on them properly. This goes in to the substvar
xviddriver:Provides.
| -rwxr-xr-x | debian/xsfbs/xsfbs.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index dbb2872..ae767b1 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -354,8 +354,10 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir debian/shlibs.local: cat debian/*.shlibs >$@ +SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminvers 2>/dev/null) SERVERABI = $(shell cat /usr/share/xserver-xorg/serverabiver 2>/dev/null) -SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERABI)) +SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS)) +DRIVER_PROVIDES = xserver-xorg-video-$(SERVERABI) ifeq ($(PACKAGE),) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) endif @@ -367,6 +369,7 @@ ifeq ($(SERVERABI),) @exit 1 else echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars + echo "xviddriver:Provides=$(DRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars endif include debian/xsfbs/xsfbs-autoreconf.mk |