Hi David, and thanks for dealing with this!
On Wed, Feb 28, 2007 at 04:55:26 +0100, David Nusinow wrote:
> commit 220d8bcc0f7be464d87298f781c026ee34021778
> Author: David Nusinow <[EMAIL PROTECTED]>
> Date: Tue Feb 27 21:53:39 2007 -0500
>
> * Add input ABI versioning metadata. Rename serverabiver file to
> videoabiver, and add inputabiver. Bump serverminver to 2:1.2.0-5 to deal
> with this change.
>
> --- /dev/null
> +++ b/debian/inputabiver
> @@ -0,0 +1 @@
> +1.0
We still use 'xserver-xorg-input', and this will still be the case with
xorg-server 1.3. Not sure how to deal with this.
> diff --git a/debian/videoabiver b/debian/videoabiver
> new file mode 100644
> index 0000000..9459d4b
> --- /dev/null
> +++ b/debian/videoabiver
> @@ -0,0 +1 @@
> +1.1
>
This should be "1.0".
> 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)
We should probably use inputabiver instead of driverabiver :)
> SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
> -DRIVER_PROVIDES = xserver-xorg-video-$(SERVERABI)
> +VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
> +INPDRIVER_PROVIDES = xserver-xorg-video-$(INPUTABI)
s/video/input/, but same problem as above, this doesn't cover the
current ABI (xserver-xorg-input without a suffix).
Oh well, input drivers can just keep the hardcoded Provides until the
next major ABI bump.
> 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
>
Cheers,
Julien
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
