debian/changelog | 6 ++++++ debian/control | 4 ++-- debian/xsfbs/xsfbs.mk | 22 +++++++++++++++------- 3 files changed, 23 insertions(+), 9 deletions(-)
New commits: commit 1fc1bc2ba17b9e5d9d572cfaf009fd21fd567a6f Author: Julien Cristau <[email protected]> Date: Sat May 15 12:04:18 2010 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 47f9dfd..6320f43 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xserver-xorg-video-nouveau (1:0.0.15+git20100329+7858345-4) UNRELEASED; urgency=low +xserver-xorg-video-nouveau (1:0.0.15+git20100329+7858345-4) unstable; urgency=medium * Update xsfbs and use new ${xviddriver:Depends} substvar. - -- Julien Cristau <[email protected]> Sat, 15 May 2010 12:00:23 +0200 + -- Julien Cristau <[email protected]> Sat, 15 May 2010 12:04:08 +0200 xserver-xorg-video-nouveau (1:0.0.15+git20100329+7858345-3) unstable; urgency=low commit d2137c9f060606a04dad88f0f015c88b93d3189f Author: Julien Cristau <[email protected]> Date: Sat May 15 12:00:48 2010 +0200 Update xsfbs and use new ${xviddriver:Depends} substvar. diff --git a/debian/changelog b/debian/changelog index 1944b49..47f9dfd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-nouveau (1:0.0.15+git20100329+7858345-4) UNRELEASED; urgency=low + + * Update xsfbs and use new ${xviddriver:Depends} substvar. + + -- Julien Cristau <[email protected]> Sat, 15 May 2010 12:00:23 +0200 + xserver-xorg-video-nouveau (1:0.0.15+git20100329+7858345-3) unstable; urgency=low [ Sven Joachim ] diff --git a/debian/control b/debian/control index a86ee44..ff15c54 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Chris Lamb <[email protected]>, Matthew Johnson <[email protected]>, Cy Build-Depends: debhelper (>= 7), pkg-config, - xserver-xorg-dev (>= 2:1.7), + xserver-xorg-dev (>= 2:1.7.6.901), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, @@ -31,7 +31,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - ${xserver:Depends}, + ${xviddriver:Depends}, Provides: ${xviddriver:Provides} Description: X.Org X server -- Nouveau display driver (experimental) This driver for the X.Org X server (see xserver-xorg for a further description) commit 81fc271788605b52e85c2d11635a0371fb44605e Author: Cyril Brulebois <[email protected]> Date: Sun May 2 02:14:45 2010 +0200 Add xorg-driver-{video,input} to Provides. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 77c4a39..3c59c20 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -261,8 +261,8 @@ 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) INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) -INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) +VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video +INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input ifeq ($(PACKAGE),) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) commit b045afbd8277ad0c44e29d7c45802053c4335ccd Author: Julien Cristau <[email protected]> Date: Fri Apr 16 22:14:46 2010 +0200 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. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 351fea5..77c4a39 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -253,25 +253,33 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir # 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) INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS)) VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) + ifeq ($(PACKAGE),) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) endif .PHONY: serverabi serverabi: install -ifeq ($(SERVERMINVERS),) - @echo error: xserver-xorg-dev needs to be installed +ifeq ($(VIDEODEP),) + @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed' @exit 1 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 "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars + echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(PACKAGE).substvars endif # vim:set noet ai sts=8 sw=8 tw=0: -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
