debian/changelog | 12 ++++++++++-- debian/inputabiver | 1 + debian/rules | 6 ++++-- debian/serverabiver | 1 - debian/videoabiver | 1 + debian/xsfbs/xsfbs.mk | 11 +++++++---- 6 files changed, 23 insertions(+), 9 deletions(-)
New commits: commit 671d61ef525ccb543d347d71e46140b09e9cf2ed Author: David Nusinow <[EMAIL PROTECTED]> Date: Tue Feb 27 22:30:13 2007 -0500 Fix overzealous substitution on *abiver installations diff --git a/debian/rules b/debian/rules index 56dc019..be3f2bf 100755 --- a/debian/rules +++ b/debian/rules @@ -107,9 +107,9 @@ binary-arch: build install dh_install --sourcedir=debian/tmp --list-missing $(INSTALL) -d $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg $(INSTALL) -m644 $(CURDIR)/debian/videoabiver \ - $(CURDIR)/debian/xvideo-xorg-dev/usr/share/xvideo-xorg/videoabiver + $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg/videoabiver $(INSTALL) -m644 $(CURDIR)/debian/inputabiver \ - $(CURDIR)/debian/xinput-xorg-dev/usr/share/xinput-xorg/inputabiver + $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg/inputabiver $(INSTALL) -m644 $(CURDIR)/debian/serverminver \ $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg/serverminver $(INSTALL) -m 755 -d debian/xserver-xorg-core/usr/share/bug/xserver-xorg-core 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. diff --git a/debian/changelog b/debian/changelog index 1261650..902ca8c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xorg-server (2:1.2.0-5) UNRELEASED; urgency=low + + * 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. + + -- David Nusinow <[EMAIL PROTECTED]> Tue, 27 Feb 2007 21:48:19 -0500 + xorg-server (2:1.2.0-4) experimental; urgency=low [ Julien Cristau ] diff --git a/debian/inputabiver b/debian/inputabiver new file mode 100644 index 0000000..d3827e7 --- /dev/null +++ b/debian/inputabiver @@ -0,0 +1 @@ +1.0 diff --git a/debian/rules b/debian/rules index 6cbea3d..56dc019 100755 --- a/debian/rules +++ b/debian/rules @@ -106,8 +106,10 @@ binary-arch: build install dh_installchangelogs dh_install --sourcedir=debian/tmp --list-missing $(INSTALL) -d $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg - $(INSTALL) -m644 $(CURDIR)/debian/serverabiver \ - $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg/serverabiver + $(INSTALL) -m644 $(CURDIR)/debian/videoabiver \ + $(CURDIR)/debian/xvideo-xorg-dev/usr/share/xvideo-xorg/videoabiver + $(INSTALL) -m644 $(CURDIR)/debian/inputabiver \ + $(CURDIR)/debian/xinput-xorg-dev/usr/share/xinput-xorg/inputabiver $(INSTALL) -m644 $(CURDIR)/debian/serverminver \ $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg/serverminver $(INSTALL) -m 755 -d debian/xserver-xorg-core/usr/share/bug/xserver-xorg-core diff --git a/debian/serverabiver b/debian/serverabiver deleted file mode 100644 index 9459d4b..0000000 --- a/debian/serverabiver +++ /dev/null @@ -1 +0,0 @@ -1.1 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 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 2ed49f6ed8a1ea58fce697930b8564c495fcf9be Author: David Nusinow <[EMAIL PROTECTED]> Date: Wed Feb 21 22:31:41 2007 -0500 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 0ced878..1261650 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.2.0-4) UNRELEASED; urgency=low +xorg-server (2:1.2.0-4) experimental; urgency=low [ Julien Cristau ] * Don't strip modules when DEB_BUILD_OPTIONS contains nostrip. Thanks, @@ -12,7 +12,7 @@ xorg-server (2:1.2.0-4) UNRELEASED; urge is to better denote what they actually are. * Bump the serverminver to 2:1.2.0-4 because of this change - -- David Nusinow <[EMAIL PROTECTED]> Wed, 21 Feb 2007 21:48:15 -0500 + -- David Nusinow <[EMAIL PROTECTED]> Wed, 21 Feb 2007 21:53:51 -0500 xorg-server (2:1.2.0-3) experimental; urgency=low -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]