xserver-xorg-input-evdev: Changes to 'debian-unstable'
debian/README.source | 2 -
debian/changelog | 9 +++++++
debian/control | 4 +--
debian/local/05-evdev.conf | 39 --------------------------------
debian/rules | 6 ----
debian/xserver-xorg-input-evdev.install | 1
debian/xsfbs/xsfbs.mk | 31 ++++++++++++++++---------
7 files changed, 34 insertions(+), 58 deletions(-)
New commits:
commit 9ebeafb521e62e964397c2d4c0ca830489ce59e4
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Apr 17 00:41:04 2010 +0200
Update to new xsfbs, use ${xinpdriver:Depends} in debian/control.
diff --git a/debian/changelog b/debian/changelog
index 7450b8e..46fa594 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-input-evdev (1:2.3.2-6) UNRELEASED; urgency=low
* Drop 05-evdev.conf, this moved to the server.
* Build-Depend on xserver-xorg-dev 1.7.6.901.
* Sanitize manpage installation.
+ * Update to new xsfbs, use ${xinpdriver:Depends} in debian/control.
-- Julien Cristau <jcristau@debian.org> Sat, 17 Apr 2010 00:35:44 +0200
diff --git a/debian/control b/debian/control
index 448573b..9ed92d8 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evdev.g
Package: xserver-xorg-input-evdev
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 -- evdev input driver
commit 0938db63064936ce0765577b6b62feada4f40441
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Apr 17 00:39:22 2010 +0200
Sanitize manpage installation.
diff --git a/debian/changelog b/debian/changelog
index c99e7f2..7450b8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-input-evdev (1:2.3.2-6) UNRELEASED; urgency=low
* Drop 05-evdev.conf, this moved to the server.
* Build-Depend on xserver-xorg-dev 1.7.6.901.
+ * Sanitize manpage installation.
-- Julien Cristau <jcristau@debian.org> Sat, 17 Apr 2010 00:35:44 +0200
diff --git a/debian/rules b/debian/rules
index a97788b..3e2e15b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,7 +80,7 @@ binary-arch: build install serverabi
dh_installdocs
dh_installchangelogs ChangeLog
- dh_install --sourcedir=debian/tmp --list-missing --exclude=evdev_drv.la --exclude=usr/share/man/man4
+ dh_install --sourcedir=debian/tmp --list-missing --exclude=evdev_drv.la
dh_installman
dh_link
dh_strip
diff --git a/debian/xserver-xorg-input-evdev.install b/debian/xserver-xorg-input-evdev.install
index 4ac2576..97e3c20 100644
--- a/debian/xserver-xorg-input-evdev.install
+++ b/debian/xserver-xorg-input-evdev.install
@@ -1 +1,2 @@
usr/lib/xorg/modules/input/*.so
+usr/share/man
commit 458a8cf158fc8b1d35bd6011a82ad75a5e997f78
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Apr 17 00:37:39 2010 +0200
Update for new xorg.conf.d
* Drop 05-evdev.conf, this moved to the server.
* Build-Depend on xserver-xorg-dev 1.7.6.901.
diff --git a/debian/changelog b/debian/changelog
index b2202dd..c99e7f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-evdev (1:2.3.2-6) UNRELEASED; urgency=low
+
+ * Drop 05-evdev.conf, this moved to the server.
+ * Build-Depend on xserver-xorg-dev 1.7.6.901.
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 17 Apr 2010 00:35:44 +0200
+
xserver-xorg-input-evdev (1:2.3.2-5) unstable; urgency=low
* Install 05-evdev.conf in /usr/lib/X11/xorg.conf.d.
diff --git a/debian/control b/debian/control
index bee2453..448573b 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
debhelper (>= 5.0.0),
pkg-config,
quilt,
- xserver-xorg-dev (>= 2:1.7),
+ xserver-xorg-dev (>= 2:1.7.6.901),
x11proto-core-dev,
x11proto-randr-dev,
x11proto-input-dev,
diff --git a/debian/local/05-evdev.conf b/debian/local/05-evdev.conf
deleted file mode 100644
index 0eb9e47..0000000
--- a/debian/local/05-evdev.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-# Catchall classes for input devices
-# We don't simply match on any device since that also adds accelerometers
-# and other devices that we don't really want to use. The list below
-# matches everything but joysticks.
-
-Section "InputClass"
- Identifier "evdev pointer catchall"
- MatchIsPointer "on"
- MatchDevicePath "/dev/input/event*"
- Driver "evdev"
-EndSection
-
-Section "InputClass"
- Identifier "evdev keyboard catchall"
- MatchIsKeyboard "on"
- MatchDevicePath "/dev/input/event*"
- Driver "evdev"
-EndSection
-
-Section "InputClass"
- Identifier "evdev touchpad catchall"
- MatchIsTouchpad "on"
- MatchDevicePath "/dev/input/event*"
- Driver "evdev"
-EndSection
-
-Section "InputClass"
- Identifier "evdev tablet catchall"
- MatchIsTablet "on"
- MatchDevicePath "/dev/input/event*"
- Driver "evdev"
-EndSection
-
-Section "InputClass"
- Identifier "evdev touchscreen catchall"
- MatchIsTouchscreen "on"
- MatchDevicePath "/dev/input/event*"
- Driver "evdev"
-EndSection
diff --git a/debian/rules b/debian/rules
index 0acce07..a97788b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -81,10 +81,6 @@ binary-arch: build install serverabi
dh_installdocs
dh_installchangelogs ChangeLog
dh_install --sourcedir=debian/tmp --list-missing --exclude=evdev_drv.la --exclude=usr/share/man/man4
- install -d debian/xserver-xorg-input-evdev/usr/lib/X11/xorg.conf.d
- install -m 644 debian/local/05-evdev.conf debian/xserver-xorg-input-evdev/usr/lib/X11/xorg.conf.d
- install -d debian/xserver-xorg-input-evdev-udeb/usr/lib/X11/xorg.conf.d
- install -m 644 debian/local/05-evdev.conf debian/xserver-xorg-input-evdev-udeb/usr/lib/X11/xorg.conf.d
dh_installman
dh_link
dh_strip
commit b045afbd8277ad0c44e29d7c45802053c4335ccd
Author: Julien Cristau <jcristau@debian.org>
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 <jcristau@debian.org>
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 <kibi@debian.org>
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.
Reply to: