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

Update serverabi rule for xserver 1.7.6.901 

Add new variables ${xviddriver:Depends} and ${xinpdriver:Depends} for
drivers.  The ${xserver:Depends} variable is deprecated.
This commit is contained in:
Julien Cristau 2010-04-16 22:14:46 +02:00
parent 8bd2e9b523
commit b045afbd82
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
debian/xsfbs/xsfbs.mk vendored
View File

@ -253,25 +253,33 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
# debian/*.prerm # debian/*.prerm
>$@ >$@
SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) # Compute dependencies for drivers
#
VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null)
INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null)
# these two can be removed post-squeeze
VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
ifeq ($(PACKAGE),) ifeq ($(PACKAGE),)
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
endif endif
.PHONY: serverabi .PHONY: serverabi
serverabi: install serverabi: install
ifeq ($(SERVERMINVERS),) ifeq ($(VIDEODEP),)
@echo error: xserver-xorg-dev needs to be installed @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed'
@exit 1 @exit 1
else else
echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars
echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars
# the following is there for compatibility...
echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(PACKAGE).substvars
endif endif
# vim:set noet ai sts=8 sw=8 tw=0: # vim:set noet ai sts=8 sw=8 tw=0: