jcarr
/
x11-xserver-utils
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
David Nusinow 2007-02-21 21:37:52 -05:00
parent 9ed8b0c264
commit dacefd5a6b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
debian/xsfbs/xsfbs.mk vendored
View File

@ -354,8 +354,10 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
debian/shlibs.local: debian/shlibs.local:
cat debian/*.shlibs >$@ 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) 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),) ifeq ($(PACKAGE),)
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
endif endif
@ -367,6 +369,7 @@ ifeq ($(SERVERABI),)
@exit 1 @exit 1
else else
echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars
echo "xviddriver:Provides=$(DRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
endif endif
include debian/xsfbs/xsfbs-autoreconf.mk include debian/xsfbs/xsfbs-autoreconf.mk