debian/README.source | 2 +- debian/changelog | 8 ++++++++ debian/control | 4 ++-- debian/local/10-joystick.conf | 6 ------ debian/local/50-joystick.conf | 6 ++++++ debian/rules | 4 ++-- debian/xsfbs/xsfbs.mk | 31 ++++++++++++++++++++----------- 7 files changed, 39 insertions(+), 22 deletions(-)
New commits: commit 8c6dcc61972b3987c532f1079570358dee2f9892 Author: Julien Cristau <[email protected]> Date: Sat Apr 17 01:53:28 2010 +0200 Use new xsfbs and ${xinpdriver:Depends} variable. diff --git a/debian/changelog b/debian/changelog index 5171b64..db5cd6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xserver-xorg-input-joystick (1:1.5.0-4) UNRELEASED; urgency=low * Bump xserver-xorg-dev build-dep, move 10-joystick.conf to 50-joystick.conf, and install it in /usr/share/X11/xorg.conf.d. + * Use new xsfbs and ${xinpdriver:Depends} variable. -- Julien Cristau <[email protected]> Sat, 17 Apr 2010 01:46:58 +0200 diff --git a/debian/control b/debian/control index 3a0000b..57c01bc 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-joystic Package: xserver-xorg-input-joystick Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}, +Depends: ${shlibs:Depends}, ${misc:Depends}, ${xinpdriver:Depends}, Provides: ${xinpdriver:Provides} Replaces: xserver-xorg (<< 6.8.2-35) Description: X.Org X server -- joystick input driver commit a3baacc6376a4f7e9956e7d6ef12a10cdec75a15 Author: Julien Cristau <[email protected]> Date: Sat Apr 17 01:49:56 2010 +0200 Updates for new xorg.conf.d Bump xserver-xorg-dev build-dep, move 10-joystick.conf to 50-joystick.conf, and install it in /usr/share/X11/xorg.conf.d. diff --git a/debian/changelog b/debian/changelog index 912d81a..5171b64 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-input-joystick (1:1.5.0-4) UNRELEASED; urgency=low + + * Bump xserver-xorg-dev build-dep, move 10-joystick.conf to + 50-joystick.conf, and install it in /usr/share/X11/xorg.conf.d. + + -- Julien Cristau <[email protected]> Sat, 17 Apr 2010 01:46:58 +0200 + xserver-xorg-input-joystick (1:1.5.0-3) unstable; urgency=low * Install 10-joystick.conf. (LP: #546933) diff --git a/debian/control b/debian/control index f74e17e..3a0000b 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: automake, libtool, xutils-dev, - xserver-xorg-dev (>= 2:1.7), + xserver-xorg-dev (>= 2:1.7.6.901), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev, diff --git a/debian/local/10-joystick.conf b/debian/local/10-joystick.conf deleted file mode 100644 index 95a295a..0000000 --- a/debian/local/10-joystick.conf +++ /dev/null @@ -1,6 +0,0 @@ -Section "InputClass" - Identifier "joystick catchall" - MatchIsJoystick "on" - MatchDevicePath "/dev/input/event*" - Driver "joystick" -EndSection diff --git a/debian/local/50-joystick.conf b/debian/local/50-joystick.conf new file mode 100644 index 0000000..95a295a --- /dev/null +++ b/debian/local/50-joystick.conf @@ -0,0 +1,6 @@ +Section "InputClass" + Identifier "joystick catchall" + MatchIsJoystick "on" + MatchDevicePath "/dev/input/event*" + Driver "joystick" +EndSection diff --git a/debian/rules b/debian/rules index ddb12a9..82cb793 100755 --- a/debian/rules +++ b/debian/rules @@ -78,8 +78,8 @@ binary-arch: build install serverabi dh_installdocs dh_installchangelogs ChangeLog dh_install --sourcedir=debian/tmp --list-missing --exclude=joystick_drv.la --exclude=usr/share/man/man4 - install -d debian/xserver-xorg-input-joystick/usr/lib/X11/xorg.conf.d - install -m 644 debian/local/10-joystick.conf debian/xserver-xorg-input-joystick/usr/lib/X11/xorg.conf.d + install -d debian/xserver-xorg-input-joystick/`pkg-config --variable=sysconfigdir xorg-server` + install -m 644 debian/local/50-joystick.conf debian/xserver-xorg-input-joystick/`pkg-config --variable=sysconfigdir xorg-server` dh_installman dh_link dh_strip commit b045afbd8277ad0c44e29d7c45802053c4335ccd Author: Julien Cristau <[email protected]> Date: Fri Apr 16 22:14:46 2010 +0200 Update serverabi rule for xserver 1.7.6.901 Add new variables ${xviddriver:Depends} and ${xinpdriver:Depends} for drivers. The ${xserver:Depends} variable is deprecated. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 351fea5..77c4a39 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -253,25 +253,33 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir # debian/*.prerm >$@ -SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) +# Compute dependencies for drivers +# +VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null) +INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) + +# these two can be removed post-squeeze VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 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-input-$(INPUTABI) + ifeq ($(PACKAGE),) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) endif .PHONY: serverabi serverabi: install -ifeq ($(SERVERMINVERS),) - @echo error: xserver-xorg-dev needs to be installed +ifeq ($(VIDEODEP),) + @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed' @exit 1 else - echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars + echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars + echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars + # the following is there for compatibility... echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars + echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(PACKAGE).substvars endif # vim:set noet ai sts=8 sw=8 tw=0: commit 8bd2e9b523da35493db1bd781d4ef6bfbbeb2eff Author: Julien Cristau <[email protected]> Date: Tue Apr 13 14:06:33 2010 +0200 xsfbs.mk: don't use a directory as a make target The timestamp on the directory gets updated each time a file is added in it, which causes useless rebuilds. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 5e16b10..351fea5 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -110,14 +110,15 @@ $(STAMP_DIR)/stampdir: .PHONY: prepare stampdir_targets+=prepare prepare: $(STAMP_DIR)/prepare -$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts +$(STAMP_DIR)/prepare: $(STAMP_DIR)/logdir $(STAMP_DIR)/genscripts >$@ -.PHONY: log -stampdir_targets+=log -log: $(STAMP_DIR)/log -$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir +.PHONY: logdir +stampdir_targets+=logdir +logdir: $(STAMP_DIR)/logdir +$(STAMP_DIR)/logdir: $(STAMP_DIR)/stampdir mkdir -p $(STAMP_DIR)/log + >$@ # Apply all patches to the upstream source. .PHONY: patch @@ -145,7 +146,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare # Revert all patches to the upstream source. .PHONY: unpatch -unpatch: $(STAMP_DIR)/log +unpatch: $(STAMP_DIR)/logdir rm -f $(STAMP_DIR)/patch @echo -n "Unapplying patches..."; \ if $(QUILT) applied >/dev/null 2>/dev/null; then \ commit 734e3b2d1dcfe5db07cb19902617fd1212c0c186 Author: Cyril Brulebois <[email protected]> Date: Thu Apr 1 20:49:15 2010 +0200 Fix typo. diff --git a/debian/README.source b/debian/README.source index 34ab4bf..b09a1ab 100644 --- a/debian/README.source +++ b/debian/README.source @@ -25,7 +25,7 @@ just need to be pulled into git.debian.org in a "upstream-*" branch. Otherwise, the upstream sources are manually installed in the Debian git repository. -The .orig.tar.gz upstream source file could be generated this +The .orig.tar.gz upstream source file could be generated using this "upstream-*" branch in the Debian git repository but it is actually copied from upstream tarballs directly. -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
