debian/README.source | 2 +- debian/changelog | 15 +++++++++++++++ debian/control | 8 +++----- debian/rules | 10 +++++----- debian/xsfbs/xsfbs.mk | 35 ++++++++++++++++++++++------------- 5 files changed, 46 insertions(+), 24 deletions(-)
New commits: commit a501ca3501ecfefc6e31ec3ea374c74e8c0606a6 Author: Cyril Brulebois <[email protected]> Date: Wed Oct 13 01:05:56 2010 +0200 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index b615080..f1e87bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xserver-xorg-input-keyboard (1:1.4.0-3) UNRELEASED; urgency=low +xserver-xorg-input-keyboard (1:1.4.0-3) experimental; urgency=low * Build against Xserver 1.9.1 rc1. - -- Cyril Brulebois <[email protected]> Wed, 13 Oct 2010 01:04:54 +0200 + -- Cyril Brulebois <[email protected]> Wed, 13 Oct 2010 01:05:51 +0200 xserver-xorg-input-keyboard (1:1.4.0-2) unstable; urgency=medium commit b15c17928e076ee7ae17a03918b9b4aeb2e0d9da Author: Cyril Brulebois <[email protected]> Date: Wed Oct 13 01:05:49 2010 +0200 Build against Xserver 1.9.1 rc1. diff --git a/debian/changelog b/debian/changelog index a909e16..b615080 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-input-keyboard (1:1.4.0-3) UNRELEASED; urgency=low + + * Build against Xserver 1.9.1 rc1. + + -- Cyril Brulebois <[email protected]> Wed, 13 Oct 2010 01:04:54 +0200 + xserver-xorg-input-keyboard (1:1.4.0-2) unstable; urgency=medium * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no diff --git a/debian/control b/debian/control index a4bcdb3..3861835 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: David Nusinow <[email protected]>, Drew Parsons <[email protected] Build-Depends: debhelper (>= 5), pkg-config, - xserver-xorg-dev (>= 2:1.7.6.901), + xserver-xorg-dev (>= 2:1.9.0.901), x11proto-kb-dev, x11proto-input-dev, x11proto-core-dev, commit cc0e5e9524e743b055752dfbc1ec87d610f9cf52 Author: Julien Cristau <[email protected]> Date: Sun May 23 23:16:12 2010 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index fe23542..a909e16 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -xserver-xorg-input-keyboard (1:1.4.0-2) UNRELEASED; urgency=low +xserver-xorg-input-keyboard (1:1.4.0-2) unstable; urgency=medium * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! * Remove myself from Uploaders * Update xsfbs, use new ${xinpdriver:Depends} substvar. - -- Julien Cristau <[email protected]> Sat, 23 Jan 2010 02:10:22 +0100 + -- Julien Cristau <[email protected]> Sun, 23 May 2010 23:15:52 +0200 xserver-xorg-input-keyboard (1:1.4.0-1) experimental; urgency=low commit 5db192a72477f3a7749d3e64cb21dd95a9a8171e Author: Julien Cristau <[email protected]> Date: Sun May 23 23:15:47 2010 +0200 Update xsfbs, use new ${xinpdriver:Depends} substvar. diff --git a/debian/changelog b/debian/changelog index 2ef7e19..fe23542 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ xserver-xorg-input-keyboard (1:1.4.0-2) UNRELEASED; urgency=low * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! * Remove myself from Uploaders + * Update xsfbs, use new ${xinpdriver:Depends} substvar. -- Julien Cristau <[email protected]> Sat, 23 Jan 2010 02:10:22 +0100 diff --git a/debian/control b/debian/control index dcd951d..a4bcdb3 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: David Nusinow <[email protected]>, Drew Parsons <[email protected] Build-Depends: debhelper (>= 5), pkg-config, - xserver-xorg-dev (>= 2:1.7), + xserver-xorg-dev (>= 2:1.7.6.901), x11proto-kb-dev, x11proto-input-dev, x11proto-core-dev, @@ -22,7 +22,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-keyboar Package: xserver-xorg-input-kbd 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 -- keyboard input driver commit ae3a3de1507eb6dbc6da813d919a92b52e7f3da1 Author: Mikhail Gusarov <[email protected]> Date: Fri May 7 18:58:55 2010 +0700 Remove duplicate xorg.fd.o URL and confusing mailing list URL from debian/control diff --git a/debian/control b/debian/control index 0dfe767..dcd951d 100644 --- a/debian/control +++ b/debian/control @@ -30,7 +30,5 @@ Description: X.Org X server -- keyboard input driver . More information about X.Org can be found at: <URL:http://www.X.org> - <URL:http://xorg.freedesktop.org> - <URL:http://lists.freedesktop.org/mailman/listinfo/xorg> . This package is built from the X.org xf86-input-keyboard driver module. commit 81fc271788605b52e85c2d11635a0371fb44605e Author: Cyril Brulebois <[email protected]> Date: Sun May 2 02:14:45 2010 +0200 Add xorg-driver-{video,input} to Provides. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 77c4a39..3c59c20 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -261,8 +261,8 @@ 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) -VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) -INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) +VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video +INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input ifeq ($(PACKAGE),) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) 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. commit f27aa889023428fba52e273aa5d7694102e3e325 Author: Julien Cristau <[email protected]> Date: Sat Jan 23 01:46:31 2010 +0100 Remove myself from Uploaders diff --git a/debian/changelog b/debian/changelog index 85ab0fa..0801a7e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ xserver-xorg-input-keyboard (1:1.4.0-1) UNRELEASED; urgency=low [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! + * Remove myself from Uploaders -- Timo Aaltonen <[email protected]> Sat, 05 Dec 2009 01:49:03 +0200 diff --git a/debian/control b/debian/control index 16e9202..0dfe767 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xserver-xorg-input-keyboard Section: x11 Priority: optional Maintainer: Debian X Strike Force <[email protected]> -Uploaders: David Nusinow <[email protected]>, Drew Parsons <[email protected]>, Julien Cristau <[email protected]>, Brice Goglin <[email protected]> +Uploaders: David Nusinow <[email protected]>, Drew Parsons <[email protected]>, Brice Goglin <[email protected]> Build-Depends: debhelper (>= 5), pkg-config, commit 43f560721146e513230863083489805abfe2e56c Author: Julien Cristau <[email protected]> Date: Sat Jan 16 16:48:43 2010 +0000 Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! diff --git a/debian/changelog b/debian/changelog index a56b0b0..85ab0fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,14 @@ xserver-xorg-input-keyboard (1:1.4.0-1) UNRELEASED; urgency=low + [ Timo Aaltonen ] * New upstream release. * Bump the build-dep on xutils-dev (>= 1:7.5~1). * Build against Xserver 1.7. + [ Julien Cristau ] + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! + -- Timo Aaltonen <[email protected]> Sat, 05 Dec 2009 01:49:03 +0200 xserver-xorg-input-keyboard (1:1.3.2-4) unstable; urgency=low diff --git a/debian/rules b/debian/rules index dbcb505..2bb43a0 100755 --- a/debian/rules +++ b/debian/rules @@ -38,12 +38,12 @@ configure: $(STAMP_DIR)/patch build: build-stamp build-stamp: configure - mkdir -p obj-$(DEB_BUILD_GNU_TYPE) - cd obj-$(DEB_BUILD_GNU_TYPE) && \ + mkdir -p build + cd build && \ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info $(confflags) \ CFLAGS="$(CFLAGS)" - cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) + cd build && $(MAKE) >$@ clean: xsfclean @@ -55,7 +55,7 @@ clean: xsfclean rm -f */config.cache */config.log */config.status rm -f conftest* */conftest* rm -rf autom4te.cache */autom4te.cache - rm -rf obj-* + rm -rf build rm -f aclocal.m4 config.guess config.sub config.h.in configure rm -f depcomp install-sh ltmain.sh missing mkinstalldirs rm -f $$(find -name Makefile.in) @@ -68,7 +68,7 @@ install: build dh_clean -k dh_installdirs - cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install # Build architecture-dependent files here. binary-arch: build install serverabi -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
