xserver-xorg-input-joystick: Changes to 'debian-unstable'
Rebased ref, commits from common ancestor: commit 9df94e21f8d79a677068f27216dac65f0251f66e Author: Andreas BollDate: Fri Nov 18 11:14:54 2016 +0100 Let uscan verify tarball signatures. diff --git a/debian/changelog b/debian/changelog index 24a96da..5272c5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-input-joystick (1:1.6.3-2) UNRELEASED; urgency=medium + + * Let uscan verify tarball signatures. + + -- Andreas Boll Fri, 18 Nov 2016 14:42:06 +0100 + xserver-xorg-input-joystick (1:1.6.3-1) unstable; urgency=medium * New upstream release. diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc new file mode 100644 index 000..767d86a --- /dev/null +++ b/debian/upstream/signing-key.asc @@ -0,0 +1,23 @@ +-BEGIN PGP PUBLIC KEY BLOCK- + +mQGiBD8b0wYRBACph9kRJmP+4+JGsCgFlFoy4vFO0DCG+jmkQN0n1wdInt/N/UtA +sZToO72AUmfmYizA+IEbzBrx0UnUo3w3BDmHxUWf/akZiPUz9AA/YFY4xC3MY2OK +VN2Jz6YSce4zJ5jd2ZRobHm4HuIf/8yqSCcsv7FNfrLaTNIFRs5gYYsqZwCgwmkp +RSLRc8WAnHrTWNQDaEFM2rUEAKTjrTjMN8+KGd0BxNX7HiTSqQP++nXNwAYs1oWB +Yt82YHj9SvRCqCzD1pzJQivYnlNoWDza1VeMnfdAvkdia8z4lYbO/RunXZJvra3Z +VDm+izq+uwUAyvFuEYnNz09VSqwXKT6+XW0Xtz2vHq52r6DS6mK8cGJHZ5OhrRjq +UEYxA/9STh+QfA98xtNoRcf52E/46r7IpCj440oRVc9lMfxQZrLGQNqp7sPdIhGQ +CCo2NUII5hkhdAG71kpbfSXU4Sh32p1cU1KYCAkDFfb49bKuAs+Pff8v6FGZxTdd +AinPZr4BbsYJatk818aTCnu0+s7L8jL5GPfeyuyEMKwzVBx2mLQpUGV0ZXIgSHV0 +dGVyZXIgKFdoby1UKSA8b2ZmaWNlQHdoby10Lm5ldD6IWQQTEQIAGQUCPxvTBgQL +BwMCAxUCAwMWAgECHgECF4AACgkQ4jt+cLRn8L/0RACfWo3KTMUg+uPRqA6RXxk0 +4CWjXaMAoJeIxOpZLB3RBltPnSi7PyVQIkHFuQENBD8b0wgQBACTnqOYOWYVR8O1 +D73J6nbdAeZCbXrUkyXIuyqBOdKmX/0QJmSs7Wfsa+hPfDhj6ai0Gs2C8Qg/0Pzk +86b4p9DLkf0M6RaYjUtCJBpS59xrsV6nz6xZzQa4RRdf1YJmw2tia1MMXzxbwQU2 +bKpYEm8NsGaBURMGd02EvsMN2wI2uwADBQP/e9MjVr/85XDzAlUBN8HwYW5szTyP +8ZVcQOqOmNebkTWGLvkPrBdXmxpzrWjxPolO1WcWQjUL0bN/rbdqefT65iVHJHJZ +/cpTtgGlCPhL5JTA50ltd0I13CABYWLFmswonXES/6tcglf4rr3Nri2sOrY5HggP +ipEzOo5vdKOow/qIRgQYEQIABgUCPxvTCAAKCRDiO35wtGfwv68jAKCDvL2gkrg1 +4NfV7rNc057K1nL2GgCeKApWRgGVzaOkAp0P5tQulaDD6zM= +=7uBX +-END PGP PUBLIC KEY BLOCK- diff --git a/debian/watch b/debian/watch index 4ecc980..bd68fbd 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,4 @@ #git=git://anongit.freedesktop.org/xorg/driver/xf86-input-joystick version=3 +opts="pgpsigurlmangle=s/$/.sig/" \ https://xorg.freedesktop.org/releases/individual/driver/ xf86-input-joystick-(.*)\.tar\.gz commit a83ab879e3c194e7866b94702092ea82731d90d6 Author: Timo Aaltonen Date: Fri Nov 18 12:55:19 2016 +0200 release to sid diff --git a/debian/changelog b/debian/changelog index de7fd1a..24a96da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -xserver-xorg-input-joystick (1:1.6.3-1) UNRELEASED; urgency=medium +xserver-xorg-input-joystick (1:1.6.3-1) unstable; urgency=medium * New upstream release. - support-new-api.diff: dropped, upstream - -- Timo Aaltonen Fri, 18 Nov 2016 12:39:50 +0200 + -- Timo Aaltonen Fri, 18 Nov 2016 12:46:49 +0200 xserver-xorg-input-joystick (1:1.6.2-2) unstable; urgency=medium commit db8fa2bda8c018c6693a685228d8ac52ebc25e65 Author: Timo Aaltonen Date: Fri Nov 18 12:44:34 2016 +0200 update changelogs, drop patch diff --git a/ChangeLog b/ChangeLog index 7a98074..91d70fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,64 @@ +commit de424865ece983d8da62b7f7e3d013eabac0b8b5 +Author: Peter Hutterer +Date: Fri Nov 18 08:58:35 2016 +1000 + +joystick 1.6.3 + +Signed-off-by: Peter Hutterer + +commit 60d0e9c451b3f259d524b0ddcc5c1f21a4f82293 +Author: Matthieu Herrb +Date: Sun Jul 31 12:54:14 2016 +0200 + +use xf86{Add,Remove}EnabledDevice() + +Signed-off-by: Matthieu Herrb +Reviewed-by: Adam Jackson +Signed-off-by: Peter Hutterer + +commit baf8bd4441d5dc6cdd687e066bf13cc1c3df1a41 +Author: Hans de Goede +Date: Thu Mar 13 14:49:53 2014 +0100 + +Add support for server managed fds + +Keep things simple by handling server managed fds in the common parts +of the open and close paths. + +Signed-off-by: Hans de Goede +Signed-off-by: Peter Hutterer + +commit 341d23ceaa9d5483b5318425e7308e09f8941957 +Author: Hans de Goede +Date: Thu Mar 13 14:49:52 2014 +0100 + +Add a generic jstkCloseDevice helper function + +This is a preparation patch for adding support for server managed fds. + +Signed-off-by: Hans de Goede +Signed-off-by: Peter Hutterer + +commit 6de3b75c453e4687b21f6d6acfcf87e7041c4fc5 +Author: Hans de Goede
xserver-xorg-input-joystick: Changes to 'debian-unstable'
debian/changelog| 10 ++ debian/control |7 +--- debian/patches/series |1 debian/patches/support-new-api.diff | 58 debian/watch|2 - 5 files changed, 73 insertions(+), 5 deletions(-) New commits: commit 27dba58ed7a0d8d984504f7c2ab7435ba6b83257 Author: Timo AaltonenDate: Thu Nov 17 16:35:07 2016 +0200 upload to sid diff --git a/debian/changelog b/debian/changelog index c35ed4d..0f9a13d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-input-joystick (1:1.6.2-2) UNRELEASED; urgency=medium +xserver-xorg-input-joystick (1:1.6.2-2) unstable; urgency=medium * support-new-api.diff: Fix build with xserver 1.19. * Use https URLs in Vcs-* control fields. @@ -6,7 +6,7 @@ xserver-xorg-input-joystick (1:1.6.2-2) UNRELEASED; urgency=medium * Bump Standards-Version to 3.9.8. * control: Remove Drew and Cyril from uploaders. - -- Timo Aaltonen Thu, 17 Nov 2016 16:01:10 +0200 + -- Timo Aaltonen Thu, 17 Nov 2016 16:34:47 +0200 xserver-xorg-input-joystick (1:1.6.2-1) unstable; urgency=low commit fdeda3e9ed0cff730cfb3ec39e8b666eaace5e5c Author: Timo Aaltonen Date: Thu Nov 17 16:30:32 2016 +0200 Bump Standards-Version to 3.9.8. * Bump Standards-Version to 3.9.8. * control: Remove Drew and Cyril from uploaders. diff --git a/debian/changelog b/debian/changelog index 47aa3e3..c35ed4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ xserver-xorg-input-joystick (1:1.6.2-2) UNRELEASED; urgency=medium * support-new-api.diff: Fix build with xserver 1.19. * Use https URLs in Vcs-* control fields. * Use https URL in watch file. + * Bump Standards-Version to 3.9.8. + * control: Remove Drew and Cyril from uploaders. -- Timo Aaltonen Thu, 17 Nov 2016 16:01:10 +0200 diff --git a/debian/control b/debian/control index 06dbeff..bb75dbc 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,6 @@ Source: xserver-xorg-input-joystick Section: x11 Priority: optional Maintainer: Debian X Strike Force -Uploaders: Drew Parsons , Cyril Brulebois Build-Depends: debhelper (>= 8), dh-autoreconf, @@ -15,7 +14,7 @@ Build-Depends: x11proto-randr-dev, x11proto-kb-dev, libusbhid-dev [kfreebsd-any], -Standards-Version: 3.9.4 +Standards-Version: 3.9.8 Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-input-joystick.git Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-input-joystick.git commit a79ef7a9bdeaaa0a31ed38a6c93598a4728a3501 Author: Timo Aaltonen Date: Thu Nov 17 16:29:13 2016 +0200 Use https URL in watch file. diff --git a/debian/changelog b/debian/changelog index d3bd70f..47aa3e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xserver-xorg-input-joystick (1:1.6.2-2) UNRELEASED; urgency=medium * support-new-api.diff: Fix build with xserver 1.19. * Use https URLs in Vcs-* control fields. + * Use https URL in watch file. -- Timo Aaltonen Thu, 17 Nov 2016 16:01:10 +0200 diff --git a/debian/watch b/debian/watch index ed92f0a..4ecc980 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ #git=git://anongit.freedesktop.org/xorg/driver/xf86-input-joystick version=3 -http://xorg.freedesktop.org/releases/individual/driver/ xf86-input-joystick-(.*)\.tar\.gz +https://xorg.freedesktop.org/releases/individual/driver/ xf86-input-joystick-(.*)\.tar\.gz commit 9bb757131c87b3b28cf5987de22da293cc297ba9 Author: Timo Aaltonen Date: Thu Nov 17 16:28:57 2016 +0200 Use https URLs in Vcs-* control fields. diff --git a/debian/changelog b/debian/changelog index ffed023..d3bd70f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xserver-xorg-input-joystick (1:1.6.2-2) UNRELEASED; urgency=medium * support-new-api.diff: Fix build with xserver 1.19. + * Use https URLs in Vcs-* control fields. -- Timo Aaltonen Thu, 17 Nov 2016 16:01:10 +0200 diff --git a/debian/control b/debian/control index f77f7cc..06dbeff 100644 --- a/debian/control +++ b/debian/control @@ -16,8 +16,8 @@ Build-Depends: x11proto-kb-dev, libusbhid-dev [kfreebsd-any], Standards-Version: 3.9.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 +Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-input-joystick.git +Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-input-joystick.git Package: xserver-xorg-input-joystick Architecture: any commit
xserver-xorg-input-joystick: Changes to 'debian-unstable'
debian/changelog |9 ++--- debian/control |2 +- debian/rules |3 +++ 3 files changed, 10 insertions(+), 4 deletions(-) New commits: commit b4dd8d6e652a862a3e5b66966ba7f775101421a2 Author: Julien Cristau jcris...@debian.org Date: Thu Sep 5 20:13:38 2013 +0200 Upload to unstable diff --git a/debian/changelog b/debian/changelog index 3b6d2db..fdac6af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-input-joystick (1:1.6.2-1) UNRELEASED; urgency=low +xserver-xorg-input-joystick (1:1.6.2-1) unstable; urgency=low [ Michele Cane ] * New upstream release. @@ -8,7 +8,7 @@ xserver-xorg-input-joystick (1:1.6.2-1) UNRELEASED; urgency=low [ Julien Cristau ] * Disable silent build rules. - -- Michele Cane michele.c...@gmail.com Thu, 11 Jul 2013 09:17:46 +0200 + -- Julien Cristau jcris...@debian.org Thu, 05 Sep 2013 20:13:35 +0200 xserver-xorg-input-joystick (1:1.6.1-1) unstable; urgency=low commit dab4c645ef734638d59de95528e29a5be8b37d0c Author: Julien Cristau jcris...@debian.org Date: Thu Sep 5 20:13:23 2013 +0200 Disable silent build rules. diff --git a/debian/changelog b/debian/changelog index 2cf1b41..3b6d2db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ xserver-xorg-input-joystick (1:1.6.2-1) UNRELEASED; urgency=low + [ Michele Cane ] * New upstream release. * Update dependencies. * Bump Standards-Version to 3.9.4, no changes needed. + [ Julien Cristau ] + * Disable silent build rules. + -- Michele Cane michele.c...@gmail.com Thu, 11 Jul 2013 09:17:46 +0200 xserver-xorg-input-joystick (1:1.6.1-1) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 2960979..c721608 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,8 @@ #!/usr/bin/make -f +override_dh_auto_configure: + dh_auto_configure -- --disable-silent-rules + # Install in debian/tmp to retain control through dh_install: override_dh_auto_install: dh_auto_install --destdir=debian/tmp commit ba398ae46dcf82ba816451bc2c6b828d6abe0fcd Author: Julien Cristau jcris...@debian.org Date: Thu Sep 5 20:11:06 2013 +0200 Revert Build against Xserver 1.14. Keep using 1.12 in sid for now. This reverts commit 17542d5523b284df0cbfb97b9f1a62c2e40ce5af. diff --git a/debian/changelog b/debian/changelog index d70d91a..2cf1b41 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,6 @@ xserver-xorg-input-joystick (1:1.6.2-1) UNRELEASED; urgency=low * New upstream release. * Update dependencies. * Bump Standards-Version to 3.9.4, no changes needed. - * Build against Xserver 1.14. -- Michele Cane michele.c...@gmail.com Thu, 11 Jul 2013 09:17:46 +0200 diff --git a/debian/control b/debian/control index eaa6964..f77f7cc 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: quilt, pkg-config, xutils-dev, - xserver-xorg-dev (= 2:1.14), + xserver-xorg-dev (= 2:1.9.99.2), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev, -- 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/e1vhei4-0007r7...@vasks.debian.org
xserver-xorg-input-joystick: Changes to 'debian-unstable'
ChangeLog | 168 config/50-joystick-all.conf |7 + configure.ac|8 +- debian/changelog|9 ++ debian/control |4 - man/joystick.man| 153 +--- src/Makefile.am |2 src/backend_evdev.c | 36 +++-- src/jstk.c |4 - src/jstk_axis.c | 57 ++ src/jstk_properties.c |6 - 11 files changed, 377 insertions(+), 77 deletions(-) New commits: commit 17542d5523b284df0cbfb97b9f1a62c2e40ce5af Author: Michele Cane michele.c...@gmail.com Date: Wed Jul 17 15:03:39 2013 +0200 Build against Xserver 1.14. diff --git a/debian/changelog b/debian/changelog index 2cf1b41..d70d91a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ xserver-xorg-input-joystick (1:1.6.2-1) UNRELEASED; urgency=low * New upstream release. * Update dependencies. * Bump Standards-Version to 3.9.4, no changes needed. + * Build against Xserver 1.14. -- Michele Cane michele.c...@gmail.com Thu, 11 Jul 2013 09:17:46 +0200 diff --git a/debian/control b/debian/control index f77f7cc..eaa6964 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: quilt, pkg-config, xutils-dev, - xserver-xorg-dev (= 2:1.9.99.2), + xserver-xorg-dev (= 2:1.14), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev, commit 08ba6478a987143aa25a68260ff5f9d22914876c Author: Michele Cane michele.c...@gmail.com Date: Wed Jul 17 10:31:25 2013 +0200 Bump Standards-Version to 3.9.4, no changes needed. diff --git a/debian/changelog b/debian/changelog index cb43009..2cf1b41 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xserver-xorg-input-joystick (1:1.6.2-1) UNRELEASED; urgency=low * New upstream release. * Update dependencies. + * Bump Standards-Version to 3.9.4, no changes needed. -- Michele Cane michele.c...@gmail.com Thu, 11 Jul 2013 09:17:46 +0200 diff --git a/debian/control b/debian/control index 2e03c2c..f77f7cc 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: x11proto-randr-dev, x11proto-kb-dev, libusbhid-dev [kfreebsd-any], -Standards-Version: 3.9.2 +Standards-Version: 3.9.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 33dbd746a572a306fc74a1fdba9d7af4990a10c0 Author: Michele Cane michele.c...@gmail.com Date: Wed Jul 17 10:29:02 2013 +0200 debian/control: update dependencies diff --git a/debian/changelog b/debian/changelog index 8765088..cb43009 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xserver-xorg-input-joystick (1:1.6.2-1) UNRELEASED; urgency=low * New upstream release. + * Update dependencies. -- Michele Cane michele.c...@gmail.com Thu, 11 Jul 2013 09:17:46 +0200 diff --git a/debian/control b/debian/control index 2746c2d..2e03c2c 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: quilt, pkg-config, xutils-dev, - xserver-xorg-dev (= 2:1.9.4), + xserver-xorg-dev (= 2:1.9.99.2), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev, commit a70068188857b986a218ea8f4eee6f05a9807dec Author: Michele Cane michele.c...@gmail.com Date: Thu Jul 11 09:22:16 2013 +0200 Bump changelogs. diff --git a/ChangeLog b/ChangeLog index 9270178..7a98074 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,171 @@ +commit 426c3aa3c8a2385f17e37ae73c1e78f072656027 +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Wed Jan 16 10:52:12 2013 +0100 + +joystick 1.6.2 + +Signed-off-by: Sascha Hlusiak saschahlus...@arcor.de + +commit 8f9342484afbbd26296c627497cc278f600098ac +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Wed Jan 16 11:06:39 2013 +0100 + +config: warning in default xorg.conf.d snippet: do not enable by default + +see discussion: https://bugs.gentoo.org/show_bug.cgi?id=403003 + +distributions should not ship the module enabled by default, because a lot +of users have the joystick module installed without knowing, resulting in +confusion and bad user experience when trying to play games, the more +likely usecase when plugging in a joystick. + +the default configuration only fits for a limited number of users. + +it does not make much sense to automatically enable hotplugging of the +module without explicit user consent and reviewing of the configuration. + +Signed-off-by: Sascha Hlusiak saschahlus...@arcor.de + +commit 819ba33c9d7440cd40e1e54a9b1e073ed89353a7 +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Sat Oct 6 18:28:53 2012 +0200 + +jast_axis: tune accelerated axis transformation to better work with circular axis fields + +reference:
xserver-xorg-input-joystick: Changes to 'debian-unstable'
ChangeLog | 101 ++ configure.ac |2 debian/changelog |6 ++ include/joystick-properties.h |2 man/joystick.man | 31 +++- src/jstk.c| 22 + src/jstk_key.c| 68 +++- 7 files changed, 197 insertions(+), 35 deletions(-) New commits: commit 50654bf7d6b7367bbc258ce652d71fc2151187a3 Author: Cyril Brulebois k...@debian.org Date: Tue Mar 20 21:51:43 2012 +0100 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index c90b5c0..50b352b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xserver-xorg-input-joystick (1:1.6.1-1) UNRELEASED; urgency=low +xserver-xorg-input-joystick (1:1.6.1-1) unstable; urgency=low * New upstream release. - -- Cyril Brulebois k...@debian.org Tue, 20 Mar 2012 21:50:48 +0100 + -- Cyril Brulebois k...@debian.org Tue, 20 Mar 2012 21:51:40 +0100 xserver-xorg-input-joystick (1:1.6.0-2) unstable; urgency=high commit 0a155ee183254928adee3851ab3159b4ca7e40c4 Author: Cyril Brulebois k...@debian.org Date: Tue Mar 20 21:50:59 2012 +0100 Bump changelogs. diff --git a/ChangeLog b/ChangeLog index 6b0087f..9270178 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,104 @@ +commit bdf8fd3f650789d2012ec0cc915729dd1e91346d +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Sun Mar 11 11:45:08 2012 +0100 + +joystick 1.6.1 + +Signed-off-by: Sascha Hlusiak saschahlus...@arcor.de + +commit b217fabdef1714ed4898e08de4c2a6b9cc8d4f0f +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Sun Nov 13 20:36:07 2011 +0100 + +Copy pInfo-driver to option list to fix hotplugging of keyboard device + +udev does copy the Driver line to the list of options, but when manually +specifying the driver in xorg.conf, the option Driver is unset. Because we +do hotplug a sub-device from within the core device, we need the Driver +option to be present in the list. + +This should fix archlinux bug #23577: + https://bugs.archlinux.org/task/23577 + +Thanks to Malek for coming up with a fix. + +Signed-off-by: Sascha Hlusiak cont...@saschahlusiak.de + +commit 411c1838456c055d3f911c54ed58bb11a6bf0da3 +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Sun Nov 13 18:04:25 2011 +0100 + +man: valuators are not added automatically + +commit 9bbb5775be4e7c72b6d51c20be33f5ed3fb7301a +Merge: b607c4e 7ccf3a7 +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Sun Nov 13 17:10:09 2011 +0100 + +Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/driver/xf86-input-joystick + +commit 7ccf3a75292d71104c976bf6afb389cccaac1a7d +Author: Peter Hutterer peter.hutte...@who-t.net +Date: Mon Oct 31 14:33:08 2011 +1000 + +Deal with opaque input option types. + +ABI 14 made the InputOption type opaque, move the existing code to ifdefs +and use the new function calls otherwise. + +Signed-off-by: Peter Hutterer peter.hutte...@who-t.net +Reviewed-by: Jeremy Huddleston jerem...@apple.com +Reviewed-by: Chase Douglas chase.doug...@canonical.com + +commit e0193debf8f5a72b0a06977d5dea3365ad9cafbe +Author: Peter Hutterer peter.hutte...@who-t.net +Date: Mon Oct 31 14:27:22 2011 +1000 + +Fix option type for option duplication + +xf86OptionListDuplicate() duplicates an XF86Option list, not an InputOption +list. + +Signed-off-by: Peter Hutterer peter.hutte...@who-t.net +Reviewed-by: Jeremy Huddleston jerem...@apple.com + +commit b607c4ebeea4122694f02ba87f06e4cdb23114f1 +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Sun Oct 16 00:47:52 2011 +0200 + +label buttons and axes + +Buttons are labeled Button %d, starting with 0 and representing the button in X _after_ mapping. +Mapping can be changed while running so the labels will be constant. + +Axes are labeled Axis %d, starting with 1, representing the _physical_ axis that reports the valuator +data. The raw valuators can't be dynamically mapped, the first two valuators always are labeled Rel X +and Rel Y, representing the aggregated post-calculation data from all axes. + +Signed-off-by: Sascha Hlusiak saschahlus...@arcor.de + +commit b3b62328cf3f36c20c54a298f8a921e6eef42c4d +Author: Devin J. Pohly djpohly+x...@gmail.com +Date: Sat Sep 3 19:00:07 2011 -0400 + +unify capitalization of joystick properties + +the axis keys high/low properties were inconsistently capitalized, +leading to potential confusion as to why one works but not the other. + +Signed-off-by: Devin J. Pohly djpohly+x...@gmail.com +Signed-off-by: Peter Hutterer peter.hutte...@who-t.net + +commit 204dcb86368b011824fc5006f87b9e394d03a394 +Author: Terry Lambert tlamb...@chromium.org +Date: Fri Jul 15 17:23:22 2011 -0700 + +Return proper default for
xserver-xorg-input-joystick: Changes to 'debian-unstable'
debian/changelog | 11 +-- debian/patches/0001-Fix-includes-for-kfreebsd.diff | 10 ++ debian/patches/series |1 + 3 files changed, 20 insertions(+), 2 deletions(-) New commits: commit 038bb3fc13593e305e2038d06462d1dd3593931f Author: Cyril Brulebois k...@debian.org Date: Sun Feb 19 16:05:03 2012 + Upload to unstable with high urgency. diff --git a/debian/changelog b/debian/changelog index 5fb2ce2..b56e32a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-input-joystick (1:1.6.0-2) UNRELEASED; urgency=low +xserver-xorg-input-joystick (1:1.6.0-2) unstable; urgency=high [ Julien Cristau ] * Use kfreebsd-any wildcard for libusbhid build-dep (closes: #634707). @@ -7,8 +7,9 @@ xserver-xorg-input-joystick (1:1.6.0-2) UNRELEASED; urgency=low * Add patch to deal with the uncoordinated freebsd-libs transition, thanks to Steven Chamberlain (Closes: #660395): - 0001-Fix-includes-for-kfreebsd.diff + * Set urgency to “high” for the RC bug fix. - -- Julien Cristau jcris...@debian.org Wed, 20 Jul 2011 20:51:38 +0200 + -- Cyril Brulebois k...@debian.org Sun, 19 Feb 2012 16:04:42 + xserver-xorg-input-joystick (1:1.6.0-1) unstable; urgency=low commit 69f637fbdbe36ef25059f0510cfb77e29729dc61 Author: Cyril Brulebois k...@debian.org Date: Sun Feb 19 16:04:29 2012 + Unbreak the freebsd-libs mess (Closes: #660395). diff --git a/debian/changelog b/debian/changelog index d10e79f..5fb2ce2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,13 @@ xserver-xorg-input-joystick (1:1.6.0-2) UNRELEASED; urgency=low + [ Julien Cristau ] * Use kfreebsd-any wildcard for libusbhid build-dep (closes: #634707). + [ Cyril Brulebois ] + * Add patch to deal with the uncoordinated freebsd-libs transition, +thanks to Steven Chamberlain (Closes: #660395): +- 0001-Fix-includes-for-kfreebsd.diff + -- Julien Cristau jcris...@debian.org Wed, 20 Jul 2011 20:51:38 +0200 xserver-xorg-input-joystick (1:1.6.0-1) unstable; urgency=low diff --git a/debian/patches/0001-Fix-includes-for-kfreebsd.diff b/debian/patches/0001-Fix-includes-for-kfreebsd.diff new file mode 100644 index 000..0c731b3 --- /dev/null +++ b/debian/patches/0001-Fix-includes-for-kfreebsd.diff @@ -0,0 +1,10 @@ +--- a/configure.ac b/configure.ac +@@ -98,6 +98,7 @@ + AC_CHECK_HEADERS([dev/usb/usb.h]) + AC_CHECK_HEADERS([usbhid.h dev/usb/usbhid.h],, [bsd_backend=no], + [[#if HAVE_DEV_USB_USB_H ++#include sys/types.h + #include dev/usb/usb.h + #endif + ]]) diff --git a/debian/patches/series b/debian/patches/series index e69de29..f047877 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-Fix-includes-for-kfreebsd.diff -- 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/e1rz9vl-0001wq...@vasks.debian.org
xserver-xorg-input-joystick: Changes to 'debian-unstable'
debian/changelog |6 ++ debian/control |2 +- 2 files changed, 7 insertions(+), 1 deletion(-) New commits: commit c142949988d9067b17e7af434061f6ff4371939a Author: Julien Cristau jcris...@debian.org Date: Wed Jul 20 20:52:19 2011 +0200 Use kfreebsd-any wildcard for libusbhid build-dep (closes: #634707). diff --git a/debian/changelog b/debian/changelog index 5da7c0e..d10e79f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-input-joystick (1:1.6.0-2) UNRELEASED; urgency=low + + * Use kfreebsd-any wildcard for libusbhid build-dep (closes: #634707). + + -- Julien Cristau jcris...@debian.org Wed, 20 Jul 2011 20:51:38 +0200 + xserver-xorg-input-joystick (1:1.6.0-1) unstable; urgency=low [ Julien Cristau ] diff --git a/debian/control b/debian/control index bce3955..2746c2d 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-Depends: x11proto-core-dev, x11proto-randr-dev, x11proto-kb-dev, - libusbhid-dev [kfreebsd-amd64 kfreebsd-i386], + libusbhid-dev [kfreebsd-any], Standards-Version: 3.9.2 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 -- 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/e1qjbsp-0003ek...@vasks.debian.org
xserver-xorg-input-joystick: Changes to 'debian-unstable'
debian/changelog | 11 --- debian/control |2 +- 2 files changed, 9 insertions(+), 4 deletions(-) New commits: commit 5c1a0b9efb30c387d29b1c0374a1be7a0a098cee Author: Cyril Brulebois k...@debian.org Date: Thu Jun 30 01:15:35 2011 +0200 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index de8bf32..5da7c0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-input-joystick (1:1.6.0-1) UNRELEASED; urgency=low +xserver-xorg-input-joystick (1:1.6.0-1) unstable; urgency=low [ Julien Cristau ] * New upstream release: @@ -7,7 +7,7 @@ xserver-xorg-input-joystick (1:1.6.0-1) UNRELEASED; urgency=low [ Cyril Brulebois ] * Bump Standards-Version to 3.9.2 (no changes). - -- Julien Cristau jcris...@debian.org Thu, 28 Apr 2011 18:14:03 +0200 + -- Cyril Brulebois k...@debian.org Thu, 30 Jun 2011 01:15:32 +0200 xserver-xorg-input-joystick (1:1.5.0-7) unstable; urgency=low commit 4962aab50b3d24b2794d68ae9208be8b5c69d80a Author: Cyril Brulebois k...@debian.org Date: Thu Jun 30 01:15:24 2011 +0200 Close bugs. diff --git a/debian/changelog b/debian/changelog index 0bff3ed..de8bf32 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ xserver-xorg-input-joystick (1:1.6.0-1) UNRELEASED; urgency=low [ Julien Cristau ] - * New upstream release. + * New upstream release: +- Compatible with xorg-server 1.10 (Closes: #624973, #628410). [ Cyril Brulebois ] * Bump Standards-Version to 3.9.2 (no changes). commit 3b6af20d02cd61c72b3e47f85059d1f291dc277c Author: Cyril Brulebois k...@debian.org Date: Thu Jun 30 01:13:07 2011 +0200 Bump Standards-Version to 3.9.2 (no changes). diff --git a/debian/changelog b/debian/changelog index d86102b..0bff3ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ xserver-xorg-input-joystick (1:1.6.0-1) UNRELEASED; urgency=low + [ Julien Cristau ] * New upstream release. + [ Cyril Brulebois ] + * Bump Standards-Version to 3.9.2 (no changes). + -- Julien Cristau jcris...@debian.org Thu, 28 Apr 2011 18:14:03 +0200 xserver-xorg-input-joystick (1:1.5.0-7) unstable; urgency=low diff --git a/debian/control b/debian/control index 7157996..bce3955 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: x11proto-randr-dev, x11proto-kb-dev, libusbhid-dev [kfreebsd-amd64 kfreebsd-i386], -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 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 -- 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/e1qc41g-00084q...@vasks.debian.org
xserver-xorg-input-joystick: Changes to 'debian-unstable'
.gitignore | 78 +-- COPYING | 49 +++- ChangeLog | 418 ++ Makefile.am | 10 config/50-joystick-all.conf | 51 config/Makefile.am |2 configure.ac| 126 +-- debian/changelog|6 include/Makefile.am |2 man/Makefile.am | 62 + man/joystick.man| 47 +--- src/Makefile.am |3 src/backend_bsd.c |1 src/backend_evdev.c |1 src/backend_joystick.c |1 src/jstk.c | 319 + src/jstk.h | 13 - src/jstk_axis.c | 15 - src/jstk_axis.h |8 src/jstk_key.c | 482 ++-- src/jstk_key.h |9 src/jstk_options.c |5 src/jstk_properties.c |7 23 files changed, 929 insertions(+), 786 deletions(-) New commits: commit 5c281ff86830d98abe838e30034a6f6dc388fca6 Author: Julien Cristau jcris...@debian.org Date: Thu Apr 28 18:14:26 2011 +0200 Bump changelogs diff --git a/ChangeLog b/ChangeLog index b238968..6b0087f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,421 @@ +commit bd6c54fe672a913334bfba1ca5dc0f2e0f1f1152 +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Wed Apr 20 20:55:24 2011 +0200 + +joystick 1.6.0 + +Signed-off-by: Sascha Hlusiak saschahlus...@arcor.de + +commit f1b8ef560049f1bb1bca9caa12c1529c9f992a09 +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Wed Apr 20 20:48:28 2011 +0200 + +Updated man page to reflect latest changes + +commit aa78e01edabb27d1b5dcd4ffe2be32878a45e342 +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Wed Apr 20 20:47:33 2011 +0200 + +Added xorg.conf.d example snipped + +Not installed by default, left for distributors. + +Copy 50-joystick-all.conf to /etc/X11/xorg.conf.d/ and modify to your needs. + +commit 29d3745e73d266db173828f40231cb78ec1c383a +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Wed Apr 20 19:48:28 2011 +0200 + +Revert config: fdi file must be installed in $(datadir)/hal/fdi/policy/20thirdparty + +The fdi file was never meant to be installed by default but exists merely as an +example and documentation for distributors who may decide to ship it by default or +install it in share/doc/... + +This reverts commit 1d67a2da26fa3ba0b8f5498da89c01aeaa551515. + +commit 4358209e7e4383b4ebdec93cc116bb1c21d373a7 +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Wed Apr 20 19:33:10 2011 +0200 + +Free pInfo-private only once to fix server crash on unplug (bug #35391) + +The hotplugged keyboard device and the main device share the same pInfo-private data +and the same jstkCoreUnInit, so the data is freed twice. Furthermore, since the keyboard +device will delete itself, we must not delete it from within the deletion of the main device. + +Freeing pInfo-private is done by the main device, hopefully done independently of the order +in which the two devices will be removed by the server. + +Should fix bug #35391 + +commit 3f03fa76f8fb152210c6ed80191f34e428af2c00 +Author: Peter Hutterer peter.hutte...@who-t.net +Date: Wed Apr 6 21:02:49 2011 +1000 + +joystick 1.5.99.901 + +Signed-off-by: Peter Hutterer peter.hutte...@who-t.net + +commit 8c7ad54d6d869bb4202aee8408c72ed72bf929a7 +Author: Peter Hutterer peter.hutte...@who-t.net +Date: Tue Dec 14 17:00:28 2010 +1000 + +Support input ABI 12 + +This commit adds support for input ABI 12, consisting of a number of +changes: +- requires an X server with an ABI of 12 +- valuators have a per-mode setting +- new PreInit prototype. + +Because of the new PreInit prototype, the hotplug system has been switched +around too (should have probably been done in a separate commit before, +but...). + +The old hotplug mechanism added a separate ModuleInfoRec for the keyboard +part of the driver. This isn't feasable for InputClass configurations, the +driver part may get overwritten. + +On entering the driver, after checking a few default values, hotplug the +keyboard device (wacom-style) and let it initialize. Because NIDR calls +DEVICE_INIT and DEVICE_ON the keyboard must initialise the private pointer +and pass it back to the original device. + +Call order is: +NewInputDeviceRequest + - jstkCorePreInit + - jstkKeyboardHotplug + - NewInputDeviceRequest + - jstkCorePreInit + immediately return jstkKeyboardPreInit() + - keyboard DEVICE_INIT + - keyboard DEVICE_ON + return keyboard device + - copy keyboard-priv to joystick-priv + - finish jstkCorePreInit as normal +
xserver-xorg-input-joystick: Changes to 'debian-unstable'
debian/README.source| 24 - debian/changelog| 28 + debian/compat |2 debian/control | 25 - debian/rules| 127 - debian/xserver-xorg-input-joystick.install |1 debian/xserver-xorg-input-joystick.manpages |1 debian/xsfbs/repack.sh | 32 - debian/xsfbs/xsfbs.mk | 285 debian/xsfbs/xsfbs.sh | 622 10 files changed, 62 insertions(+), 1085 deletions(-) New commits: commit 633f0dc7cb0d8814b72a9847bf4b17807e9c6596 Author: Cyril Brulebois k...@debian.org Date: Sat Feb 5 14:38:40 2011 +0100 Upload to unstable diff --git a/debian/changelog b/debian/changelog index 6720576..e4dc868 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-input-joystick (1:1.5.0-7) UNRELEASED; urgency=low +xserver-xorg-input-joystick (1:1.5.0-7) unstable; urgency=low * Switch to dh: - Use debhelper 8. @@ -12,7 +12,7 @@ xserver-xorg-input-joystick (1:1.5.0-7) UNRELEASED; urgency=low * Wrap Depends/Provides. * Bump Standards-Version to 3.9.1 (no changes needed). - -- Cyril Brulebois k...@debian.org Thu, 03 Feb 2011 04:30:45 +0100 + -- Cyril Brulebois k...@debian.org Sat, 05 Feb 2011 14:38:39 +0100 xserver-xorg-input-joystick (1:1.5.0-6) experimental; urgency=low commit ce7790c92aac14fb26c12be2c1eee1973be48397 Author: Cyril Brulebois k...@debian.org Date: Fri Feb 4 11:39:58 2011 +0100 Fix sequence ordering. Since both the autoreconf and quilt sequences insert a command before dh_auto_configure, it is important that we use the quilt one in the first place, so that autoreconf is run on a patched tree. Ditto for dh_clean. diff --git a/debian/rules b/debian/rules index c3590ac..2960979 100755 --- a/debian/rules +++ b/debian/rules @@ -19,4 +19,4 @@ override_dh_shlibdeps: dh_shlibdeps -- --warnings=6 %: - dh $@ --with autoreconf,quilt,xsf --builddirectory=build/ + dh $@ --with quilt,autoreconf,xsf --builddirectory=build/ commit 160e94dbb6fa45ed73bc298f2cf884b1a041b950 Author: Cyril Brulebois k...@debian.org Date: Thu Feb 3 09:08:08 2011 +0100 Remove trailing newline. diff --git a/debian/rules b/debian/rules index c771b80..c3590ac 100755 --- a/debian/rules +++ b/debian/rules @@ -20,4 +20,3 @@ override_dh_shlibdeps: %: dh $@ --with autoreconf,quilt,xsf --builddirectory=build/ - commit 28049ce095dfeb8659d48004575a1ca5d79970ff Author: Cyril Brulebois k...@debian.org Date: Thu Feb 3 06:56:22 2011 +0100 Ensure installation under debian/tmp. This is not strictly needed since there are several binaries built from this source package, so debhelper uses debian/tmp rather than debian/$package. But let's make all drivers use a similar debian/rules file. Also, a binary package might be dropped at some point. diff --git a/debian/rules b/debian/rules index 71900dd..c771b80 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,9 @@ #!/usr/bin/make -f +# Install in debian/tmp to retain control through dh_install: +override_dh_auto_install: + dh_auto_install --destdir=debian/tmp + # Kill *.la files, and forget no-one: override_dh_install: # Usual steps: commit 821e84b80835c4eab5ab87c528d9a5bb25127e2d Author: Cyril Brulebois k...@debian.org Date: Thu Feb 3 04:49:59 2011 +0100 Bump Standards-Version to 3.9.1 (no changes needed). diff --git a/debian/changelog b/debian/changelog index 8e96c2a..6720576 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ xserver-xorg-input-joystick (1:1.5.0-7) UNRELEASED; urgency=low * Remove long obsolete Replaces. * Update Uploaders list. Thanks, David Brice! * Wrap Depends/Provides. + * Bump Standards-Version to 3.9.1 (no changes needed). -- Cyril Brulebois k...@debian.org Thu, 03 Feb 2011 04:30:45 +0100 diff --git a/debian/control b/debian/control index 3f8d89a..7157996 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: x11proto-randr-dev, x11proto-kb-dev, libusbhid-dev [kfreebsd-amd64 kfreebsd-i386], -Standards-Version: 3.8.4 +Standards-Version: 3.9.1 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 7ea4a684a2519b2b4e608a07c28b6cb5b16ef74b Author: Cyril Brulebois k...@debian.org Date: Thu Feb 3 04:49:44 2011 +0100 Wrap Depends/Provides. diff --git a/debian/changelog b/debian/changelog index ff94bfe..8e96c2a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ xserver-xorg-input-joystick (1:1.5.0-7) UNRELEASED; urgency=low * Remove xsfbs accordingly. * Remove long obsolete Replaces. * Update Uploaders list. Thanks, David Brice! +
xserver-xorg-input-joystick: Changes to 'debian-unstable'
debian/control |4 1 file changed, 4 deletions(-) New commits: 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. -- 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/e1oamml-0006uj...@alioth.debian.org
xserver-xorg-input-joystick: Changes to 'debian-unstable'
debian/changelog |9 +++-- debian/control |4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) New commits: 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, -- 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/e1o3emn-0004um...@alioth.debian.org
xserver-xorg-input-joystick: Changes to 'debian-unstable'
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 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 3ab..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..3ab 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..000 --- 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 000..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
xserver-xorg-input-joystick: Changes to 'debian-unstable'
debian/changelog |7 +++ debian/local/10-joystick.conf |6 ++ debian/local/66-xorg-joystick.rules|8 debian/rules |4 ++-- debian/xserver-xorg-input-joystick.postinst.in | 23 --- 5 files changed, 15 insertions(+), 33 deletions(-) New commits: 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..000 --- 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..000 --- 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 000..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 -- 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/e1nwbov-0006ol...@alioth.debian.org
xserver-xorg-input-joystick: Changes to 'debian-unstable'
debian/changelog |2 +- debian/control |1 - 2 files changed, 1 insertion(+), 2 deletions(-) New commits: 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 -- 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/e1nwcyr-00031j...@alioth.debian.org
xserver-xorg-input-joystick: Changes to 'debian-unstable'
debian/changelog |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: 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 -- 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/e1nwgvt-0007af...@alioth.debian.org
xserver-xorg-input-joystick: Changes to 'debian-unstable'
debian/changelog |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: 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 -- 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/e1njdhp-0008jf...@alioth.debian.org
xserver-xorg-input-joystick: Changes to 'debian-unstable'
debian/changelog |5 - debian/control |2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: 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} -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
xserver-xorg-input-joystick: Changes to 'debian-unstable'
debian/changelog |1 + debian/control |2 +- 2 files changed, 2 insertions(+), 1 deletion(-) New commits: 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 -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
xserver-xorg-input-joystick: Changes to 'debian-unstable'
debian/changelog |3 ++- debian/rules |4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) New commits: 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 -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
xserver-xorg-input-joystick: Changes to 'debian-unstable'
debian/rules | 17 - 1 file changed, 16 insertions(+), 1 deletion(-) New commits: 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 -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
xserver-xorg-input-joystick: Changes to 'debian-unstable'
debian/changelog |8 debian/control | 19 ++- debian/local/66-xorg-joystick.rules|8 debian/rules |2 ++ debian/xserver-xorg-input-joystick-dev.install |2 ++ debian/xserver-xorg-input-joystick.postinst.in | 23 +++ 6 files changed, 61 insertions(+), 1 deletion(-) New commits: commit 394fdd2a27cbda9cf1df707d3e44a4fe1a111f76 Author: Timo Aaltonen tjaal...@cc.hut.fi Date: Tue Dec 8 16:43:39 2009 +0200 Add xserver-xorg-input-joystick-dev for the header and .pc files. diff --git a/debian/changelog b/debian/changelog index a4119ef..2e69904 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xserver-xorg-input-joystick (1:1.5.0-2) UNRELEASED; urgency=low * 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. -- Timo Aaltonen tjaal...@ubuntu.com Tue, 08 Dec 2009 16:32:07 +0200 diff --git a/debian/control b/debian/control index f987c80..6ba8288 100644 --- a/debian/control +++ b/debian/control @@ -36,3 +36,19 @@ Description: X.Org X server -- joystick input driver URL:http://lists.freedesktop.org/mailman/listinfo/xorg . This package is built from the X.org xf86-input-joystick driver module. + +Package: xserver-xorg-input-joystick +Section: libdevel +Architecture: any +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 + driver found in xserver-xorg-input-joystick. Non-developers likely have + little use for this package. + . + 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. diff --git a/debian/xserver-xorg-input-joystick-dev.install b/debian/xserver-xorg-input-joystick-dev.install new file mode 100644 index 000..605b936 --- /dev/null +++ b/debian/xserver-xorg-input-joystick-dev.install @@ -0,0 +1,2 @@ +usr/include/xorg/* +usr/lib/pkgconfig/xorg-joystick.pc commit 98586eac671d77e94cc2419fe1e1dce515c0b44c Author: Timo Aaltonen tjaal...@cc.hut.fi Date: Tue Dec 8 16:38:48 2009 +0200 Run udevadm trigger on postinst, and depend on udev [linux-any]. diff --git a/debian/changelog b/debian/changelog index 23df76b..a4119ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xserver-xorg-input-joystick (1:1.5.0-2) UNRELEASED; urgency=low * Install a udev rules file to autoload the driver. + * Run udevadm trigger on postinst, and depend on udev [linux-any]. -- Timo Aaltonen tjaal...@ubuntu.com Tue, 08 Dec 2009 16:32:07 +0200 diff --git a/debian/control b/debian/control index b6d8529..f987c80 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,8 @@ 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}, ${xserver:Depends}, + udev [linux-any], Provides: ${xinpdriver:Provides} Replaces: xserver-xorg ( 6.8.2-35) Description: X.Org X server -- joystick input driver diff --git a/debian/xserver-xorg-input-joystick.postinst.in b/debian/xserver-xorg-input-joystick.postinst.in new file mode 100644 index 000..b4c84c0 --- /dev/null +++ b/debian/xserver-xorg-input-joystick.postinst.in @@ -0,0 +1,23 @@ +#!/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 dccb9d5fd6e9b57851b5a92ca48ecdc42efeae55 Author: Timo Aaltonen tjaal...@cc.hut.fi Date: Tue Dec 8 16:34:53 2009 +0200 Install a udev rules file to autoload the driver. diff --git a/debian/changelog b/debian/changelog index 190bb9d..23df76b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-input-joystick (1:1.5.0-2) UNRELEASED; urgency=low + + * Install a udev rules file to autoload the driver. + + -- 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 [ Timo Aaltonen ] diff --git a/debian/local/66-xorg-joystick.rules b/debian/local/66-xorg-joystick.rules new file mode 100644 index 000..4b31ec0 --- /dev/null +++ b/debian/local/66-xorg-joystick.rules @@ -0,0 +1,8 @@ +ACTION!=add|change,
xserver-xorg-input-joystick: Changes to 'debian-unstable'
debian/changelog |5 + debian/rules | 10 +- 2 files changed, 10 insertions(+), 5 deletions(-) New commits: commit 0508bbf03d48cb742ee104beba6eb2803b637351 Author: Julien Cristau jcris...@debian.org Date: Sat Jan 16 16:48:47 2010 + 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
xserver-xorg-input-joystick: Changes to 'debian-unstable'
debian/changelog |4 debian/control |3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) New commits: commit e400f1b516077e0730b7b052a330ac2132ff9bba Author: Julien Cristau jcris...@debian.org Date: Fri Dec 5 01:05:16 2008 +0100 Build-depend on libusbhid-dev on kfreebsd. diff --git a/debian/changelog b/debian/changelog index 60da9f5..78d47f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ xserver-xorg-input-joystick (1:1.5.0-1) UNRELEASED; urgency=low + [ Timo Aaltonen ] * New upstream release. * Bump Standards-Version to 3.8.3. * Build against Xserver 1.7. + [ Julien Cristau ] + * Build-depend on libusbhid-dev on kfreebsd. + -- Timo Aaltonen tjaal...@ubuntu.com Sat, 05 Dec 2009 01:49:03 +0200 xserver-xorg-input-joystick (1:1.4.1-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 9195515..b6d8529 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,8 @@ Build-Depends: x11proto-core-dev, x11proto-randr-dev, x11proto-kb-dev, - dpkg-dev (= 1.14.17) + libusbhid-dev [kfreebsd-amd64 kfreebsd-i386], + dpkg-dev (= 1.14.17), Standards-Version: 3.8.3 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 -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
xserver-xorg-input-joystick: Changes to 'debian-unstable'
debian/changelog |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) New commits: commit 872ade7779776501bcb38a90ecb0d6790bb89764 Author: Cyril Brulebois k...@debian.org Date: Sat Dec 5 22:56:19 2009 +0100 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index 78d47f0..190bb9d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-input-joystick (1:1.5.0-1) UNRELEASED; urgency=low +xserver-xorg-input-joystick (1:1.5.0-1) experimental; urgency=low [ Timo Aaltonen ] * New upstream release. @@ -8,7 +8,10 @@ xserver-xorg-input-joystick (1:1.5.0-1) UNRELEASED; urgency=low [ Julien Cristau ] * Build-depend on libusbhid-dev on kfreebsd. - -- Timo Aaltonen tjaal...@ubuntu.com Sat, 05 Dec 2009 01:49:03 +0200 + [ Cyril Brulebois ] + * Upload to experimental. + + -- Cyril Brulebois k...@debian.org Sat, 05 Dec 2009 22:56:05 +0100 xserver-xorg-input-joystick (1:1.4.1-1) unstable; urgency=low -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
xserver-xorg-input-joystick: Changes to 'debian-unstable'
debian/changelog |3 ++- debian/control |2 +- 2 files changed, 3 insertions(+), 2 deletions(-) New commits: commit 8609d8f4bc8f0fd87855c0b1dcd15c472671f59a Author: Timo Aaltonen tjaal...@cc.hut.fi Date: Sat Dec 5 02:09:23 2009 +0200 Build against Xserver 1.7. diff --git a/debian/changelog b/debian/changelog index ce46b25..60da9f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ xserver-xorg-input-joystick (1:1.5.0-1) UNRELEASED; urgency=low * New upstream release. * Bump Standards-Version to 3.8.3. + * Build against Xserver 1.7. - -- Timo Aaltonen tjaal...@ubuntu.com Mon, 30 Nov 2009 15:16:20 +0200 + -- Timo Aaltonen tjaal...@ubuntu.com Sat, 05 Dec 2009 01:49:03 +0200 xserver-xorg-input-joystick (1:1.4.1-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 2e07a71..9195515 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: automake, libtool, xutils-dev, - xserver-xorg-dev (= 2:1.6), + xserver-xorg-dev (= 2:1.7), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev, -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
xserver-xorg-input-joystick: Changes to 'debian-unstable'
ChangeLog| 130 + config/50-x11-input-joystick.fdi |8 configure.ac | 11 debian/README.source | 73 + debian/changelog |7 debian/control |2 debian/xsfbs/xsfbs.mk| 21 debian/xsfbs/xsfbs.sh| 245 --- include/joystick-properties.h| 12 man/joystick.man | 44 src/Makefile.am |3 src/StrKeysym.c | 82 - src/StrKeysym.h | 28 src/jstk.c | 52 src/jstk.h | 19 src/jstk_key.c | 344 src/jstk_options.c | 56 src/jstk_properties.c| 91 + src/ks_tables.h | 2694 --- 19 files changed, 689 insertions(+), 3233 deletions(-) New commits: commit b4f50dca511571c2d07f6f510d1ccf0fb1311576 Author: Timo Aaltonen tjaal...@cc.hut.fi Date: Mon Nov 30 15:19:31 2009 +0200 Bump Standards-Version to 3.8.3. diff --git a/debian/changelog b/debian/changelog index 302dc46..ce46b25 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xserver-xorg-input-joystick (1:1.5.0-1) UNRELEASED; urgency=low * New upstream release. + * Bump Standards-Version to 3.8.3. -- Timo Aaltonen tjaal...@ubuntu.com Mon, 30 Nov 2009 15:16:20 +0200 diff --git a/debian/control b/debian/control index f3222d5..2e07a71 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: x11proto-randr-dev, x11proto-kb-dev, dpkg-dev (= 1.14.17) -Standards-Version: 3.7.2 +Standards-Version: 3.8.3 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 65ddd2c91c4533a33946419d4ab111891d02 Author: Timo Aaltonen tjaal...@cc.hut.fi Date: Mon Nov 30 15:17:01 2009 +0200 Update the changelogs. diff --git a/ChangeLog b/ChangeLog index 8a25d7b..b238968 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,16 +1,132 @@ -commit 88a084952f547ebc2f30a257e441930024a69be9 +commit eaf8d1a1d87af9f67ca3e3d0436bb9d9a7cfc17a Author: Sascha Hlusiak saschahlus...@arcor.de -Date: Tue Apr 14 22:33:01 2009 +0200 +Date: Sat Oct 31 12:41:15 2009 +0100 -Fail configure on xorg-server = 1.6.99 +Bump to 1.5.0 -The 1.4 branch is broken on xorg-server = 1.6.99. Use master instead. +Signed-off-by: Sascha Hlusiak saschahlus...@arcor.de + +commit 657c01c8ebb9e0571d498356e6d3d03917199328 +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Wed Oct 7 09:24:39 2009 +0200 + +Revert add shave support + +This reverts commit 1fa414dd6f32d68378bc9d571c439a603c2e7888. + +commit 565de79d42350106c9d62f8f0939a0c35138989d +Merge: 729b5bc 1fa414d +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Fri Oct 2 11:32:40 2009 +0200 + +Merge branch 'scancodes' + +Conflicts: + configure.ac + +commit 1fa414dd6f32d68378bc9d571c439a603c2e7888 +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Fri Oct 2 11:31:14 2009 +0200 + +add shave support + +clean up compile output + +commit 5fdab9ca49474d78f2ebfb27aa931565ce985e08 +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Fri Sep 11 18:23:26 2009 +0200 + +Fix NULL pointers in rmlvo + +commit 462aae4db1302bc5a89ccf4a1db25e1c09a04132 +Merge: b2de71f 5e2b2a6 +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Fri Sep 11 17:54:13 2009 +0200 + +Merge branch 'scancodes' of ssh://deepthought/home/sascha/develop/xorg/xf86-input-joystick into scancodes + +commit 729b5bc6e3dba76ff763de27ec4c6e4c0933a9cd +Author: Peter Hutterer peter.hutte...@who-t.net +Date: Fri Sep 11 13:53:55 2009 +1000 + +joystick 1.4.99.1 + +Signed-off-by: Peter Hutterer peter.hutte...@who-t.net + +commit e8f22493833e33683e659ae348d9f58a43838252 +Author: Peter Hutterer peter.hutte...@who-t.net +Date: Fri Sep 11 13:55:50 2009 +1000 + +Fix typo in configure. + +commit b2de71f4366c61a165562a573b30e1edd336ba5f +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Tue Jun 23 23:51:32 2009 +0200 + +Support for axis labels; fix build on master + +The first two axes are always REL_X and REL_Y. All other axes and buttons +are set to 'None', proper labeling will follow. + +Thanks to Peter for the heads up. + +Signed-off-by: Sascha Hlusiak saschahlus...@arcor.de + +commit 5e2b2a631063974ea6de7796f39106b85b2db31d +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Wed Apr 15 00:29:44 2009 +0200 + +fix manpage and examples to reflect recent key changes + +commit bf8626967263ee92d45759c58dc5bcc42a57176b +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Tue Apr 14 23:25:44 2009 +0200 + +Property support for scancodes + +Allows setting scancodes for keys using input-properties + +commit
xserver-xorg-input-joystick: Changes to 'debian-unstable'
.gitignore|4 ChangeLog | 156 + Makefile.am |8 - README| 20 configure.ac | 26 -- debian/changelog |6 + include/joystick-properties.h |4 man/.gitignore|3 man/joystick.man |8 + src/.gitignore|6 - src/Makefile.am |2 src/backend_bsd.c |6 - src/backend_evdev.c |4 src/backend_joystick.c|4 src/jstk.c| 27 +++--- src/jstk.h|4 src/jstk_axis.c | 173 +- src/jstk_axis.h |1 src/jstk_key.c| 26 +- src/jstk_options.c|2 src/jstk_properties.c | 66 ++-- 21 files changed, 492 insertions(+), 64 deletions(-) New commits: commit e2304355f74011fccb8a03d2861b918eea4f9ee4 Author: Brice Goglin bgog...@debian.org Date: Wed Apr 15 13:16:50 2009 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index da342e4..b6903ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xserver-xorg-input-joystick (1:1.4.1-1) UNRELEASED; urgency=low +xserver-xorg-input-joystick (1:1.4.1-1) unstable; urgency=low * New upstream release. - -- Brice Goglin bgog...@debian.org Wed, 15 Apr 2009 13:14:47 +0200 + -- Brice Goglin bgog...@debian.org Wed, 15 Apr 2009 13:16:37 +0200 xserver-xorg-input-joystick (1:1.4.0-1) unstable; urgency=low commit c20bd51fe07066594ab623079de85daec6b5b7d8 Author: Brice Goglin bgog...@debian.org Date: Wed Apr 15 13:16:34 2009 +0200 New upstream release diff --git a/ChangeLog b/ChangeLog index c524a7f..8a25d7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,159 @@ +commit 88a084952f547ebc2f30a257e441930024a69be9 +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Tue Apr 14 22:33:01 2009 +0200 + +Fail configure on xorg-server = 1.6.99 + +The 1.4 branch is broken on xorg-server = 1.6.99. Use master instead. + +commit 7d6a068c29e372747fc621020976797df9f61bac +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Tue Apr 14 22:25:49 2009 +0200 + +Bump 1.4.1 + +commit e1710072396a97369ef71b1fd1738ad092a5e902 +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Thu Mar 19 21:14:22 2009 +0100 + +Fix compiler warning about stray INT8-CARD8 conversion + +commit 7af61c78fd48ea9cc2442fb55570ba0d9f37f8c8 +Merge: bc430cc 4b9aafd +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Thu Mar 19 21:13:13 2009 +0100 + +Merge branch 'pwm' + +commit bc430cc2aacdcda45ddc38d457b84ff040be6a8c +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Thu Mar 19 21:08:30 2009 +0100 + +Missing initialization of button amplify + +Always initialize button[]-amplify with 1.0 + +commit dca19bde2bdd275744e9182dd49a2f2dd81f8c81 +Merge: 6f2a211 c6217b5 +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Thu Mar 19 08:36:10 2009 +0100 + +Merge branch 'master' of sascha:develop/xorg/xf86-input-joystick + +commit 4b9aafd82bf78e86b2b2ddc78c37d73ccc7c25d5 +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Wed Mar 18 18:13:12 2009 +0100 + +Mention PWM mode in man page + +commit 6f2a211b7c3b45e8de9a90835fb7f1a24635c8e5 +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Wed Mar 18 17:39:07 2009 +0100 + +Fix build on FreeBSD with USB2 + +Including dev/usb/usb_ioctl.h fixes missing declaration +of USB_GET_REPORT_ID on FreeBSD-Current. + +commit c6217b5849b1c2680a9a8c29ca26b3468955b1c1 +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Sun Mar 1 21:06:52 2009 +0100 + +Comment float properties in joystick-properties.h + +Signed-off-by: Sascha Hlusiak saschahlus...@arcor.de + +commit 367c32bab57d69d85e95f4e76e2f1c8aaab45189 +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Sun Mar 1 21:00:18 2009 +0100 + +Support for float properties + +Signed-off-by: Sascha Hlusiak saschahlus...@arcor.de + +commit 4978e78e7c49bc0aabf5c7ade4223c2529a9f046 +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Thu Feb 19 23:40:58 2009 +0100 + +Add PWM key generation when axis in accelerated mode + +When axis is in accelerated mode and keyhigh/keylow is set, +the deflection of the axis will be linked to the _percent of time_ the key +will be down. Full deflection will set the key permanently down (old behaviour). + +50% deflection will result in the key being 50ms down and 50ms up. +75% deflection will result in the key being 150ms down and 50ms up. +etc. +Minimum interval is 50ms, maximum is 600ms. + +commit d4bb86ddb0ba570de0f501cd0edb13861456b711 +Author: Sascha Hlusiak saschahlus...@arcor.de +Date: Thu Feb 19 23:37:46 2009 +0100 + +Don't set
xserver-xorg-input-joystick: Changes to 'debian-unstable'
.gitignore |2 ChangeLog| 373 Makefile.am |7 Makefile.in | 684 - aclocal.m4 | 8256 - config.guess | 1526 -- config.h.in | 99 config.sub | 1658 -- config/50-x11-input-joystick.fdi | 41 configure|23416 --- configure.ac | 18 debian/changelog | 10 debian/control | 18 debian/rules | 20 debian/xsfbs/repack.sh | 32 debian/xsfbs/xsfbs-autoreconf.mk | 150 debian/xsfbs/xsfbs.mk| 104 debian/xsfbs/xsfbs.sh| 405 depcomp | 589 include/Makefile.am | 23 include/joystick-properties.h| 123 install-sh | 519 ltmain.sh| 6964 --- man/Makefile.in | 424 man/joystick.man | 25 missing | 367 mkinstalldirs| 161 src/Makefile.am |3 src/Makefile.in | 544 src/backend_bsd.c| 44 src/backend_bsd.h|6 src/backend_evdev.c | 27 src/backend_evdev.h |6 src/backend_joystick.c | 26 src/backend_joystick.h |6 src/jstk.c | 224 src/jstk.h | 51 src/jstk_axis.c | 83 src/jstk_axis.h |1 src/jstk_key.c | 180 src/jstk_key.h |4 src/jstk_options.c | 88 src/jstk_options.h |3 src/jstk_properties.c| 347 src/jstk_properties.h| 31 xorg-joystick.pc.in |7 46 files changed, 1722 insertions(+), 45973 deletions(-) New commits: commit e13fd64ce669da539cdccd7a5a9728f7534c8f30 Author: Julien Cristau jcris...@debian.org Date: Thu Apr 9 16:12:54 2009 +0100 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index efb6301..71ac20e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-input-joystick (1:1.4.0-1) UNRELEASED; urgency=low +xserver-xorg-input-joystick (1:1.4.0-1) unstable; urgency=low * Run autoreconf on build. * Allow parallel builds. @@ -6,7 +6,7 @@ xserver-xorg-input-joystick (1:1.4.0-1) UNRELEASED; urgency=low * Build against xserver 1.6. * Use Vcs-* instead of XS-Vcs-*. - -- Julien Cristau jcris...@debian.org Thu, 09 Apr 2009 16:06:42 +0100 + -- Julien Cristau jcris...@debian.org Thu, 09 Apr 2009 16:12:48 +0100 xserver-xorg-input-joystick (1:1.3.2-1) unstable; urgency=low commit 408377bc1c90840309e400fd1790be354446879d Author: Julien Cristau jcris...@debian.org Date: Thu Apr 9 16:11:04 2009 +0100 Use Vcs-* instead of XS-Vcs-*. diff --git a/debian/changelog b/debian/changelog index 66dd4ec..efb6301 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ xserver-xorg-input-joystick (1:1.4.0-1) UNRELEASED; urgency=low * Allow parallel builds. * New upstream release. * Build against xserver 1.6. + * Use Vcs-* instead of XS-Vcs-*. -- Julien Cristau jcris...@debian.org Thu, 09 Apr 2009 16:06:42 +0100 diff --git a/debian/control b/debian/control index 036de46..f3222d5 100644 --- a/debian/control +++ b/debian/control @@ -17,8 +17,8 @@ Build-Depends: x11proto-kb-dev, dpkg-dev (= 1.14.17) Standards-Version: 3.7.2 -XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-joystick -XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-joystick.git +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 Package: xserver-xorg-input-joystick Architecture: any commit c6a4881e4f713c6d92f83bfc3cd3711df6a9a90a Author: Julien Cristau jcris...@debian.org Date: Thu Apr 9 16:10:41 2009 +0100 Build against xserver 1.6. diff --git a/debian/changelog b/debian/changelog index bb4d42e..66dd4ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ xserver-xorg-input-joystick (1:1.4.0-1) UNRELEASED; urgency=low * Run autoreconf on build. * Allow parallel builds. * New upstream release. + * Build against xserver 1.6. -- Julien Cristau jcris...@debian.org Thu, 09 Apr 2009 16:06:42 +0100 diff --git a/debian/control b/debian/control index 8d94d88..036de46 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: automake, libtool, xutils-dev, - xserver-xorg-dev (= 2:1.4), + xserver-xorg-dev (= 2:1.6), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev,
xserver-xorg-input-joystick: Changes to 'debian-unstable'
ChangeLog | 80 + Makefile.in| 49 +-- aclocal.m4 | 265 +++- config.guess | 32 +- config.sub | 44 ++ configure | 770 - configure.ac |2 debian/changelog | 10 debian/control |2 debian/rules |2 depcomp| 33 +- install-sh | 228 +++--- ltmain.sh | 58 ++- man/Makefile.am|1 man/Makefile.in|7 man/joystick.man | 66 ++-- src/Makefile.in| 29 - src/StrKeysym.h| 22 + src/backend_bsd.c |2 src/backend_bsd.h |2 src/backend_evdev.c|8 src/backend_evdev.h|2 src/backend_joystick.c |2 src/backend_joystick.h |2 src/jstk.c | 11 src/jstk.h |4 src/jstk_axis.c|2 src/jstk_axis.h|2 src/jstk_key.c | 11 src/jstk_key.h |2 src/jstk_options.c |9 src/jstk_options.h |2 32 files changed, 1230 insertions(+), 531 deletions(-) New commits: commit 81af02e3ffda04079c77a09492bb598923bb4675 Author: Brice Goglin [EMAIL PROTECTED] Date: Sat May 17 12:09:37 2008 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 34b9b12..12d99fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-input-joystick (1:1.3.2-1) UNRELEASED; urgency=low +xserver-xorg-input-joystick (1:1.3.2-1) unstable; urgency=low * New upstream release. * Run dpkg-shlibdeps with --warnings=6. Drivers reference symbols from @@ -6,7 +6,7 @@ xserver-xorg-input-joystick (1:1.3.2-1) UNRELEASED; urgency=low dpkg-shlibdeps to shut up about symbols it can't find. + Build-depend on dpkg-dev = 1.14.17. - -- Brice Goglin [EMAIL PROTECTED] Sat, 17 May 2008 11:39:00 +0200 + -- Brice Goglin [EMAIL PROTECTED] Sat, 17 May 2008 12:09:11 +0200 xserver-xorg-input-joystick (1:1.3.1-1) unstable; urgency=low commit c3298c023a529a1ca74512c848d98d281f4529cd Author: Brice Goglin [EMAIL PROTECTED] Date: Sat May 17 12:09:08 2008 +0200 Run dpkg-shlibdeps with --warnings=6. Drivers reference symbols from /usr/bin/Xorg and other modules, and that's not a bug, so we want dpkg-shlibdeps to shut up about symbols it can't find. Build-depend on dpkg-dev = 1.14.17. diff --git a/debian/changelog b/debian/changelog index d75b754..34b9b12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ xserver-xorg-input-joystick (1:1.3.2-1) UNRELEASED; urgency=low * New upstream release. + * Run dpkg-shlibdeps with --warnings=6. Drivers reference symbols from +/usr/bin/Xorg and other modules, and that's not a bug, so we want +dpkg-shlibdeps to shut up about symbols it can't find. ++ Build-depend on dpkg-dev = 1.14.17. - -- Brice Goglin [EMAIL PROTECTED] Sat, 17 May 2008 11:26:00 +0200 + -- Brice Goglin [EMAIL PROTECTED] Sat, 17 May 2008 11:39:00 +0200 xserver-xorg-input-joystick (1:1.3.1-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 5971bfd..b423018 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Debian X Strike Force debian-x@lists.debian.org Uploaders: David Nusinow [EMAIL PROTECTED], Drew Parsons [EMAIL PROTECTED], Brice Goglin [EMAIL PROTECTED] -Build-Depends: debhelper (= 5), quilt, pkg-config, xserver-xorg-dev (= 2:1.4), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev, x11proto-kb-dev +Build-Depends: debhelper (= 5), quilt, pkg-config, xserver-xorg-dev (= 2:1.4), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev, x11proto-kb-dev, dpkg-dev (= 1.14.17) Standards-Version: 3.7.2 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-joystick XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-joystick.git diff --git a/debian/rules b/debian/rules index 4a3dbde..99b0cbe 100755 --- a/debian/rules +++ b/debian/rules @@ -79,7 +79,7 @@ binary-arch: build install serverabi dh_compress dh_fixperms dh_installdeb - dh_shlibdeps + dh_shlibdeps -- --warnings=6 dh_gencontrol dh_md5sums dh_builddeb commit ad76c8f475a19c98b8dbd46b98e4676ca0b55e58 Author: Brice Goglin [EMAIL PROTECTED] Date: Sat May 17 11:25:43 2008 +0200 New upstream release diff --git a/ChangeLog b/ChangeLog index e0b3d27..481004d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,83 @@ +commit 0961ffa84825f3f32d9c973f054400ab9d2b7c08 +Author: Sascha Hlusiak [EMAIL PROTECTED] +Date: Sun Apr 27 19:16:29 2008 +0200 + +Bumped to version 1.3.2 + +commit c3e3fb8795c19a292ca37ab4d67b308fbb20911b +Author: Sascha Hlusiak [EMAIL PROTECTED] +Date: Wed Apr 9 15:09:46 2008 +0200 + +Display evdev
xserver-xorg-input-joystick: Changes to 'debian-unstable'
ChangeLog| 95 +++ Makefile.am |2 Makefile.in | 138 ++--- aclocal.m4 | 176 +++ config.h.in | 27 + config/50-x11-input-joystick.fdi | 16 config/Makefile.am |1 configure| 934 --- configure.ac | 60 +- debian/changelog |5 depcomp | 64 ++ install-sh | 348 +++--- ltmain.sh|2 man/Makefile.in | 96 +--- man/joystick.man | 25 - missing | 61 +- mkinstalldirs|5 src/Makefile.am | 15 src/Makefile.in | 169 +++ src/backend_bsd.c| 309 src/backend_bsd.h| 35 + src/backend_evdev.c | 294 src/backend_evdev.h | 35 + src/backend_joystick.c | 197 src/backend_joystick.h | 35 + src/bsd_jstk.c | 308 src/jstk.c | 66 ++ src/jstk.h | 16 src/jstk_hw.h| 38 - src/jstk_key.c |1 src/jstk_options.c |1 src/linux_jstk.c | 195 32 files changed, 2640 insertions(+), 1129 deletions(-) New commits: commit dc232ed49ae3bc299c4b8039f852cf3cb097e9c9 Author: Brice Goglin [EMAIL PROTECTED] Date: Sat Dec 8 12:35:28 2007 +0100 Prepapre changelog for upload diff --git a/debian/changelog b/debian/changelog index f4cc8bb..be24f43 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -xserver-xorg-input-joystick (1:1.3.1-1) UNRELEASED; urgency=low +xserver-xorg-input-joystick (1:1.3.1-1) unstable; urgency=low * New upstream release. * Build-depend on x11proto-kb-dev, thanks Aaron M. Ucko, closes: #448770. - -- Brice Goglin [EMAIL PROTECTED] Sat, 08 Dec 2007 12:30:52 +0100 + -- Brice Goglin [EMAIL PROTECTED] Sat, 08 Dec 2007 12:35:12 +0100 xserver-xorg-input-joystick (1:1.3.0-2) unstable; urgency=low commit edbb329e651d41d70a56b26e2b9ffc253c93ff39 Author: Brice Goglin [EMAIL PROTECTED] Date: Sat Dec 8 12:35:06 2007 +0100 New upstream release diff --git a/ChangeLog b/ChangeLog index dc3d7c9..e0b3d27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,98 @@ +commit 01637abd2b059923f5c41ab80c80ab93579cbe9b +Author: Sascha Hlusiak [EMAIL PROTECTED] +Date: Fri Dec 7 00:17:56 2007 +0100 + +Mentioned hotplugging and hal policy in man page + +commit 47cd8141f9bf3e69d5418f3b5f448366f500cf0d +Author: Sascha Hlusiak [EMAIL PROTECTED] +Date: Thu Dec 6 23:55:20 2007 +0100 + +Bumped to version 1.3.1 + +commit c463776b8b35e6e721128a7348e088d306c4ee02 +Author: Sascha Hlusiak [EMAIL PROTECTED] +Date: Thu Dec 6 23:48:49 2007 +0100 + +Added example hal policy file for input hotplugging of joysticks + +Hal policy config/50-x11-input-joystick.fdi is not installed by default and you probably +don't want to. + +commit 833454bd7bea04924b85105bf38ed57dd2b5e5c2 +Author: Sascha Hlusiak [EMAIL PROTECTED] +Date: Thu Dec 6 23:22:43 2007 +0100 + +Looking for Path parameter besides Device (used by HAL+input hotplug) + +commit dca42ff25dde490073a798dc873b048c4bfeb0f4 +Author: Sascha Hlusiak [EMAIL PROTECTED] +Date: Thu Dec 6 23:22:06 2007 +0100 + +Fixed default button mappings + +Default button mappings were set to buttons 4, 5 and 6 instead of 1, 2 and 3. + +commit fba24465bc4867568cbefc3d554bae756abc1204 +Author: Sascha Hlusiak [EMAIL PROTECTED] +Date: Thu Dec 6 22:56:26 2007 +0100 + +Return NULL on device configure fail instead of unconfigured device, which made X segfault. + +commit 2fba11efcafdbc2002bc7083a2b74cb7d908b3a9 +Author: Sascha Hlusiak [EMAIL PROTECTED] +Date: Thu Dec 6 22:28:12 2007 +0100 + +New: evdev backend + +commit 78616fb8174e93a2c3c523bd425acc33a4b8773c +Author: Sascha Hlusiak [EMAIL PROTECTED] +Date: Wed Dec 5 22:17:36 2007 +0100 + +Mentioned multiple backends in man page + +commit 9e5f4e6fccb8c9e1b6c4dfccb39f1f0c89f79b60 +Author: Sascha Hlusiak [EMAIL PROTECTED] +Date: Wed Dec 5 21:33:27 2007 +0100 + +Fixed implicit declaration warnings because of missed header files + +commit 43790502b5d1077fc74e81b7eedd9c880673463c +Author: Sascha Hlusiak [EMAIL PROTECTED] +Date: Wed Dec 5 21:30:12 2007 +0100 + +Renamed backend files from *_jstk.{c,h} to backend_*.{c,h} + +commit 032138d7712f6d1e6a50bf83a2dde911b7f3d752 +Author: Sascha Hlusiak [EMAIL PROTECTED] +Date: Wed Dec 5 21:22:50 2007 +0100 + +Added backend selection code. + +From all available backends they are tried in the order: evdev, linux joystick, bsd +usbhid. This needed to separate the
xserver-xorg-input-joystick: Changes to 'debian-unstable'
debian/changelog |7 +++ debian/control |2 +- 2 files changed, 8 insertions(+), 1 deletion(-) New commits: commit 76ec6c1d3f6f13773ec1bf183a3c6cf3aa228849 Author: Brice Goglin [EMAIL PROTECTED] Date: Thu Nov 1 10:26:53 2007 +0100 Add missing build-depend on x11proto-kb-dev diff --git a/debian/changelog b/debian/changelog index bde7c05..f174038 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-input-joystick (1:1.3.0-3) UNRELEASED; urgency=low + + * Build-depend on x11proto-kb-dev, thanks Aaron M. Ucko, +closes: #448770. + + -- Brice Goglin [EMAIL PROTECTED] Thu, 01 Nov 2007 10:24:56 +0100 + xserver-xorg-input-joystick (1:1.3.0-2) unstable; urgency=low * Update upstream ChangeLog. diff --git a/debian/control b/debian/control index 1af2d17..5971bfd 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Debian X Strike Force debian-x@lists.debian.org Uploaders: David Nusinow [EMAIL PROTECTED], Drew Parsons [EMAIL PROTECTED], Brice Goglin [EMAIL PROTECTED] -Build-Depends: debhelper (= 5), quilt, pkg-config, xserver-xorg-dev (= 2:1.4), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev +Build-Depends: debhelper (= 5), quilt, pkg-config, xserver-xorg-dev (= 2:1.4), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev, x11proto-kb-dev Standards-Version: 3.7.2 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-joystick XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-joystick.git -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-input-joystick: Changes to 'debian-unstable'
configure.ac |4 man/joystick.man | 71 - src/Makefile.am|8 src/StrKeysym.c| 82 + src/StrKeysym.h|6 src/jstk.c | 47 src/jstk.h |5 src/jstk_axis.c| 32 src/jstk_key.c | 150 ++ src/jstk_key.h | 31 src/jstk_options.c | 90 + src/jstk_options.h |3 src/ks_tables.h| 2694 + 13 files changed, 3137 insertions(+), 86 deletions(-) New commits: commit c9e359fda611778da578f3699b8f2f4c9122852c Author: Sascha Hlusiak [EMAIL PROTECTED] Date: Sat Oct 27 18:50:08 2007 +0200 Added missing headerfiles to Makefile.am Files StrKeysym.h and ks_tables.h were missing. Sorry, guys. diff --git a/src/Makefile.am b/src/Makefile.am index de208e0..d9fc76a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,7 +32,7 @@ jstk_axis.c jstk_axis.h \ jstk_key.c jstk_key.h \ jstk_options.c jstk_options.h \ - StrKeysym.c + StrKeysym.c StrKeysym.h ks_tables.h BSD_SRCS = bsd_jstk.c LINUX_SRCS = linux_jstk.c commit 8668189c26956922a9a10a80289162cfd5741bdf Author: Sascha Hlusiak [EMAIL PROTECTED] Date: Sat Oct 27 15:38:09 2007 +0200 Debug output of AutoRepeat option diff --git a/src/jstk.c b/src/jstk.c index 8095bc3..c041d12 100644 --- a/src/jstk.c +++ b/src/jstk.c @@ -533,6 +533,8 @@ jstkCorePreInit(InputDriverPtr drv, IDevPtr dev, int flags) if (rate != 0) priv-repeat_interval = 1000/rate; else priv-repeat_interval = 0; +DBG(1, xf86Msg(X_CONFIG, Autorepeat set to delay=%d, interval=%d\n, + priv-repeat_delay,priv-repeat_interval)); } xfree(s); } commit 68e4850b28c34d8e7a41fe2682a115183e3a22d4 Author: Sascha Hlusiak [EMAIL PROTECTED] Date: Wed Oct 10 18:00:59 2007 +0200 Added AutoRepeat option to specify rate and delay for key events. So far the autorepeat settings of xorg were used, thus sharing the settings with all other keyboard. This is still the default but the rate and delay can be changed per device, not conflicting with the settings of other keyboards. diff --git a/man/joystick.man b/man/joystick.man index 06fb29f..cd08098 100644 --- a/man/joystick.man +++ b/man/joystick.man @@ -48,6 +48,13 @@ If compiled with debugging information, controls the verbosity of the driver. The higher the DebugLevel, the more output is produced. Default: 0 .TP 7 +.BI Option \*qAutoRepeat\*q \*q delay rate \*q +Sets the auto repeat behaviour for key events. +.I delay +is the time in milliseconds before a key starts repeating. +.I rate +is the number of times a key repeats per second. Default: Xorg default +.TP 7 .BI Option \*qMapButtonnumber\*q \*q string \*q Sets the mapping of the joystick button to the desired action. Counting of buttons starts with .IR 1 , diff --git a/src/jstk.c b/src/jstk.c index 8ae506d..8095bc3 100644 --- a/src/jstk.c +++ b/src/jstk.c @@ -436,6 +436,8 @@ jstkCorePreInit(InputDriverPtr drv, IDevPtr dev, int flags) priv-buttonmap.size = 0; priv-keymap.size = 1; priv-keymap.map[0] = NoSymbol; +priv-repeat_delay = 0; +priv-repeat_interval = 0; /* Initialize default mappings */ for (i=0; iMAXAXES; i++) { @@ -520,6 +522,20 @@ jstkCorePreInit(InputDriverPtr drv, IDevPtr dev, int flags) } #endif +/* Parse option for autorepeat */ +if ((s = xf86SetStrOption(dev-commonOptions, AutoRepeat, NULL))) { +int delay, rate; +if (sscanf(s, %d %d, delay, rate) != 2) { +xf86Msg(X_ERROR, %s: \%s\ is not a valid AutoRepeat value, +local-name, s); +} else { +priv-repeat_delay = delay; +if (rate != 0) +priv-repeat_interval = 1000/rate; +else priv-repeat_interval = 0; +} +xfree(s); +} /* Process button mapping options */ for (i=0; iMAXBUTTONS; i++) { diff --git a/src/jstk.h b/src/jstk.h index e74115d..b0cd616 100644 --- a/src/jstk.h +++ b/src/jstk.h @@ -104,6 +104,8 @@ typedef struct _JoystickDevRec { Bool mouse_enabled, keys_enabled; floatamplify; /* Global amplifier of axis movement */ +int repeat_delay, repeat_interval; /* Key autorepeat */ + struct _BUTTONMAP { int size; CARD8 scrollbutton[4]; /* Logical button numbers for scrollwheel */ diff --git a/src/jstk_key.c b/src/jstk_key.c index aa14438..5cddf25 100644 --- a/src/jstk_key.c +++ b/src/jstk_key.c @@ -34,7 +34,6 @@ #include X11/extensions/XKBsrv.h #include X11/keysym.h #include X11/XF86keysym.h -// #include xf86Xinput.h #include jstk.h #include jstk_key.h @@ -52,6 +51,8 @@ jstkInitKeys(DeviceIntPtr pJstk, JoystickDevPtr priv) KeySym sym; int i, j;
xserver-xorg-input-joystick: Changes to 'debian-unstable'
ChangeLog| 74 +++ Makefile.in |1 aclocal.m4 | 502 +++--- config.guess | 34 + config.sub | 36 + configure| 1027 ++- debian/changelog | 13 ltmain.sh| 233 man/Makefile.in |2 src/Makefile.in | 17 10 files changed, 1303 insertions(+), 636 deletions(-) New commits: commit 6be68d981adc4f408519e611213e6cedb340c278 Author: Drew Parsons [EMAIL PROTECTED] Date: Mon Oct 29 00:38:13 2007 +1100 Update upstream ChangeLog for 1.3.0. diff --git a/ChangeLog b/ChangeLog index e1417e4..dc3d7c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,77 @@ +commit c9e359fda611778da578f3699b8f2f4c9122852c +Author: Sascha Hlusiak [EMAIL PROTECTED] +Date: Sat Oct 27 18:50:08 2007 +0200 + +Added missing headerfiles to Makefile.am + +Files StrKeysym.h and ks_tables.h were missing. Sorry, guys. + +commit 8668189c26956922a9a10a80289162cfd5741bdf +Author: Sascha Hlusiak [EMAIL PROTECTED] +Date: Sat Oct 27 15:38:09 2007 +0200 + +Debug output of AutoRepeat option + +commit 68e4850b28c34d8e7a41fe2682a115183e3a22d4 +Author: Sascha Hlusiak [EMAIL PROTECTED] +Date: Wed Oct 10 18:00:59 2007 +0200 + +Added AutoRepeat option to specify rate and delay for key events. + +So far the autorepeat settings of xorg were used, thus sharing the settings with all other keyboard. This is still the default but the +rate and delay can be changed per device, not conflicting with the settings of other keyboards. + +commit 15870ef9bf57475ad79b839613fabd951daceac6 +Author: Sascha Hlusiak [EMAIL PROTECTED] +Date: Sat Oct 6 17:28:59 2007 +0200 + +Use XStringToKeysym to parse symbolic keys defined in xorg.conf. + +Users can map buttons to key=space or key=Left to map them to XK_space or XK_Left. As +fallback the numerical expression still works. + +commit 0897d8acdecf30f9496578019487263a22ed984b +Author: Sascha Hlusiak [EMAIL PROTECTED] +Date: Sat Oct 6 17:07:19 2007 +0200 + +Integrated XStringToKeysym from libX11 in the module. + +To look up Keysyms from Strings the method XStringToKeysym comes in handy, which would +require linking against libX11. By integrating the method in the module, this can be +avoided until similar functionallity get's included in xorg-server. + +commit 9e8f8d54bd300b562b9fe0a1b1e3bf8d45773651 +Author: Sascha Hlusiak [EMAIL PROTECTED] +Date: Wed Oct 3 22:46:30 2007 +0200 + +Updated manpage to reflect keymap changes + +commit c2270222a88f8152c28568e4212ccc9937dccbbd +Author: Sascha Hlusiak [EMAIL PROTECTED] +Date: Wed Oct 3 22:13:37 2007 +0200 + +Prepared for 1.3.0 release. Raised dependency of xorg-server to at least 1.3.99.901 for new keymap +behaviour. + +commit a62abe36b8b0af91539cf7e7dfa90795a73434bb +Author: Sascha Hlusiak [EMAIL PROTECTED] +Date: Wed Oct 3 21:37:25 2007 +0200 + +Readded own keymap for Joystick keys. This changes meaning of key, keylow and +keyhigh values in xorg.conf from scancodes to keysyms! + +New xorg-server 1.4 fixes a lot of keyboard things. This makes it necessary to +provide an own mapping rather than using the mapping of the current keyboard. A +keymap is built dynamically from the options provided. The options now need to +provide a keysym for each button instead of the scancodes of another keyboard +attached keyboard. + +commit 65009ab568500fac9980239a752d346a0d9b5ff1 +Author: Sascha Hlusiak [EMAIL PROTECTED] +Date: Wed Oct 3 00:33:09 2007 +0200 + +Added little check if device is enabled before disabling it + commit 13c850fe77b0a9a8a719bedfa1439e96972a730b Author: Sascha Hlusiak [EMAIL PROTECTED] Date: Sun Aug 12 13:01:16 2007 +0200 diff --git a/debian/changelog b/debian/changelog index 010165b..bde7c05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-input-joystick (1:1.3.0-2) unstable; urgency=low + + * Update upstream ChangeLog. + + -- Drew Parsons [EMAIL PROTECTED] Mon, 29 Oct 2007 00:38:35 +1100 + xserver-xorg-input-joystick (1:1.3.0-1) unstable; urgency=low * New upstream version. This is upstream version (git tag) commit 9996222e1661c814f647046c069c71314b065999 Author: Drew Parsons [EMAIL PROTECTED] Date: Mon Oct 29 00:26:03 2007 +1100 Autoreconf and upload new upstream version to unstable. diff --git a/Makefile.in b/Makefile.in index 0caba2a..d378007 100644 --- a/Makefile.in +++ b/Makefile.in @@ -164,6 +164,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ diff --git a/aclocal.m4 b/aclocal.m4 index aaae5ad..d8ab5fa 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -13,7 +13,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL +#
xserver-xorg-input-joystick: Changes to 'debian-unstable'
debian/xsfbs/xsfbs.mk | 23 --- 1 file changed, 23 deletions(-) New commits: commit 331c032528ba1faebef1d8eaa56db47f533f0426 Author: David Nusinow [EMAIL PROTECTED] Date: Sat Sep 22 23:49:11 2007 -0400 Remove make-orig-tar-gz target This target wasn't kept up to date and was totally broken for the git world. The way we use git has made this target pretty well impossible to use in any form, so it's been supersceded by a script that is currently located at http://people.debian.org/~dnusinow/xsf_scripts/git-make-orig-tar-gz diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index bfca7bb..b8f7afd 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -272,29 +272,6 @@ prune-upstream-tree: dh_testdir grep -rvh '^#' debian/prune/ | xargs --no-run-if-empty rm -rf -# Change to what should be the correct directory, ensure it is, and if -# so, create the .orig.tar.gz file. Exclude the debian directory and its -# contents, and any .svn directories and their contents (so that we can safely -# build an .orig.tar.gz from SVN checkout, not just an export). -# -# Note: This rule is for Debian package maintainers' convenience, and is not -# needed for conventional build scenarios. -# -# This rule *IS* the recommended method for creating a new .orig.tar.gz file, -# for the rare situations when one is needed. -.PHONY: make-orig-tar-gz -make-orig-tar-gz: clean prune-upstream-tree - ( cd .. \ - if [ $(shell basename $(CURDIR)) != $(SOURCE_NAME)-$(NO_EPOCH_VER) ]; then \ - echo Our current working directory has the wrong name. Renaming... 2; \ - mv $(CURDIR) $(SOURCE_NAME)-$(NO_EPOCH_VER); \ - fi; \ - tar --exclude=debian --exclude=debian/* \ - --exclude=.svn --exclude=.svn/* \ - -cf - $(SOURCE_NAME)-$(NO_EPOCH_VER) \ - | gzip -9 $(SOURCE_NAME)_$(NO_EPOCH_VER).orig.tar.gz; \ - ) - # Verify that there are no offsets or fuzz in the patches we apply. # # Note: This rule is for Debian package maintainers' convenience, and is not -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-input-joystick: Changes to 'debian-unstable'
debian/changelog | 14 ++ debian/control|4 ++-- debian/copyright |3 +++ debian/xsfbs/xsfbs.mk | 27 ++- debian/xsfbs/xsfbs.sh |7 --- 5 files changed, 37 insertions(+), 18 deletions(-) New commits: commit 68fd1b82d05e33e69a6131f11dc5d0d832d92f92 Author: David Nusinow [EMAIL PROTECTED] Date: Sun Sep 16 15:32:19 2007 -0400 * Upload to unstable diff --git a/debian/changelog b/debian/changelog index 09086fb..fd9e172 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-input-joystick (1:1.2.3-3) unstable; urgency=low + + * Upload to unstable + + -- David Nusinow [EMAIL PROTECTED] Sun, 16 Sep 2007 15:13:37 -0400 + xserver-xorg-input-joystick (1:1.2.3-2) experimental; urgency=low * Build against xserver 1.4. commit 5e834e6e34716a2f22c8e7596c50196244d2b0a2 Author: Brice Goglin [EMAIL PROTECTED] Date: Wed Sep 12 19:20:09 2007 +0200 Build against xserver 1.4 and fix various minor things diff --git a/debian/changelog b/debian/changelog index 80f6592..09086fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xserver-xorg-input-joystick (1:1.2.3-2) experimental; urgency=low + + * Build against xserver 1.4. + * Remove Branden from uploaders with his permission. He's always welcome back. + * Add upstream URL to debian/copyright. + + -- Brice Goglin [EMAIL PROTECTED] Wed, 12 Sep 2007 19:19:05 +0200 + xserver-xorg-input-joystick (1:1.2.3-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 3500cfd..1af2d17 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Source: xserver-xorg-input-joystick Section: x11 Priority: optional Maintainer: Debian X Strike Force debian-x@lists.debian.org -Uploaders: David Nusinow [EMAIL PROTECTED], Branden Robinson [EMAIL PROTECTED], Drew Parsons [EMAIL PROTECTED], Brice Goglin [EMAIL PROTECTED] -Build-Depends: debhelper (= 5), quilt, pkg-config, xserver-xorg-dev (= 2:1.2.99.902), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev +Uploaders: David Nusinow [EMAIL PROTECTED], Drew Parsons [EMAIL PROTECTED], Brice Goglin [EMAIL PROTECTED] +Build-Depends: debhelper (= 5), quilt, pkg-config, xserver-xorg-dev (= 2:1.4), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev Standards-Version: 3.7.2 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-joystick XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-joystick.git diff --git a/debian/copyright b/debian/copyright index db280fb..434899a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,3 +1,6 @@ +This package was downloaded from +http://xorg.freedesktop.org/releases/individual/driver/ + Copyright 1995-1999 by Frederic Lepied, France. [EMAIL PROTECTED] Permission to use, copy, modify, distribute, and sell this software and its commit 575efb7249d7cf194f07e45db17e601d9c259231 Author: Brice Goglin [EMAIL PROTECTED] Date: Wed Aug 29 09:36:00 2007 +0200 Do not call laptop-detect, let the only user call it directly diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index 52473ca..a90ff7d 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -59,13 +59,6 @@ fi ARCHITECTURE=$(dpkg --print-installation-architecture) -LAPTOP= -if [ -n $(which laptop-detect) ]; then -if laptop-detect /dev/null; then - LAPTOP=true -fi -fi - if [ $1 = reconfigure ] || [ -n $DEBCONF_RECONFIGURE ]; then RECONFIGURE=true else commit 12a633f722a2ff9677728d1e2ae56767f804232a Author: Brice Goglin [EMAIL PROTECTED] Date: Thu Jul 12 16:06:22 2007 +0200 Fix display the output of quilt push/pop. Fix commit 16d97b30b91da02d5a3edc2b895cbd4a1995f62d to check the return value of quilt, not the one of tee. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 5f13302..bfca7bb 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -147,9 +147,11 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare fi; \ if $(QUILT) next /dev/null 21; then \ echo -n Applying patches...; \ - if $(QUILT) push -a -v 21 | tee $(STAMP_DIR)/log/patch; then \ + if $(QUILT) push -a -v $(STAMP_DIR)/log/patch 21; then \ + cat $(STAMP_DIR)/log/patch; \ echo successful.; \ else \ + cat $(STAMP_DIR)/log/patch; \ echo failed! (check $(STAMP_DIR)/log/patch for details); \ exit 1; \ fi; \ @@ -164,9 +166,11 @@ unpatch: rm -f $(STAMP_DIR)/patch @echo -n Unapplying patches...; \ if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \ - if $(QUILT) pop -a -v 21 | tee $(STAMP_DIR)/log/unpatch; then \ + if $(QUILT) pop -a -v $(STAMP_DIR)/log/unpatch 21; then \ + cat $(STAMP_DIR)/log/unpatch; \ echo successful.; \ else \ + cat
xserver-xorg-input-joystick: Changes to 'debian-unstable'
.gitignore |2 ChangeLog | 167 ++ Makefile.am| 11 Makefile.in| 17 + config.h.in|6 config.sub | 14 - configure | 112 ++--- configure.ac | 14 + debian/changelog |6 debian/control |2 man/.gitignore |2 man/Makefile.in|2 man/joystick.man | 96 +++- src/Makefile.in|2 src/bsd_jstk.c | 371 src/jstk.c | 599 - src/jstk.h | 67 ++--- src/jstk_axis.c| 537 ++- src/jstk_axis.h|1 src/jstk_options.c | 326 +--- src/jstk_options.h |9 src/linux_jstk.c | 180 --- 22 files changed, 1533 insertions(+), 1010 deletions(-) New commits: commit 21587da618583921813c785e596dcaa5acfe4951 Author: Brice Goglin [EMAIL PROTECTED] Date: Thu Aug 16 17:49:25 2007 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 164aebf..80f6592 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -xserver-xorg-input-joystick (1:1.2.3-1) UNRELEASED; urgency=low +xserver-xorg-input-joystick (1:1.2.3-1) unstable; urgency=low * New upstream release. + * Add myself to uploaders. * Remove Fabio from uploaders with his permission. He's always welcome back. - -- Brice Goglin [EMAIL PROTECTED] Thu, 16 Aug 2007 17:46:39 +0200 + -- Brice Goglin [EMAIL PROTECTED] Thu, 16 Aug 2007 17:48:57 +0200 xserver-xorg-input-joystick (1:1.2.1-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 2846603..3500cfd 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 [EMAIL PROTECTED], Branden Robinson [EMAIL PROTECTED], Drew Parsons [EMAIL PROTECTED] +Uploaders: David Nusinow [EMAIL PROTECTED], Branden Robinson [EMAIL PROTECTED], Drew Parsons [EMAIL PROTECTED], Brice Goglin [EMAIL PROTECTED] Build-Depends: debhelper (= 5), quilt, pkg-config, xserver-xorg-dev (= 2:1.2.99.902), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev Standards-Version: 3.7.2 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-joystick commit 792e1cb392aa2636dd13fd4f4c50836beee20a9d Author: Brice Goglin [EMAIL PROTECTED] Date: Thu Aug 16 17:46:45 2007 +0200 New upstream release diff --git a/Makefile.in b/Makefile.in index dac60ae..0caba2a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -116,6 +116,8 @@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ +DEBUG_FALSE = @DEBUG_FALSE@ +DEBUG_TRUE = @DEBUG_TRUE@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ @@ -218,6 +220,8 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src man +EXTRA_DIST = autogen.sh ChangeLog +CLEANFILES = ChangeLog all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -459,6 +463,9 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir=$(top_distdir) distdir=$(distdir) \ + dist-hook -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ @@ -578,6 +585,7 @@ install-strip: mostlyclean-generic: clean-generic: + -test -z $(CLEANFILES) || rm -f $(CLEANFILES) distclean-generic: -test -z $(CONFIG_CLEAN_FILES) || rm -f $(CONFIG_CLEAN_FILES) @@ -640,7 +648,7 @@ uninstall-info: uninstall-info-recursive .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ check-am clean clean-generic clean-libtool clean-recursive \ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-shar dist-tarZ dist-zip distcheck distclean \ + dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \ distclean-generic distclean-hdr distclean-libtool \ distclean-recursive distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ @@ -652,6 +660,13 @@ uninstall-info: uninstall-info-recursive mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ tags tags-recursive uninstall uninstall-am uninstall-info-am + +.PHONY: ChangeLog + +ChangeLog: + (GIT_DIR=$(top_srcdir)/.git git-log .changelog.tmp mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' 2) + +dist-hook: ChangeLog # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for
xserver-xorg-input-joystick: Changes to 'debian-unstable'
debian/changelog |6 ++ debian/control |2 +- 2 files changed, 7 insertions(+), 1 deletion(-) New commits: commit b59674293cb59e381a3b7ce8c6a8c6f32120e0f7 Author: Brice Goglin [EMAIL PROTECTED] Date: Tue Apr 24 00:59:33 2007 +0200 Remove Fabio from uploaders with his permission. He's always welcome back. diff --git a/debian/changelog b/debian/changelog index d7f7630..c413987 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-input-joystick (1:1.2.1-3) UNRELEASED; urgency=low + + * Remove Fabio from uploaders with his permission. He's always welcome back. + + -- Brice Goglin [EMAIL PROTECTED] Tue, 24 Apr 2007 00:59:08 +0200 + xserver-xorg-input-joystick (1:1.2.1-2) unstable; urgency=low [ Brice Goglin ] diff --git a/debian/control b/debian/control index c5bbbac..2846603 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 [EMAIL PROTECTED], Branden Robinson [EMAIL PROTECTED], Fabio M. Di Nitto [EMAIL PROTECTED], Drew Parsons [EMAIL PROTECTED] +Uploaders: David Nusinow [EMAIL PROTECTED], Branden Robinson [EMAIL PROTECTED], Drew Parsons [EMAIL PROTECTED] Build-Depends: debhelper (= 5), quilt, pkg-config, xserver-xorg-dev (= 2:1.2.99.902), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev Standards-Version: 3.7.2 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-joystick -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-input-joystick: Changes to 'debian-unstable'
debian/changelog |5 +++-- debian/xsfbs/xsfbs.mk |7 +++ 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 637fb6a3f1de94a962f8b4f0010ef46b48f0a16d Author: Drew Parsons [EMAIL PROTECTED] Date: Sun Apr 22 19:12:58 2007 +1000 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index 12953c3..313ddce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,13 @@ -xserver-xorg-input-joystick (1:1.2.1-1) UNRELEASED; urgency=low +xserver-xorg-input-joystick (1:1.2.1-1) unstable; urgency=low + [ Brice Goglin ] * New upstream release. * Install the upstream changelog. * Add XS-Vcs-*. * Add a link to www.X.org and a reference to the xf86-input-joystick module in the long description. - -- Brice Goglin [EMAIL PROTECTED] Sat, 21 Apr 2007 03:45:07 +0200 + -- Drew Parsons [EMAIL PROTECTED] Sun, 22 Apr 2007 18:46:37 +1000 xserver-xorg-input-joystick (1:1.1.1-1) experimental; urgency=low commit 271778bd6338575afa3e4ae7f614f38cdff8e2fb Author: Branden Robinson [EMAIL PROTECTED](none) Date: Thu Apr 12 23:18:32 2007 -0400 Test for existence of debian/patches directory before creating a symlink to it. This prevents packages that apply no patches from ending up with a broken symlink in them. Remove SVN keyword. Update copyright notice. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index d88c6db..63dde45 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -1,11 +1,10 @@ #!/usr/bin/make -f -# $Id$ -# Debian rules file for xorg-x11 source package +# Debian X Strike Force Build System (XSFBS): Make portion # Copyright 1996 Stephen Early # Copyright 1997 Mark Eichin -# Copyright 1998-2005 Branden Robinson +# Copyright 1998-2005, 2007 Branden Robinson # Copyright 2005 David Nusinow # # Licensed under the GNU General Public License, version 2. See the file @@ -127,7 +126,7 @@ $(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir if [ ! -e $(STAMP_DIR)/log ]; then \ mkdir $(STAMP_DIR)/log; \ fi; \ - if [ ! -e patches ]; then \ + if [ -e debian/patches ] [ ! -e patches ]; then \ ln -s debian/patches patches; \ fi; \ $@ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-input-joystick: Changes to 'debian-unstable'
debian/changelog | 16 +--- debian/rules |2 +- 2 files changed, 14 insertions(+), 4 deletions(-) New commits: commit d3e102f9e4affb8bc38fd5bbd95ca1a2077d3771 Author: Drew Parsons [EMAIL PROTECTED] Date: Sun Apr 22 19:41:22 2007 +1000 Exclude man pages from dh_install (they are installed by dh_installman). diff --git a/debian/changelog b/debian/changelog index 76f2b1a..d7f7630 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,10 @@ xserver-xorg-input-joystick (1:1.2.1-2) unstable; urgency=low * Build-Depends: quilt, needed to apply patches. * Generate Provides: line automatically. - -- Drew Parsons [EMAIL PROTECTED] Sun, 22 Apr 2007 19:34:23 +1000 + [ Drew Parsons ] + * Exclude man pages from dh_install (they are installed by dh_installman) + + -- Drew Parsons [EMAIL PROTECTED] Sun, 22 Apr 2007 19:40:02 +1000 xserver-xorg-input-joystick (1:1.2.1-1) unstable; urgency=low diff --git a/debian/rules b/debian/rules index cb9ed06..4a3dbde 100755 --- a/debian/rules +++ b/debian/rules @@ -72,7 +72,7 @@ binary-arch: build install serverabi dh_installdocs dh_installchangelogs ChangeLog - dh_install --sourcedir=debian/tmp --list-missing --exclude=joystick_drv.la + dh_install --sourcedir=debian/tmp --list-missing --exclude=joystick_drv.la --exclude=usr/share/man/man4 dh_installman dh_link dh_strip commit c5fac30223b2c8730577501b53f876a41b2883e4 Author: Drew Parsons [EMAIL PROTECTED] Date: Sun Apr 22 19:36:37 2007 +1000 Add explanation for Build-Depends: xserver-xorg-dev = 2:1.2.99.902. (it's needed to let xsfbs get access to serverminver) diff --git a/debian/changelog b/debian/changelog index 058d0bc..76f2b1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,10 +2,11 @@ xserver-xorg-input-joystick (1:1.2.1-2) unstable; urgency=low [ Brice Goglin ] * Bump Build-Depends: xserver-xorg-dev to = 2:1.2.99.902. +(needed to let xsfbs get access to serverminver) * Build-Depends: quilt, needed to apply patches. * Generate Provides: line automatically. - -- Drew Parsons [EMAIL PROTECTED] Sun, 22 Apr 2007 19:21:07 +1000 + -- Drew Parsons [EMAIL PROTECTED] Sun, 22 Apr 2007 19:34:23 +1000 xserver-xorg-input-joystick (1:1.2.1-1) unstable; urgency=low commit 04ec0edfb9cf91595f08db8aed7a92678d42de16 Author: Drew Parsons [EMAIL PROTECTED] Date: Sun Apr 22 19:22:59 2007 +1000 Fix the last botched upload: include Brice's most recent changes. diff --git a/debian/changelog b/debian/changelog index 9d8dfbf..058d0bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,17 @@ -xserver-xorg-input-joystick (1:1.2.1-1) unstable; urgency=low +xserver-xorg-input-joystick (1:1.2.1-2) unstable; urgency=low [ Brice Goglin ] - * New upstream release. - * Install the upstream changelog. * Bump Build-Depends: xserver-xorg-dev to = 2:1.2.99.902. * Build-Depends: quilt, needed to apply patches. * Generate Provides: line automatically. + + -- Drew Parsons [EMAIL PROTECTED] Sun, 22 Apr 2007 19:21:07 +1000 + +xserver-xorg-input-joystick (1:1.2.1-1) unstable; urgency=low + + [ Brice Goglin ] + * New upstream release. + * Install the upstream changelog. * Add XS-Vcs-*. * Add a link to www.X.org and a reference to the xf86-input-joystick module in the long description. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-input-joystick: Changes to 'debian-unstable'
.gitignore | 20 ChangeLog| 578 ++ Makefile.in | 20 aclocal.m4 | 379 + autogen.sh | 12 config.guess | 667 +-- config.h.in |9 config.sub | 230 - configure| 7895 --- configure.ac | 42 debian/changelog | 26 debian/control | 14 debian/rules |8 debian/xsfbs/xsfbs-autoreconf.mk | 150 debian/xsfbs/xsfbs.mk| 380 + debian/xsfbs/xsfbs.sh| 907 ltmain.sh| 12 man/.gitignore |3 man/Makefile.am |6 man/Makefile.in | 26 man/joystick.man | 217 + mkinstalldirs| 89 src/.gitignore |6 src/Makefile.am | 18 src/Makefile.in | 48 src/bsd_jstk.c | 315 + src/jstk.c | 608 +++ src/jstk.h | 123 src/jstk_axis.c | 348 + src/jstk_axis.h | 31 src/jstk_hw.h| 38 src/jstk_options.c | 212 + src/jstk_options.h | 35 src/linux_jstk.c | 191 src/xf86Jstk.c | 795 --- 35 files changed, 9373 insertions(+), 5085 deletions(-) New commits: commit 71837c2b942b91d62bbd21b42f97f6c4a11e27cb Author: Brice Goglin [EMAIL PROTECTED] Date: Sun Apr 22 02:52:33 2007 +0200 Miscellaneous fixes in debian/control * Bump Build-Depends: xserver-xorg-dev to = 2:1.2.99.902 * Build-Depends: quilt, needed to apply patches. * Generate Provides: line automatically. diff --git a/debian/changelog b/debian/changelog index 12953c3..e034714 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ xserver-xorg-input-joystick (1:1.2.1-1) UNRELEASED; urgency=low * New upstream release. * Install the upstream changelog. + * Bump Build-Depends: xserver-xorg-dev to = 2:1.2.99.902. + * Build-Depends: quilt, needed to apply patches. + * Generate Provides: line automatically. * Add XS-Vcs-*. * Add a link to www.X.org and a reference to the xf86-input-joystick module in the long description. diff --git a/debian/control b/debian/control index 552d1c8..c5bbbac 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Debian X Strike Force debian-x@lists.debian.org Uploaders: David Nusinow [EMAIL PROTECTED], Branden Robinson [EMAIL PROTECTED], Fabio M. Di Nitto [EMAIL PROTECTED], Drew Parsons [EMAIL PROTECTED] -Build-Depends: debhelper (= 5), pkg-config, xserver-xorg-dev (= 2:1.2.0-3), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev +Build-Depends: debhelper (= 5), quilt, pkg-config, xserver-xorg-dev (= 2:1.2.99.902), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev Standards-Version: 3.7.2 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-joystick XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-joystick.git @@ -11,7 +11,7 @@ XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-joys Package: xserver-xorg-input-joystick Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends} -Provides: xserver-xorg-input +Provides: ${xinpdriver:Provides} Replaces: xserver-xorg ( 6.8.2-35) Description: X.Org X server -- joystick input driver This package provides the driver for joysticks. commit 1932a4505c3c4269a74ea52972d74dc212d5a276 Author: Brice Goglin [EMAIL PROTECTED] Date: Sat Apr 21 14:55:50 2007 +0200 Update and install the upstream changelog. diff --git a/ChangeLog b/ChangeLog index 92bef54..ca99dc7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,51 +1,567 @@ -2007-03-13 Sascha Hlusiak [EMAIL PROTECTED] +commit 25b5234948b6231577d44c5ad97a85d3a82b514a +Author: Sascha Hlusiak [EMAIL PROTECTED] +Date: Fri Apr 20 21:09:10 2007 -0400 - * src/xf86Jstk.c: - Cleaning and rearranging of code. - Made the module actually work at all. +Fixed wrong button number reported by bsd_jstk.c. +Fixed typo in reporting button and axes numbers in bsd_jstk.c -2006-04-06 Adam Jackson [EMAIL PROTECTED] +commit e1871e21955d5403c2751e83b5c00b2fa4886f22 +Author: Sascha Hlusiak [EMAIL PROTECTED] +Date: Thu Apr 19 12:39:53 2007 -0400 - * configure.ac: - * src/xf86Jstk.c: - Unlibcwrap. Bump server version requirement. Bump to 1.1.0. +Fixed accelerated axis movement not working the first time after startup + +Modified used algorithm to produce slower and smoother acceleration -2005-12-20 Kevin E. Martin
xserver-xorg-input-joystick: Changes to 'debian-unstable'
New branch 'debian-unstable' available with the following commits: commit 5b2aa93bb4a7155cd974b0ee83d1f5eb35005645 Author: Julien Cristau [EMAIL PROTECTED] Date: Tue Nov 7 06:46:29 2006 + For each driver, add a symlink to xserver-xorg-core's bug script, so that each new bugreport contains the user's config and log files. Bump dependencies on xserver-xorg-core to = 2:1.1.1-11, to make sure that the bug script is present. commit e23d3970b4276dccb1b138e8b8a4c6134e2a92b6 Author: Drew Parsons [EMAIL PROTECTED] Date: Tue Oct 10 14:29:14 2006 + For xserver-xorg-input-elo2300 xserver-xorg-input-elographics xserver-xorg-input-fpit xserver-xorg-input-jamstudio xserver-xorg-input-joystick: * New upstream version (X11R7.1). * Standards version 3.7.2. * [Build-] Depends: xserver-xorg (= 2:1.1.1-1). * Use debhelper 5. * Use dh_installman to install man pages. * Exclude elo2300_drv.la from dh_install. commit 409ae82279caa2719ac88d6f134e3bbed018e9ab Author: Drew Parsons [EMAIL PROTECTED] Date: Tue Oct 10 13:33:43 2006 + New upstream versions (X11R7.1): xf86-input-elo2300-1.1.0 xf86-input-elographics-1.1.0 xf86-input-fpit-1.1.0 xf86-input-jamstudio-1.1.0 xf86-input-joystick-1.1.0 commit c7d576876fb09c9bb9882fc0ae550df64510d042 Author: Thierry Reding [EMAIL PROTECTED] Date: Tue Sep 26 10:26:34 2006 + Add some more watch files. commit 57d6d5c94eee9e38ed2d318507d5d5dcfc7b5559 Author: Steve Langasek [EMAIL PROTECTED] Date: Mon Sep 18 08:03:56 2006 + merge 7.1 onto trunk for all input drivers -- packaging fixes only for everything except keyboard and mouse, so no uploads needed, but no reason to keep non-7.1 changes on a 7.1 branch we're abandoning, either commit 94d1d1fb18bb0b6af6886150c548f8a470c9403a Author: Steve Langasek [EMAIL PROTECTED] Date: Mon Sep 18 06:48:25 2006 + more fixes for unversioned directory names (input drivers) commit 9e74dde2f572c3c14225620aa0dd3f4769f5bd2c Author: David Nusinow [EMAIL PROTECTED] Date: Wed Apr 5 00:10:22 2006 + Prepare changelogs for upload to unstable commit 07f689001e6c2195281f565e4d9d683419cac61b Author: David Nusinow [EMAIL PROTECTED] Date: Mon Feb 13 03:46:16 2006 + Fix Branden's email address commit c9926eab12eb3652e0e643919af518ad03902d0f Author: David Nusinow [EMAIL PROTECTED] Date: Sun Feb 12 16:24:02 2006 + Move all install files for renaming scheme and delete v4l driver which doesn't currently have packaging commit 152c9d9f6935824e7913a04f4e0916e378dbd978 Author: David Nusinow [EMAIL PROTECTED] Date: Fri Feb 10 05:20:12 2006 + Actually change the names of the input drivers. commit d19ded3454a198641d838f1016b406cd7a77eed4 Author: David Nusinow [EMAIL PROTECTED] Date: Fri Feb 10 03:40:14 2006 + Change driver package names to new scheme commit 5e16ad439543b695bee3a01e2948ba903edc085e Author: David Nusinow [EMAIL PROTECTED] Date: Mon Jan 30 02:24:55 2006 + Move .install files to new naming scheme for drivers commit 56739ed2cdcc5b78ccba4fcb50c5d61791793bf4 Author: David Nusinow [EMAIL PROTECTED] Date: Sun Jan 29 21:21:32 2006 + Pull in and use xsfbs commit f5da5ef95afbd6cd12c2cedd4c73b94e757e9fc0 Author: David Nusinow [EMAIL PROTECTED] Date: Sun Jan 29 20:36:06 2006 + * Rename driver packages to be more consistent and intuitive + Video drivers are now named xorg-video-driver-foo and input drivers are now named xorg-input-driver-foo + Video drivers provide xorg-video-driver and input drivers provide xorg-input-driver + xorg-server-core depends on xorg-video-drivers-all | xorg-video-driver and also xorg-input-drivers-all | xorg-input-drivers commit 21dc19242a778b1b1137fc236a7a4a67497de6a1 Author: David Nusinow [EMAIL PROTECTED] Date: Fri Jan 20 04:31:26 2006 + Fix maintainer and uploader fields. God, I love sed. commit 8afe1a0b169d8d7d338941a6ad95744c108bb804 Author: David Nusinow [EMAIL PROTECTED] Date: Fri Jan 20 01:44:20 2006 + Add packaging for jamstudio, elo2300, voodoo, joystick, and evdev commit 6fd32bed0f59cd1aeaffbf513458666ab1af7891 Author: David Nusinow [EMAIL PROTECTED] Date: Fri Jan 13 04:05:21 2006 + Update drivers in modular branch. We'll re-pull the ubuntu packaging properly commit aecf848c2c95d8582ed10477bf8a64a2f5ef0ce6 Author: David Nusinow [EMAIL PROTECTED] Date: Fri Dec 30 18:14:25 2005 + Vendor drop of the rest of 7.0 -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]