Rebased ref, commits from common ancestor:
commit 9df94e21f8d79a677068f27216dac65f0251f66e
Author: Andreas Boll <andreas.boll....@gmail.com>
Date: 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 <andreas.boll....@gmail.com> 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 0000000..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 <tjaal...@debian.org>
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 <tjaal...@debian.org> Fri, 18 Nov 2016 12:39:50 +0200
+ -- Timo Aaltonen <tjaal...@debian.org> 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 <tjaal...@debian.org>
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 <peter.hutte...@who-t.net>
+Date: Fri Nov 18 08:58:35 2016 +1000
+
+ joystick 1.6.3
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 60d0e9c451b3f259d524b0ddcc5c1f21a4f82293
+Author: Matthieu Herrb <matth...@herrb.eu>
+Date: Sun Jul 31 12:54:14 2016 +0200
+
+ use xf86{Add,Remove}EnabledDevice()
+
+ Signed-off-by: Matthieu Herrb <matth...@herrb.eu>
+ Reviewed-by: Adam Jackson <a...@redhat.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit baf8bd4441d5dc6cdd687e066bf13cc1c3df1a41
+Author: Hans de Goede <hdego...@redhat.com>
+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 <hdego...@redhat.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 341d23ceaa9d5483b5318425e7308e09f8941957
+Author: Hans de Goede <hdego...@redhat.com>
+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 <hdego...@redhat.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 6de3b75c453e4687b21f6d6acfcf87e7041c4fc5
+Author: Hans de Goede <hdego...@redhat.com>
+Date: Thu Mar 13 14:49:51 2014 +0100
+
+ Use jstkCloseDevice_* on error in jstkOpenDevice_* backend functions
+
+ This is a preparation patch for adding support for server managed fds, this
+ also fixes a missing free() in an error handling path in the evdev
back-end.
+
+ Signed-off-by: Hans de Goede <hdego...@redhat.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit a976a85aeff4f2511544c0385533d9387957afae
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Wed Jan 30 12:57:51 2013 +1000
+
+ Handle DEVICE_ABORT for input ABI 19.1
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
commit 426c3aa3c8a2385f17e37ae73c1e78f072656027
Author: Sascha Hlusiak <saschahlus...@arcor.de>
Date: Wed Jan 16 10:52:12 2013 +0100
diff --git a/debian/changelog b/debian/changelog
index 0f9a13d..de7fd1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-joystick (1:1.6.3-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ - support-new-api.diff: dropped, upstream
+
+ -- Timo Aaltonen <tjaal...@debian.org> Fri, 18 Nov 2016 12:39:50 +0200
+
xserver-xorg-input-joystick (1:1.6.2-2) unstable; urgency=medium
* support-new-api.diff: Fix build with xserver 1.19.
diff --git a/debian/patches/series b/debian/patches/series
index 258f787..f047877 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
0001-Fix-includes-for-kfreebsd.diff
-support-new-api.diff
diff --git a/debian/patches/support-new-api.diff
b/debian/patches/support-new-api.diff
deleted file mode 100644
index 1b2356c..0000000
--- a/debian/patches/support-new-api.diff
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/src/jstk.c
-+++ b/src/jstk.c
-@@ -61,6 +61,10 @@
- char debug_level = 0;
- #endif
-
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 23
-+#define HAVE_THREADED_INPUT 1
-+#endif
-+
- /*
- ***************************************************************************
- *
-@@ -124,8 +128,13 @@ jstkReadProc(InputInfoPtr pInfo)
- ((r=priv->read_proc(priv, &event, &number))==0)) {
- xf86Msg(X_WARNING, "JOYSTICK: Read failed. Deactivating
device.\n");
-
-- if (pInfo->fd >= 0)
-- RemoveEnabledDevice(pInfo->fd);
-+ if (pInfo->fd >= 0) {
-+#if HAVE_THREADED_INPUT
-+ xf86RemoveEnabledDevice(pInfo);
-+#else
-+ RemoveEnabledDevice(pInfo->fd);
-+#endif
-+ }
- return;
- }
-
-@@ -392,7 +401,11 @@ jstkDeviceControlProc(DeviceIntPtr
- if (jstkOpenDevice(priv, FALSE) != -1) {
- pJstk->public.on = TRUE;
- pInfo->fd = priv->fd;
-- AddEnabledDevice(pInfo->fd);
-+#if HAVE_THREADED_INPUT
-+ xf86AddEnabledDevice(pInfo);
-+#else
-+ AddEnabledDevice(pInfo->fd);
-+#endif
- } else return !Success;
- break;
-
-@@ -414,8 +427,13 @@ jstkDeviceControlProc(DeviceIntPtr
- TimerCancel(priv->axis[i].timer);
- }
-
-- if (pInfo->fd >= 0)
-- RemoveEnabledDevice(pInfo->fd);
-+ if (pInfo->fd >= 0) {
-+#if HAVE_THREADED_INPUT
-+ xf86RemoveEnabledDevice(pInfo);
-+#else
-+ RemoveEnabledDevice(pInfo->fd);
-+#endif
-+ }
- pInfo->fd = -1;
- if (priv->close_proc)
- priv->close_proc(priv);
commit 27dba58ed7a0d8d984504f7c2ab7435ba6b83257
Author: Timo Aaltonen <tjaal...@debian.org>
Date: 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 <tjaal...@debian.org> Thu, 17 Nov 2016 16:01:10 +0200
+ -- Timo Aaltonen <tjaal...@debian.org> 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 <tjaal...@debian.org>
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 <tjaal...@debian.org> 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 <debian-x@lists.debian.org>
-Uploaders: Drew Parsons <dpars...@debian.org>, Cyril Brulebois
<k...@debian.org>
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 <tjaal...@debian.org>
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 <tjaal...@debian.org> 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 <tjaal...@debian.org>
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 <tjaal...@debian.org> 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 d311cf6459b79fe93fc0cc7db3c7b793b371deeb
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Thu Nov 17 16:28:19 2016 +0200
support-new-api.diff: Fix build with xserver 1.19.
diff --git a/debian/changelog b/debian/changelog
index fdac6af..ffed023 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-joystick (1:1.6.2-2) UNRELEASED; urgency=medium
+
+ * support-new-api.diff: Fix build with xserver 1.19.
+
+ -- Timo Aaltonen <tjaal...@debian.org> Thu, 17 Nov 2016 16:01:10 +0200
+
xserver-xorg-input-joystick (1:1.6.2-1) unstable; urgency=low
[ Michele Cane ]
diff --git a/debian/patches/series b/debian/patches/series
index f047877..258f787 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
0001-Fix-includes-for-kfreebsd.diff
+support-new-api.diff
diff --git a/debian/patches/support-new-api.diff
b/debian/patches/support-new-api.diff
new file mode 100644
index 0000000..1b2356c
--- /dev/null
+++ b/debian/patches/support-new-api.diff
@@ -0,0 +1,58 @@
+--- a/src/jstk.c
++++ b/src/jstk.c
+@@ -61,6 +61,10 @@
+ char debug_level = 0;
+ #endif
+
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 23
++#define HAVE_THREADED_INPUT 1
++#endif
++
+ /*
+ ***************************************************************************
+ *
+@@ -124,8 +128,13 @@ jstkReadProc(InputInfoPtr pInfo)
+ ((r=priv->read_proc(priv, &event, &number))==0)) {
+ xf86Msg(X_WARNING, "JOYSTICK: Read failed. Deactivating
device.\n");
+
+- if (pInfo->fd >= 0)
+- RemoveEnabledDevice(pInfo->fd);
++ if (pInfo->fd >= 0) {
++#if HAVE_THREADED_INPUT
++ xf86RemoveEnabledDevice(pInfo);
++#else
++ RemoveEnabledDevice(pInfo->fd);
++#endif
++ }
+ return;
+ }
+
+@@ -392,7 +401,11 @@ jstkDeviceControlProc(DeviceIntPtr
+ if (jstkOpenDevice(priv, FALSE) != -1) {
+ pJstk->public.on = TRUE;
+ pInfo->fd = priv->fd;
+- AddEnabledDevice(pInfo->fd);
++#if HAVE_THREADED_INPUT
++ xf86AddEnabledDevice(pInfo);
++#else
++ AddEnabledDevice(pInfo->fd);
++#endif
+ } else return !Success;
+ break;
+
+@@ -414,8 +427,13 @@ jstkDeviceControlProc(DeviceIntPtr
+ TimerCancel(priv->axis[i].timer);
+ }
+
+- if (pInfo->fd >= 0)
+- RemoveEnabledDevice(pInfo->fd);
++ if (pInfo->fd >= 0) {
++#if HAVE_THREADED_INPUT
++ xf86RemoveEnabledDevice(pInfo);
++#else
++ RemoveEnabledDevice(pInfo->fd);
++#endif
++ }
+ pInfo->fd = -1;
+ if (priv->close_proc)
+ priv->close_proc(priv);
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,
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: https://bugs.freedesktop.org/show_bug.cgi?id=42399
+
+ joysticks with a rectangular field have a
+ corner position of (32768,32768), joysticks with a
+ circular field have (23170,23170).
+
+ make sure that diagonal movement feels fast. either:
+ 1) linear
+
+ f(32768) ~= f(23170) + f(23170)
+ f(32768) ~= a * f(23170)
+ a = 2.0
+
+ on circular joysticks, the time needed for xy movement is
+ exactly the time needed for x + the time for y separately.
+ absolute diagonal travel speed (in cm/s) is 0.707 times as fast,
+ which feels pretty slow.
+
+ on square joysticks, diagonal travel speed is always 1.41 times
+ faster than orthogonal travel speed. time needed for diagonal
+ movement is always 0.5 times as long as for orthogonal movement.
+
+ the value of a = 2.0 results in a nice, non-linear acceleration.
+
+ or
+ 2) trigonometric
+
+ f(32768) ~= sqrt(f(23170)^2 + f(23170)^2))
+ f(32768) ~= a * f(23170)
+ a = 1.414
+
+ on circular joysticks, the absolute pointer travel speed
+ (in cm/s) is now the same for both linear and diagonal movement,
+ which feels natural. moving diagonally takes 0.707 times the time
+ of moving orthogonally.
+
+ on square joysticks, values are as in 1)
+
+ the value of a = 1.414 results in linear acceleration, which feels
+ too slow.
+
+ to maintain non-linear acceleration, make sure that:
+
+ a >>= 1.414
+
+ the following formula achieves results inbetween,
+ so it should feel natural on both devices while maintaining a
+ nice acceleration:
+
+ f(32768) ~= 1.620 * f(23170)
+
+commit 342057bf38e2da46609ed2fa0d3f5fb46c8ed215
+Author: Sascha Hlusiak <saschahlus...@arcor.de>
+Date: Sat Oct 6 16:18:24 2012 +0200
+
+ backend_evdev: fix scaling overflow for high resolution axes
+
+ The module scales all axis values from the kernel to the range of
+ -32768 .. 32768, for compatibility with the old joystick kernel module.
+
+ The current implementation had an integer overflow, if the axis had a high
+ resolution of > 16384, like the popular XBox 360 controller.
+
+ This commitmakes the scaling use float instead to fix erratic behaviour
+ on high resolution joysticks. The joystick backend was not affected.
+
+ Fixes bug: https://bugs.freedesktop.org/show_bug.cgi?id=42399
+
+commit 053405f711512959e95d0a882d69b6cba6405e7d
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Sun Jan 13 10:56:53 2013 -0500
+
+ Replace deprecated Automake INCLUDES variable with AM_CPPFLAGS
+
+ Excerpt https://lists.gnu.org/archive/html/automake/2012-12/msg00038.html
+
+ - Support for the long-deprecated INCLUDES variable will be removed
+ altogether in Automake 1.14. The AM_CPPFLAGS variable should be
+ used instead.
+
+ This variable was deprecated in Automake releases prior to 1.10, which is
the
+ current minimum level required to build X.
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit baa96c22e74b5f617b64d9f5ae21c52a4c4fa190
+Author: Sascha Hlusiak <saschahlus...@arcor.de>
+Date: Wed Oct 3 18:53:00 2012 +0200
+
+ configure: enable debug output code by default
+
+ there are rare cases when disabling debug code gives any benefit but the
lack of debugging output,
+ which needs to be enabled anyway with the DebugLevel option
+
+commit b427ad6066e966f63a0da82e4b0ef3344064f6a1
+Author: Sascha Hlusiak <saschahlus...@arcor.de>
+Date: Wed Oct 3 18:44:58 2012 +0200
+
+ man: more manpage tuning and polishing
+
+commit 4b0ca090b71e70cc2b5bcd93ed40fc8c40c499fa
+Author: Sascha Hlusiak <saschahlus...@arcor.de>
+Date: Wed Oct 3 18:44:06 2012 +0200
+
+ config: mention floating option in xorg.conf.d snippet
+
+commit c473c8bd7985441d8264f8f48537d39dbe0c874e
+Author: Sascha Hlusiak <saschahlus...@arcor.de>
+Date: Wed Oct 3 17:39:55 2012 +0200
+
+ man: mention use cases for when to use the module and when not to
+
+commit 56ebbd899f709b3fae7e382ac3429a4c87867c63
+Author: Sascha Hlusiak <saschahlus...@arcor.de>
+Date: Wed Oct 3 16:32:36 2012 +0200
+
+ man: some typos and grammar fixes
+
+commit 0303d5418ec7a3825433e308f195fc41fecb9ded
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Tue Oct 2 14:40:05 2012 +1000
+
+ man: point out that the joystick module is not a joystick driver
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Signed-off-by: Sascha Hlusiak <saschahlus...@arcor.de>
+
+commit acd398ac712689fb5239410d1da706752aa60a33
+Author: Sascha Hlusiak <saschahlus...@arcor.de>
+Date: Tue Sep 25 10:57:46 2012 +0200
+
+ silence compiler warnings
+
commit bdf8fd3f650789d2012ec0cc915729dd1e91346d
Author: Sascha Hlusiak <saschahlus...@arcor.de>
Date: Sun Mar 11 11:45:08 2012 +0100
diff --git a/debian/changelog b/debian/changelog
index 50b352b..8765088 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-joystick (1:1.6.2-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- 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
* New upstream release.
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 unknown values in pInfo->device_control.
+
+ Signed-off-by: Terry Lambert <tlamb...@chromium.org>
+ Reviewed-by: Stephane Marchesin <marc...@chromium.org>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
commit bd6c54fe672a913334bfba1ca5dc0f2e0f1f1152
Author: Sascha Hlusiak <saschahlus...@arcor.de>
Date: Wed Apr 20 20:55:24 2011 +0200
diff --git a/debian/changelog b/debian/changelog
