debian/changelog | 5 ++---
debian/control | 4 ++--
debian/rules | 2 +-
debian/xsfbs/xsfbs.mk | 15 +++++++++++++++
4 files changed, 20 insertions(+), 6 deletions(-)
New commits:
commit abef986bdad61e7ad729eaebb5dbc8bc53cdbe7e
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sun Feb 18 18:08:12 2007 +0100
Generate the dependency on xserver-xorg-core automatically.
diff --git a/debian/changelog b/debian/changelog
index e9b203f..4d660b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,10 +2,9 @@ xserver-xorg-input-citron (1:2.2.0-3) UN
* Add link to xserver-xorg-core bug script, so that bugreports contain
the user's config and log files.
- * Bump dependency on xserver-xorg-core to >= 2:1.1.1-11, as previous
- versions don't have the bug script.
+ * Generate the dependency on xserver-xorg-core automatically.
- -- Julien Cristau <[EMAIL PROTECTED]> Tue, 7 Nov 2006 07:30:35 +0100
+ -- Julien Cristau <[EMAIL PROTECTED]> Sun, 18 Feb 2007 18:07:51 +0100
xserver-xorg-input-citron (1:2.2.0-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index e2eefff..5681fb2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ 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]>
-Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.1.1-1),
x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev
+Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.2.0-3),
x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev
Standards-Version: 3.7.2
Package: xserver-xorg-input-citron
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, xserver-xorg-core (>= 2:1.1.1-11)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
Provides: xserver-xorg-input
Replaces: xserver-xorg (<< 6.8.2-35)
Description: X.Org X server -- Citron input driver
diff --git a/debian/rules b/debian/rules
index d194345..a6eac00 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]
