ChangeLog | 22 +++++++++++++++++
configure.ac | 2 -
debian/changelog | 10 ++++++++
debian/control | 2 -
src/mouse.c | 2 +
src/mouse.h | 1
src/sun_mouse.c | 68 -------------------------------------------------------
7 files changed, 37 insertions(+), 70 deletions(-)
New commits:
commit 54a9aaf48a73e6a5c7914b03067e03e1bd947696
Author: Cyril Brulebois <k...@debian.org>
Date: Tue Jul 5 19:43:23 2011 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 49a2d2a..4234291 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-mouse (1:1.7.1-1) UNRELEASED; urgency=low
+xserver-xorg-input-mouse (1:1.7.1-1) unstable; urgency=low
* New upstream release:
- Mostly equivalent to the previous upload, due to the merge from
@@ -6,7 +6,7 @@ xserver-xorg-input-mouse (1:1.7.1-1) UNRELEASED; urgency=low
anyway.
* Bump Standards-Version to 3.9.2 (no changes).
- -- Cyril Brulebois <k...@debian.org> Tue, 05 Jul 2011 19:40:09 +0200
+ -- Cyril Brulebois <k...@debian.org> Tue, 05 Jul 2011 19:43:19 +0200
xserver-xorg-input-mouse (1:1.7.0-4) unstable; urgency=low
commit 9afdae0fee138026d0a2fa8aacfd7ef865d7bb3b
Author: Cyril Brulebois <k...@debian.org>
Date: Tue Jul 5 19:43:18 2011 +0200
Bump Standards-Version to 3.9.2 (no changes).
diff --git a/debian/changelog b/debian/changelog
index 3524df4..49a2d2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-input-mouse (1:1.7.1-1) UNRELEASED; urgency=low
- Mostly equivalent to the previous upload, due to the merge from
upstream in 1:1.7.0-2, but let's keep up with new upstream releases
anyway.
+ * Bump Standards-Version to 3.9.2 (no changes).
-- Cyril Brulebois <k...@debian.org> Tue, 05 Jul 2011 19:40:09 +0200
diff --git a/debian/control b/debian/control
index 11828a9..a40be49 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
x11proto-randr-dev,
quilt,
xutils-dev (>= 1:7.5+4)
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-mouse
Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-mouse.git
commit 6fe395d5fa6faaeffe51136eb090f764db15320c
Author: Cyril Brulebois <k...@debian.org>
Date: Tue Jul 5 19:42:03 2011 +0200
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index f4c972b..05419b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+commit 9f969bd4d1995aa802bef1cfe93afedc412bbd8a
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Tue Jul 5 09:09:26 2011 -0700
+
+ xf86-input-mouse 1.7.1
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit b12fa0d5ab23237bc2ac02143739ef6861e55146
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Fri Jun 24 22:52:59 2011 -0700
+
+ Fix Solaris issues with new ABI12 init process.
+
+ Based on BSD changes in commit a22879c6779283684fe4a61543fc95179b4f5d0b
+ by Alexandr Shadchin
+
+ Fix segfaults when mouse device fails to open.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
commit 1780667854d73bbd0e0596271b09f93321cd0b1d
Author: Samuel Thibault <samuel.thiba...@ens-lyon.org>
Date: Wed Mar 30 02:26:25 2011 +0200
diff --git a/debian/changelog b/debian/changelog
index 6cf9ad2..3524df4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xserver-xorg-input-mouse (1:1.7.1-1) UNRELEASED; urgency=low
+
+ * New upstream release:
+ - Mostly equivalent to the previous upload, due to the merge from
+ upstream in 1:1.7.0-2, but let's keep up with new upstream releases
+ anyway.
+
+ -- Cyril Brulebois <k...@debian.org> Tue, 05 Jul 2011 19:40:09 +0200
+
xserver-xorg-input-mouse (1:1.7.0-4) unstable; urgency=low
* Upload to unstable.
commit 9f969bd4d1995aa802bef1cfe93afedc412bbd8a
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Tue Jul 5 09:09:26 2011 -0700
xf86-input-mouse 1.7.1
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/configure.ac b/configure.ac
index 55eeac5..4c5e92c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-mouse],
- [1.7.0],
+ [1.7.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-mouse])
AC_CONFIG_SRCDIR([Makefile.am])
commit b12fa0d5ab23237bc2ac02143739ef6861e55146
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Fri Jun 24 22:52:59 2011 -0700
Fix Solaris issues with new ABI12 init process.
Based on BSD changes in commit a22879c6779283684fe4a61543fc95179b4f5d0b
by Alexandr Shadchin
Fix segfaults when mouse device fails to open.
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/src/mouse.c b/src/mouse.c
index c3498ea..d981f6f 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -253,6 +253,7 @@ static MouseProtocolRec mouseProtocols[] = {
/* Misc (usually OS-specific) */
{ "SysMouse", MSE_MISC, mlDefaults, PROT_SYSMOUSE },
{ "WSMouse", MSE_MISC, NULL, PROT_WSMOUSE },
+ { "VUID", MSE_MISC, NULL, PROT_VUID },
/* end of list */
{ NULL, MSE_NONE, NULL, PROT_UNKNOWN }
@@ -819,6 +820,7 @@ MousePickProtocol(InputInfoPtr pInfo, const char* device,
switch (protocolID) {
case PROT_WSMOUSE:
+ case PROT_VUID:
if (osInfo->PreInit)
osInfo->PreInit(pInfo, protocol, 0);
break;
diff --git a/src/mouse.h b/src/mouse.h
index 6e63c54..2cc588a 100644
--- a/src/mouse.h
+++ b/src/mouse.h
@@ -78,6 +78,7 @@ typedef enum {
PROT_AUTO,
PROT_SYSMOUSE,
PROT_WSMOUSE,
+ PROT_VUID,
PROT_NUMPROTOS /* This must always be last. */
} MouseProtocolID;
diff --git a/src/sun_mouse.c b/src/sun_mouse.c
index dd545c7..b0d53e8 100644
--- a/src/sun_mouse.c
+++ b/src/sun_mouse.c
@@ -212,77 +212,9 @@ vuidPreInit(InputInfoPtr pInfo, const char *protocol, int
flags)
return FALSE;
}
- pMse->protocol = protocol;
- xf86Msg(X_CONFIG, "%s: Protocol: %s\n", pInfo->name, protocol);
-
- /* Collect the options, and process the common options. */
- COLLECT_INPUT_OPTIONS(pInfo, NULL);
- xf86ProcessCommonOptions(pInfo, pInfo->options);
-
pVuidMse->buffer = (unsigned char *)&pVuidMse->event;
pVuidMse->strmod = xf86SetStrOption(pInfo->options, "StreamsModule", NULL);
- /* Check if the device can be opened. */
- pInfo->fd = xf86OpenSerial(pInfo->options);
- if (pInfo->fd == -1) {
- if (xf86GetAllowMouseOpenFail()) {
- xf86Msg(X_WARNING, "%s: cannot open input device\n", pInfo->name);
- } else {
- xf86Msg(X_ERROR, "%s: cannot open input device\n", pInfo->name);
- free(pVuidMse->strmod);
- free(pVuidMse);
- free(pMse);
- return FALSE;
- }
- } else {
- if (pVuidMse->strmod) {
- /* Check to see if module is already pushed */
- SYSCALL(i = ioctl(pInfo->fd, I_FIND, pVuidMse->strmod));
-
- if (i == 0) { /* Not already pushed */
- SYSCALL(i = ioctl(pInfo->fd, I_PUSH, pVuidMse->strmod));
- if (i < 0) {
- xf86Msg(X_ERROR,
- "%s: cannot push module '%s' onto mouse device: %s\n",
- pInfo->name, pVuidMse->strmod, strerror(errno));
- xf86CloseSerial(pInfo->fd);
- pInfo->fd = -1;
- free(pVuidMse->strmod);
- free(pVuidMse);
- free(pMse);
- return FALSE;
- }
- }
- }
-
- buttons = xf86SetIntOption(pInfo->options, "Buttons", 0);
- if (buttons == 0) {
- SYSCALL(i = ioctl(pInfo->fd, MSIOBUTTONS, &buttons));
- if (i == 0) {
- pInfo->options =
- xf86ReplaceIntOption(pInfo->options,
- "Buttons", buttons);
- xf86Msg(X_INFO, "%s: Setting Buttons option to \"%d\"\n",
- pInfo->name, buttons);
- }
- }
-
- if (pVuidMse->strmod) {
- SYSCALL(i = ioctl(pInfo->fd, I_POP, pVuidMse->strmod));
- if (i == -1) {
- xf86Msg(X_WARNING,
- "%s: cannot pop module '%s' off mouse device: %s\n",
- pInfo->name, pVuidMse->strmod, strerror(errno));
- }
- }
-
- xf86CloseSerial(pInfo->fd);
- pInfo->fd = -1;
- }
-
- /* Process common mouse options (like Emulate3Buttons, etc). */
- pMse->CommonOptions(pInfo);
-
/* Setup the local procs. */
pVuidMse->wrapped_device_control = pInfo->device_control;
pInfo->device_control = vuidMouseProc;
--
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/e1qe9hd-0000bf...@vasks.debian.org
