[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xserver-xorg-video-voodoo: Changes to 'debian-experimental'



 debian/changelog      |    4 ++--
 debian/control        |    2 +-
 debian/rules          |    2 +-
 debian/xsfbs/xsfbs.mk |   15 +++++++++++++++
 4 files changed, 19 insertions(+), 4 deletions(-)

New commits:
commit cf23d42aaca2ffffc1ca017418b12d8f086c7e40
Author: David Nusinow <dnusinow@debian.org>
Date:   Tue Feb 20 22:29:02 2007 -0500

    Generate server dependencies automatically from the ABI

diff --git a/debian/changelog b/debian/changelog
index cf03873..32a7cff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
 xserver-xorg-video-voodoo (1:1.1.1-1) UNRELEASED; urgency=low
 
   * New upstream version
-  * Bump xserver ABI metadata to 1.1 for use with server 1.2
+  * Generate server dependencies automatically from the ABI
 
- -- David Nusinow <dnusinow@debian.org>  Sat, 10 Feb 2007 21:23:57 -0500
+ -- David Nusinow <dnusinow@debian.org>  Tue, 20 Feb 2007 22:27:40 -0500
 
 xserver-xorg-video-voodoo (1:1.1.0-5) UNRELEASED; urgency=low
 
diff --git a/debian/control b/debian/control
index a44523c..2979b8e 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.7.2
 
 Package: xserver-xorg-video-voodoo
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, xserver-xorg-core (>= 2:1.2.0)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
 Provides: xserver-xorg-video-1.1
 Replaces: xserver-xorg (<< 6.8.2-35)
 Description: X.Org X server -- Voodoo display driver
diff --git a/debian/rules b/debian/rules
index f403018..be5d29b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,7 +66,7 @@ install: build
 	cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 
 # Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: build install serverabi
 	dh_testdir
 	dh_testroot
 

commit 9ed8b0c26438b90f187ef7c165d5a76cf8f340eb
Author: Julien Cristau <jcristau@debian.org>
Date:   Sat Feb 17 16:01:41 2007 +0100

    Add new "serverabi" rule to generate drivers dependency on the server.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 7b8206e..dbb2872 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -354,6 +354,21 @@ # Generate the shlibs.local file.
 debian/shlibs.local:
 	cat debian/*.shlibs >$@
 
+SERVERABI = $(shell cat /usr/share/xserver-xorg/serverabiver 2>/dev/null)
+SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERABI))
+ifeq ($(PACKAGE),)
+PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
+endif
+
+.PHONY: serverabi
+serverabi:
+ifeq ($(SERVERABI),)
+	@echo error: xserver-xorg-dev needs to be installed
+	@exit 1
+else
+	echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars
+endif
+
 include debian/xsfbs/xsfbs-autoreconf.mk
 
 # vim:set noet ai sts=8 sw=8 tw=0:



Reply to: