xserver-xorg-video-ati: Changes to 'debian-experimental'
debian/changelog | 5 +++--
debian/control | 2 +-
debian/rules | 2 +-
debian/xsfbs/xsfbs.mk | 15 +++++++++++++++
4 files changed, 20 insertions(+), 4 deletions(-)
New commits:
commit 3144247d9d111f98b1712f76c52a009786b18c8d
Author: David Nusinow <dnusinow@debian.org>
Date: Tue Feb 20 22:28:17 2007 -0500
Generate server dependencies automatically from the ABI
diff --git a/debian/changelog b/debian/changelog
index 60f9857..ea71055 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xserver-xorg-video-ati (1:6.6.99-1) UNRE
* Generate server dependencies automatically from the ABI
* Merge changes from upstream pre-release
+ * Generate server dependencies automatically from the ABI
- -- David Nusinow <dnusinow@debian.org> Tue, 20 Feb 2007 22:13:01 -0500
+ -- David Nusinow <dnusinow@debian.org> Tue, 20 Feb 2007 22:19:10 -0500
xserver-xorg-video-ati (1:6.6.3-3) UNRELEASED; urgency=low
commit 5ba20fbaaa9fc01ceaabfbdcb7e4c2ab0ebe85c8
Author: David Nusinow <dnusinow@debian.org>
Date: Tue Feb 20 22:13:36 2007 -0500
* Generate server dependencies automatically from the ABI
diff --git a/debian/changelog b/debian/changelog
index 9440f84..60f9857 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
xserver-xorg-video-ati (1:6.6.99-1) UNRELEASED; urgency=low
- * Bump xserver ABI metadata to 1.1 for use with server 1.2
+ * Generate server dependencies automatically from the ABI
* Merge changes from upstream pre-release
- -- David Nusinow <dnusinow@debian.org> Sun, 11 Feb 2007 21:15:57 -0500
+ -- David Nusinow <dnusinow@debian.org> Tue, 20 Feb 2007 22:13:01 -0500
xserver-xorg-video-ati (1:6.6.3-3) UNRELEASED; urgency=low
diff --git a/debian/control b/debian/control
index 23420e2..be955da 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.7.2
Package: xserver-xorg-video-ati
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, xserver-xorg-core (>= 2:1.2.0)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-video-atimisc, xserver-xorg-driver-r128, xserver-xorg-driver-radeon
Conflicts: xserver-xorg-video-atimisc, xserver-xorg-driver-r128, xserver-xorg-driver-radeon
Provides: xserver-xorg-video-1.1, xf86-video-driver-atimisc, xserver-xorg-driver-r128, xserver-xorg-driver-radeon
diff --git a/debian/rules b/debian/rules
index 2a2a1be..1d144fe 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: