debian/changelog | 4 ++--
debian/control | 2 +-
debian/rules | 2 +-
debian/xsfbs/xsfbs.mk | 15 +++++++++++++++
4 files changed, 19 insertions(+), 4 deletions(-)
New commits:
commit 5ab22de04b4ea8435f5c78d3b592d3e47bb5da8b
Author: David Nusinow <[EMAIL PROTECTED]>
Date: Tue Feb 20 22:28:38 2007 -0500
Generate server dependencies automatically from the ABI
diff --git a/debian/changelog b/debian/changelog
index fa4914a..074e51d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
xserver-xorg-video-nv (1:1.2.2.1-1) UNRELEASED; urgency=low
- * Bump xserver ABI metadata to 1.1 for use with server 1.2
* New upstream version plus a git update that removes the riva128 module and
links support in to nv_drv.so directly
+ * Generate server dependencies automatically from the ABI
- -- David Nusinow <[EMAIL PROTECTED]> Sun, 11 Feb 2007 22:47:59 -0500
+ -- David Nusinow <[EMAIL PROTECTED]> Tue, 20 Feb 2007 22:23:28 -0500
xserver-xorg-video-nv (1:1.2.0-4) UNRELEASED; urgency=low
diff --git a/debian/control b/debian/control
index d6c2670..39e3893 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.6.1
Package: xserver-xorg-video-nv
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, xf86-video-driver-riva128
Conflicts: xserver-xorg-video-riva128
Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-video-riva128
diff --git a/debian/rules b/debian/rules
index 3e82120..a7be659 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 <[EMAIL PROTECTED]>
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:
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
