debian/xsfbs/xsfbs.mk | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+)
New commits:
commit 72811b4cede7275a35d36b44bcb5f431a8aa0133
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Fri Mar 2 20:28:15 2007 +0100
Fix copy/paste typo in the input driver provides.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 0343aec..d88c6db 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -359,7 +359,7 @@ VIDEOABI = $(shell cat /usr/share/xserve
INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
-INPDRIVER_PROVIDES = xserver-xorg-video-$(INPUTABI)
+INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
ifeq ($(PACKAGE),)
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
endif
commit 4a943db2564c4f573ce2f5f676a841267e961f16
Author: David Nusinow <[EMAIL PROTECTED]>
Date: Thu Mar 1 22:06:04 2007 -0500
Fix one missed bit from the serverabiver -> serverminver rename
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index cfc5496..0343aec 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -366,7 +366,7 @@ endif
.PHONY: serverabi
serverabi:
-ifeq ($(SERVERABI),)
+ifeq ($(SERVERMINVERS),)
@echo error: xserver-xorg-dev needs to be installed
@exit 1
else
commit 1344bb9deda5ba54215d0ec5b164706999236b0b
Author: David Nusinow <[EMAIL PROTECTED]>
Date: Wed Feb 28 23:08:17 2007 -0500
Fix typo that prevented the input abi versioning from working.
Good catch Julien
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 5e8cf41..cfc5496 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -356,7 +356,7 @@ debian/shlibs.local:
SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
-INPUTABI = $(shell cat /usr/share/xserver-xorg/driverabiver 2>/dev/null)
+INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
INPDRIVER_PROVIDES = xserver-xorg-video-$(INPUTABI)
commit a0c9602f38e9d47d7a76b7b345e7e8bbb29b752f
Author: David Nusinow <[EMAIL PROTECTED]>
Date: Tue Feb 27 21:50:20 2007 -0500
Add support for X server input ABI versioning
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index d54ffd3..5e8cf41 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -355,9 +355,11 @@ debian/shlibs.local:
cat debian/*.shlibs >$@
SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
-SERVERABI = $(shell cat /usr/share/xserver-xorg/serverabiver 2>/dev/null)
+VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
+INPUTABI = $(shell cat /usr/share/xserver-xorg/driverabiver 2>/dev/null)
SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
-DRIVER_PROVIDES = xserver-xorg-video-$(SERVERABI)
+VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
+INPDRIVER_PROVIDES = xserver-xorg-video-$(INPUTABI)
ifeq ($(PACKAGE),)
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
endif
@@ -369,7 +371,8 @@ ifeq ($(SERVERABI),)
@exit 1
else
echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars
- echo "xviddriver:Provides=$(DRIVER_PROVIDES)" >>
debian/$(PACKAGE).substvars
+ echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >>
debian/$(PACKAGE).substvars
+ echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >>
debian/$(PACKAGE).substvars
endif
include debian/xsfbs/xsfbs-autoreconf.mk
commit 00fc799ec3107c0c29286b75e780bef82c1fa137
Author: David Nusinow <[EMAIL PROTECTED]>
Date: Wed Feb 21 22:47:30 2007 -0500
Fix name of serverminver
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index ae767b1..d54ffd3 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -354,7 +354,7 @@ # Generate the shlibs.local file.
debian/shlibs.local:
cat debian/*.shlibs >$@
-SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminvers 2>/dev/null)
+SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
SERVERABI = $(shell cat /usr/share/xserver-xorg/serverabiver 2>/dev/null)
SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
DRIVER_PROVIDES = xserver-xorg-video-$(SERVERABI)
commit dacefd5a6bb9f786c78f35358273e3214c7492e9
Author: David Nusinow <[EMAIL PROTECTED]>
Date: Wed Feb 21 21:37:52 2007 -0500
Update serverabi generation to also account for driver Provides
* Have the drivers use the file serverminver instead of serverabiver in
order
to generate the versioned dependency on the server. This is clearer
naming.
* Use serverabiver to actually store the server's video ABI version. This
is used to generate the Provides: line for drivers so the server can
depend on them properly. This goes in to the substvar
xviddriver:Provides.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index dbb2872..ae767b1 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -354,8 +354,10 @@ # Generate the shlibs.local file.
debian/shlibs.local:
cat debian/*.shlibs >$@
+SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminvers 2>/dev/null)
SERVERABI = $(shell cat /usr/share/xserver-xorg/serverabiver 2>/dev/null)
-SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERABI))
+SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
+DRIVER_PROVIDES = xserver-xorg-video-$(SERVERABI)
ifeq ($(PACKAGE),)
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
endif
@@ -367,6 +369,7 @@ ifeq ($(SERVERABI),)
@exit 1
else
echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars
+ echo "xviddriver:Provides=$(DRIVER_PROVIDES)" >>
debian/$(PACKAGE).substvars
endif
include debian/xsfbs/xsfbs-autoreconf.mk
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]
