debian/README.source | 2 -
debian/changelog | 40 +++++++++++++++++++++++--
debian/control | 17 +++-------
debian/local/50-joystick.conf | 6 +++
debian/local/66-xorg-joystick.rules | 8 -----
debian/rules | 31 ++++++++++++++-----
debian/xserver-xorg-input-joystick.postinst.in | 23 --------------
debian/xsfbs/xsfbs.mk | 31 ++++++++++++-------
8 files changed, 94 insertions(+), 64 deletions(-)
New commits:
commit add1b96574443bb877c0ff031ee317ef27591356
Author: Cyril Brulebois <k...@debian.org>
Date: Wed Oct 13 01:31:02 2010 +0200
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 59be329..2fab20e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-input-joystick (1:1.5.0-5) UNRELEASED; urgency=low
+xserver-xorg-input-joystick (1:1.5.0-5) experimental; urgency=low
* Build against Xserver 1.9.1 rc1.
- -- Cyril Brulebois <k...@debian.org> Wed, 13 Oct 2010 01:30:37 +0200
+ -- Cyril Brulebois <k...@debian.org> Wed, 13 Oct 2010 01:30:57 +0200
xserver-xorg-input-joystick (1:1.5.0-4) unstable; urgency=low
commit 1c8ca1a704fa12b17ff08e14de31ccea9691692c
Author: Cyril Brulebois <k...@debian.org>
Date: Wed Oct 13 01:30:54 2010 +0200
Build against Xserver 1.9.1 rc1.
diff --git a/debian/changelog b/debian/changelog
index b40cafb..59be329 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-joystick (1:1.5.0-5) UNRELEASED; urgency=low
+
+ * Build against Xserver 1.9.1 rc1.
+
+ -- Cyril Brulebois <k...@debian.org> Wed, 13 Oct 2010 01:30:37 +0200
+
xserver-xorg-input-joystick (1:1.5.0-4) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/control b/debian/control
index 5f466da..7612589 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
automake,
libtool,
xutils-dev,
- xserver-xorg-dev (>= 2:1.7.6.901),
+ xserver-xorg-dev (>= 2:1.9.0.901),
x11proto-input-dev,
x11proto-core-dev,
x11proto-randr-dev,
commit a52117eafe649dab4f06fe1ec7992d50d46cde30
Author: Mikhail Gusarov <dotted...@debian.org>
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 e4fcfd4..5f466da 100644
--- a/debian/control
+++ b/debian/control
@@ -31,8 +31,6 @@ Description: X.Org X server -- joystick 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-joystick driver module.
@@ -47,7 +45,5 @@ Description: X.Org X server -- joystick input driver
(development headers)
.
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-joystick driver module.
commit b72a76d72dc6ee74ac939e96b0dbe124298192bc
Author: Cyril Brulebois <k...@debian.org>
Date: Sat Apr 17 21:55:36 2010 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index e4f4f89..b40cafb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-joystick (1:1.5.0-4) UNRELEASED; urgency=low
+xserver-xorg-input-joystick (1:1.5.0-4) unstable; urgency=low
[ Julien Cristau ]
* Bump xserver-xorg-dev build-dep, move 10-joystick.conf to
@@ -9,7 +9,7 @@ xserver-xorg-input-joystick (1:1.5.0-4) UNRELEASED; urgency=low
* Add myself to Uploaders.
* Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
- -- Julien Cristau <jcris...@debian.org> Sat, 17 Apr 2010 01:46:58 +0200
+ -- Cyril Brulebois <k...@debian.org> Sat, 17 Apr 2010 21:55:28 +0200
xserver-xorg-input-joystick (1:1.5.0-3) unstable; urgency=low
commit 1d0eb2b61fd9319b910ff6e8bc6fa0627c1c2007
Author: Cyril Brulebois <k...@debian.org>
Date: Sat Apr 17 21:55:07 2010 +0200
Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
diff --git a/debian/changelog b/debian/changelog
index 342e43b..e4f4f89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xserver-xorg-input-joystick (1:1.5.0-4) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Add myself to Uploaders.
+ * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
-- Julien Cristau <jcris...@debian.org> Sat, 17 Apr 2010 01:46:58 +0200
diff --git a/debian/control b/debian/control
index 85f8957..e4fcfd4 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
x11proto-kb-dev,
libusbhid-dev [kfreebsd-amd64 kfreebsd-i386],
dpkg-dev (>= 1.14.17),
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-joystick
Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-joystick.git
commit 9b07218b967fc93d5b7d76c1ad27feae63eb4099
Author: Cyril Brulebois <k...@debian.org>
Date: Sat Apr 17 21:54:53 2010 +0200
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index db5cd6d..342e43b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
xserver-xorg-input-joystick (1:1.5.0-4) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* 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.
+ [ Cyril Brulebois ]
+ * Add myself to Uploaders.
+
-- Julien Cristau <jcris...@debian.org> Sat, 17 Apr 2010 01:46:58 +0200
xserver-xorg-input-joystick (1:1.5.0-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 57c01bc..85f8957 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-input-joystick
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusi...@debian.org>, Drew Parsons
<dpars...@debian.org>, Brice Goglin <bgog...@debian.org>
+Uploaders: David Nusinow <dnusi...@debian.org>, Drew Parsons
<dpars...@debian.org>, Brice Goglin <bgog...@debian.org>, Cyril Brulebois
<k...@debian.org>
Build-Depends:
debhelper (>= 5),
quilt,
commit 8c6dcc61972b3987c532f1079570358dee2f9892
Author: Julien Cristau <jcris...@debian.org>
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 <jcris...@debian.org> 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 <jcris...@debian.org>
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 <jcris...@debian.org> 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 <jcris...@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 <jcris...@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 <k...@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.
commit d6c62d610dcd5c8fc02901ac12e5f53e5ac938e6
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Tue Mar 30 21:49:28 2010 +0300
Release to unstable
and close a bug on LP.
diff --git a/debian/changelog b/debian/changelog
index d3ebc1b..912d81a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-input-joystick (1:1.5.0-3) UNRELEASED; urgency=low
+xserver-xorg-input-joystick (1:1.5.0-3) unstable; urgency=low
- * Install 10-joystick.conf.
+ * Install 10-joystick.conf. (LP: #546933)
* Don't install the udev rule anymore, nor depend on udev.
- -- Timo Aaltonen <tjaal...@ubuntu.com> Fri, 26 Mar 2010 10:58:22 +0200
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Tue, 30 Mar 2010 21:48:57 +0300
xserver-xorg-input-joystick (1:1.5.0-2) unstable; urgency=low
commit 087013c4e4a022aa6c4bd4986f5922bfb601c15d
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Tue Mar 30 18:02:30 2010 +0300
Don't depend on udev.
diff --git a/debian/changelog b/debian/changelog
index 923de50..d3ebc1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
xserver-xorg-input-joystick (1:1.5.0-3) UNRELEASED; urgency=low
* Install 10-joystick.conf.
- * Don't install the udev rule anymore.
+ * Don't install the udev rule anymore, nor depend on udev.
-- Timo Aaltonen <tjaal...@ubuntu.com> Fri, 26 Mar 2010 10:58:22 +0200
diff --git a/debian/control b/debian/control
index f3b870d..f74e17e 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,6 @@ 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},
- udev [linux-any],
Provides: ${xinpdriver:Provides}
Replaces: xserver-xorg (<< 6.8.2-35)
Description: X.Org X server -- joystick input driver
commit e1e68dc4ed6e672a90994f3dc871c8d0117010ee
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Tue Mar 30 16:49:22 2010 +0300
Don't install the udev rule anymore.
diff --git a/debian/changelog b/debian/changelog
index 3751eb4..923de50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-input-joystick (1:1.5.0-3) UNRELEASED; urgency=low
* Install 10-joystick.conf.
+ * Don't install the udev rule anymore.
-- Timo Aaltonen <tjaal...@ubuntu.com> Fri, 26 Mar 2010 10:58:22 +0200
diff --git a/debian/local/66-xorg-joystick.rules
b/debian/local/66-xorg-joystick.rules
deleted file mode 100644
index 4b31ec0..0000000
--- a/debian/local/66-xorg-joystick.rules
+++ /dev/null
@@ -1,8 +0,0 @@
-ACTION!="add|change", GOTO="xorg_joystick_end"
-KERNEL!="event*", GOTO="xorg_joystick_end"
-
-ENV{ID_INPUT_JOYSTICK}!="1", GOTO="xorg_joystick_end"
-
-ENV{x11_driver}="joystick"
-
-LABEL="xorg_joystick_end"
diff --git a/debian/rules b/debian/rules
index 57c6059..ddb12a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,8 +78,6 @@ 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/lib/udev/rules.d
- install -m 644 debian/local/66-xorg-joystick.rules
debian/xserver-xorg-input-joystick/lib/udev/rules.d
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
dh_installman
diff --git a/debian/xserver-xorg-input-joystick.postinst.in
b/debian/xserver-xorg-input-joystick.postinst.in
deleted file mode 100644
index b4c84c0..0000000
--- a/debian/xserver-xorg-input-joystick.postinst.in
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-set -e
-
-THIS_PACKAGE=xserver-xorg-input-joystick
-THIS_SCRIPT=postinst
-
-#INCLUDE_SHELL_LIB#
-
-case "$1" in
- configure)
- if dpkg --compare-versions "$2" lt "1:1.5.0-2"; then
- if [ `uname -s` = "Linux" ]; then
- udevadm trigger --subsystem-match=input --action=change
- fi
- fi
-esac
-
-#DEBHELPER#
-
-exit 0
-
-# vim:set ai et sw=2 ts=2 tw=80:
commit 185028aaa711520968cdf2ebb25274dbb6a862f1
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Tue Mar 30 16:46:20 2010 +0300
Fix the changelog.
diff --git a/debian/changelog b/debian/changelog
index a548d6c..3751eb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-joystick (1:1.5.0-2.1) UNRELEASED; urgency=low
+xserver-xorg-input-joystick (1:1.5.0-3) UNRELEASED; urgency=low
* Install 10-joystick.conf.
commit f251830b1cb87b8ac0bc74eb83bdd0b2a997ca21
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Fri Mar 26 11:01:40 2010 +0200
Install 10-joystick.conf.
diff --git a/debian/changelog b/debian/changelog
index 5909277..a548d6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-joystick (1:1.5.0-2.1) UNRELEASED; urgency=low
+
+ * Install 10-joystick.conf.
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Fri, 26 Mar 2010 10:58:22 +0200
+
xserver-xorg-input-joystick (1:1.5.0-2) unstable; urgency=low
[ Timo Aaltonen ]
diff --git a/debian/local/10-joystick.conf b/debian/local/10-joystick.conf
new file mode 100644
index 0000000..95a295a
--- /dev/null
+++ b/debian/local/10-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 206bada..57c6059 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,6 +80,8 @@ binary-arch: build install serverabi
dh_install --sourcedir=debian/tmp --list-missing
--exclude=joystick_drv.la --exclude=usr/share/man/man4
install -d debian/xserver-xorg-input-joystick/lib/udev/rules.d
install -m 644 debian/local/66-xorg-joystick.rules
debian/xserver-xorg-input-joystick/lib/udev/rules.d
+ 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
dh_installman
dh_link
dh_strip
commit d2619b1d93135b1c8d45ab0ebcc6965ea461da0d
Author: Brice Goglin <bgog...@debian.org>
Date: Mon Feb 22 19:41:30 2010 +0100
Prepare Changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 633b824..5909277 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-joystick (1:1.5.0-2) UNRELEASED; urgency=low
+xserver-xorg-input-joystick (1:1.5.0-2) unstable; urgency=low
[ Timo Aaltonen ]
* Install a udev rules file to autoload the driver.
@@ -14,7 +14,7 @@ xserver-xorg-input-joystick (1:1.5.0-2) UNRELEASED;
urgency=low
* Build xserver-xorg-input-joystick-dev on arch: all.
* Fix udev rules install.
- -- Robert Hooker <sarv...@ubuntu.com> Sun, 24 Jan 2010 15:06:51 -0500
+ -- Brice Goglin <bgog...@debian.org> Mon, 22 Feb 2010 19:41:10 +0100
xserver-xorg-input-joystick (1:1.5.0-1) experimental; urgency=low
commit 2a28ce4c4e7b8991b3fe881b6a6c7b99ac24ba2a
Author: Robert Hooker <sarv...@ubuntu.com>
Date: Sun Jan 24 15:33:18 2010 -0500
debian/rules: Adjust build for xserver-xorg-input-joystick-dev being arch:
all.
diff --git a/debian/rules b/debian/rules
index e45012b..206bada 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,6 +70,7 @@ install: build
cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
# Build architecture-dependent files here.
+binary-arch: DH_OPTIONS=-s
binary-arch: build install serverabi
dh_testdir
dh_testroot
@@ -91,8 +92,22 @@ binary-arch: build install serverabi
dh_builddeb
# Build architecture-independent files here.
+binary-indep: DH_OPTIONS=-i
binary-indep: build install
-# Nothing to do
+ dh_testdir
+ dh_testroot
+ dh_installdocs
+ dh_installchangelogs
+ dh_install --sourcedir=debian/tmp
+ dh_installman
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
commit fe1cbee8864dce91e4f363bf9a43a2090a34fdd4
Author: Robert Hooker <sarv...@ubuntu.com>
Date: Sun Jan 24 15:07:30 2010 -0500
debian/rules: Fix incorrect dh_install invocation.
diff --git a/debian/changelog b/debian/changelog
index 0bcce59..633b824 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,9 @@ xserver-xorg-input-joystick (1:1.5.0-2) UNRELEASED;
urgency=low
[ Robert Hooker ]
* Correct xserver-xorg-input-joystick-dev package name.
* Build xserver-xorg-input-joystick-dev on arch: all.
+ * Fix udev rules install.
- -- Robert Hooker <sarv...@ubuntu.com> Sun, 24 Jan 2010 14:30:08 -0500
+ -- Robert Hooker <sarv...@ubuntu.com> Sun, 24 Jan 2010 15:06:51 -0500
xserver-xorg-input-joystick (1:1.5.0-1) experimental; urgency=low
diff --git a/debian/rules b/debian/rules
index 1414a74..e45012b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,8 +77,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
- dh_install -d debian/xserver-xorg-input-joystick/lib/udev/rules.d
- dh_install -m 644 debian/local/66-xorg-joystick.rules
debian/xserver-xorg-input-joystick/lib/udev/rules.d
+ install -d debian/xserver-xorg-input-joystick/lib/udev/rules.d
+ install -m 644 debian/local/66-xorg-joystick.rules
debian/xserver-xorg-input-joystick/lib/udev/rules.d
dh_installman
dh_link
dh_strip
commit 82c5d555802e071320f565b9de1e7592b2f1c278
Author: Robert Hooker <sarv...@ubuntu.com>
Date: Sun Jan 24 14:43:57 2010 -0500
debian/control: Build xserver-xorg-input-joystick-dev on arch: all.
diff --git a/debian/changelog b/debian/changelog
index ccae50f..0bcce59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ xserver-xorg-input-joystick (1:1.5.0-2) UNRELEASED;
urgency=low
[ Robert Hooker ]
* Correct xserver-xorg-input-joystick-dev package name.
+ * Build xserver-xorg-input-joystick-dev on arch: all.
-- Robert Hooker <sarv...@ubuntu.com> Sun, 24 Jan 2010 14:30:08 -0500
diff --git a/debian/control b/debian/control
index 74bf8ef..f3b870d 100644
--- a/debian/control
+++ b/debian/control
@@ -39,7 +39,7 @@ Description: X.Org X server -- joystick input driver
Package: xserver-xorg-input-joystick-dev
Section: libdevel
-Architecture: any
+Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: X.Org X server -- joystick input driver (development headers)
This package provides the development headers for the joystick input
commit ccd54164c6de3f5d66c5d01805fb9d42bfb193cb
Author: Robert Hooker <sarv...@ubuntu.com>
Date: Sun Jan 24 14:31:27 2010 -0500
debian/control: Correct xserver-xorg-input-joystick-dev package name.
diff --git a/debian/changelog b/debian/changelog
index 8eb0da5..ccae50f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,10 @@ xserver-xorg-input-joystick (1:1.5.0-2) UNRELEASED; urgency=low
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
- -- Timo Aaltonen <tjaal...@ubuntu.com> Tue, 08 Dec 2009 16:32:07 +0200
+ [ Robert Hooker ]
+ * Correct xserver-xorg-input-joystick-dev package name.
+
+ -- Robert Hooker <sarv...@ubuntu.com> Sun, 24 Jan 2010 14:30:08 -0500
xserver-xorg-input-joystick (1:1.5.0-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 6ba8288..74bf8ef 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,7 @@ Description: X.Org X server -- joystick input driver
.
This package is built from the X.org xf86-input-joystick driver module.
-Package: xserver-xorg-input-joystick
+Package: xserver-xorg-input-joystick-dev
Section: libdevel
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
commit 0508bbf03d48cb742ee104beba6eb2803b637351
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Jan 16 16:48:47 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 2e69904..8eb0da5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
xserver-xorg-input-joystick (1:1.5.0-2) UNRELEASED; urgency=low
+ [ Timo Aaltonen ]
* Install a udev rules file to autoload the driver.
* Run udevadm trigger on postinst, and depend on udev [linux-any].
* Add xserver-xorg-input-joystick-dev for the header and .pc files.
+ [ Julien Cristau ]
+ * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+ good reason. Thanks, Colin Watson!
+
-- Timo Aaltonen <tjaal...@ubuntu.com> Tue, 08 Dec 2009 16:32:07 +0200
xserver-xorg-input-joystick (1:1.5.0-1) experimental; urgency=low
diff --git a/debian/rules b/debian/rules
index 532d383..1414a74 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,12 +37,12 @@ build-stamp: $(STAMP_DIR)/patch
dh_testdir
autoreconf -vfi
- 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
@@ -54,7 +54,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)
@@ -67,7 +67,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 debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1p5olc-00019c...@alioth.debian.org
