[SCM] UNNAMED PROJECT branch, debian-unstable, updated. 3ee9d5a018d873823da8cc9551a66bd401d167af

David Nusinow dnusinow at debian.org
Fri Mar 27 05:21:07 UTC 2009


The following commit has been merged in the debian-unstable branch:
commit a0c9602f38e9d47d7a76b7b345e7e8bbb29b752f
Author: David Nusinow <dnusinow at debian.org>
Date:   Tue Feb 27 21:50:20 2007 -0500

    Add support for X server input ABI versioning

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index d54ffd3..5e8cf41 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -355,9 +355,11 @@ debian/shlibs.local:
 	cat debian/*.shlibs >$@
 
 SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
-SERVERABI = $(shell cat /usr/share/xserver-xorg/serverabiver 2>/dev/null)
+VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
+INPUTABI = $(shell cat /usr/share/xserver-xorg/driverabiver 2>/dev/null)
 SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
-DRIVER_PROVIDES = xserver-xorg-video-$(SERVERABI)
+VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
+INPDRIVER_PROVIDES = xserver-xorg-video-$(INPUTABI)
 ifeq ($(PACKAGE),)
 PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
 endif
@@ -369,7 +371,8 @@ ifeq ($(SERVERABI),)
 	@exit 1
 else
 	echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars
-	echo "xviddriver:Provides=$(DRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
+	echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
+	echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
 endif
 
 include debian/xsfbs/xsfbs-autoreconf.mk

-- 
UNNAMED PROJECT



More information about the debian-science-commits mailing list