debian/changelog | 3 ++-
debian/control | 4 ++--
debian/rules | 2 +-
debian/xsfbs/xsfbs.mk | 15 +++++++++++++++
4 files changed, 20 insertions(+), 4 deletions(-)
New commits:
commit ce5c8f7cba94925b44d37db9480b1e3b516eb5f9
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sat Feb 17 17:13:43 2007 +0100
Generate the dependency on xserver-xorg-core automatically.
diff --git a/debian/changelog b/debian/changelog
index 4b85367..9897b73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,9 @@ xserver-xorg-video-i810 (2:1.7.4-1) UNRE
(closes: #408797).
* Drop all our patches, applied upstream.
* debian/rules clean needs to depend on xsfclean.
+ * Generate the dependency on xserver-xorg-core automatically.
- -- Julien Cristau <[EMAIL PROTECTED]> Mon, 12 Feb 2007 22:06:58 +0100
+ -- Julien Cristau <[EMAIL PROTECTED]> Sat, 17 Feb 2007 17:10:49 +0100
xserver-xorg-video-i810 (2:1.7.2-4) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 543b0e4..8abc49c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,13 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL
PROTECTED]>, Fabio M. Di Nitto <[EMAIL PROTECTED]>, Drew Parsons <[EMAIL
PROTECTED]>
-Build-Depends: debhelper (>= 5), quilt, pkg-config, xserver-xorg-dev (>=
2:1.1.1-1), x11proto-gl-dev, x11proto-video-dev, libgl1-mesa-dev | libgl-dev,
libxvmc-dev (>= 1:1.0.1-1), x11proto-core-dev, x11proto-fonts-dev,
x11proto-randr-dev, x11proto-render-dev, x11proto-xinerama-dev, libdrm-dev (>>
2.0) [!hurd-i386], x11proto-xf86dri-dev
+Build-Depends: debhelper (>= 5), quilt, pkg-config, xserver-xorg-dev (>=
2:1.2.0-3), x11proto-gl-dev, x11proto-video-dev, libgl1-mesa-dev | libgl-dev,
libxvmc-dev (>= 1:1.0.1-1), x11proto-core-dev, x11proto-fonts-dev,
x11proto-randr-dev, x11proto-render-dev, x11proto-xinerama-dev, libdrm-dev (>>
2.0) [!hurd-i386], x11proto-xf86dri-dev
Standards-Version: 3.7.2
XS-Vcs-Git: git://anongit.freedesktop.org/git/xorg/driver/xf86-video-intel
Package: xserver-xorg-video-i810
Architecture: alpha amd64 arm armeb armel hppa hurd-i386 i386 ia64
kfreebsd-i386 m68k mips mipsel netbsd-i386 powerpc
-Depends: ${shlibs:Depends}, ${misc:Depends}, xserver-xorg-core (>= 2:1.2.0)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
Provides: xserver-xorg-video-1.0
Replaces: xserver-xorg (<< 6.8.2-35)
Description: X.Org X server -- Intel i8xx, i9xx display driver
diff --git a/debian/rules b/debian/rules
index b140301..2d2de84 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]
