debian/changelog | 6 ++++--
debian/control | 2 +-
debian/rules | 2 +-
debian/xsfbs/xsfbs.mk | 15 +++++++++++++++
4 files changed, 21 insertions(+), 4 deletions(-)
New commits:
commit 00b9bcac3bcfb0cb112e7736790e28da4f0f095e
Author: David Nusinow <[EMAIL PROTECTED]>
Date: Tue Feb 20 22:28:16 2007 -0500
Generate server dependencies automatically from the ABI
diff --git a/debian/changelog b/debian/changelog
index 15e73d7..92da2e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
xserver-xorg-video-apm (1:1.1.1-5) UNRELEASED; urgency=low
- * Bump xserver ABI metadata to 1.1 for use with server 1.2
* Pull minor updates from upstream
+ * Generate server dependencies automatically from the ABI
+ * Generate server dependencies automatically from the ABI
+ * Generate server dependencies automatically from the ABI
- -- David Nusinow <[EMAIL PROTECTED]> Sun, 11 Feb 2007 20:46:59 -0500
+ -- David Nusinow <[EMAIL PROTECTED]> Tue, 20 Feb 2007 22:19:09 -0500
xserver-xorg-video-apm (1:1.1.1-4) UNRELEASED; urgency=low
diff --git a/debian/control b/debian/control
index 0134af2..258ca99 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.7.2
Package: xserver-xorg-video-apm
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 -- APM display driver
diff --git a/debian/rules b/debian/rules
index ce811c9..dae2ba5 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]
