COPYING | 66 ++++++++++++++++++++++++++++++++++++++---------------- ChangeLog | 44 ++++++++++++++++++++++++++++++++++++ configure.ac | 2 - debian/changelog | 6 ++++ src/vmmouse.c | 1 tools/Makefile.am | 5 ++-- 6 files changed, 101 insertions(+), 23 deletions(-)
New commits: commit 304b209a63435a53b2e2da1a45d768ed7beb4084 Author: Robert Hooker <[email protected]> Date: Mon Oct 18 15:51:27 2010 -0400 Update changelogs. diff --git a/ChangeLog b/ChangeLog index 5b32f23..bda91b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,47 @@ +commit adc177e3af9dc5da982ceb7a93e9c5e3bc6aed59 +Author: Adam Jackson <[email protected]> +Date: Tue Aug 10 10:36:33 2010 -0400 + + xf86-input-vmmouse 12.6.10 + + Signed-off-by: Adam Jackson <[email protected]> + +commit cc76aec9b712403c777b7ce1290fa1e7ca62bf8c +Author: Adam Jackson <[email protected]> +Date: Tue Aug 10 10:36:21 2010 -0400 + + Fix distcheck + +commit 61608b87c01ce87bd29869c1554a2ade5998782c +Author: Alan Coopersmith <[email protected]> +Date: Fri Jul 9 20:45:53 2010 -0700 + + Improve Solaris compatibility of hal-probe-vmmouse generation rule + + Use $(SED) from AC_PROG_SED to ensure a good version of sed is found + Use explicit input file name instead of $< to workaround Solaris make + issue with $< in explicit rules. + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit d7700bed84f6632913a6590cc9cc9d10b815a08c +Author: Fernando Carrijo <[email protected]> +Date: Thu Jul 1 07:14:14 2010 -0300 + + Purge macro NEED_EVENTS + + Signed-off-by: Fernando Carrijo <[email protected]> + Acked-by: Tiago Vignatti <[email protected]> + Reviewed-by: Alan Coopersmith <[email protected]> + +commit 4e3bf19d2637cb034e31611ef184348f12677e81 +Author: Gaetan Nadon <[email protected]> +Date: Sat Jun 12 10:09:48 2010 -0400 + + COPYING: update and refactor Copyright notices + + Signed-off-by: Gaetan Nadon <[email protected]> + commit 833698b3b9857fda176c91a0dbb128275a174624 Author: Gaetan Nadon <[email protected]> Date: Sun Apr 25 19:36:19 2010 -0400 diff --git a/debian/changelog b/debian/changelog index f251dad..97bba86 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-input-vmmouse (1:12.6.10-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Robert Hooker <[email protected]> Mon, 18 Oct 2010 15:50:48 -0400 + xserver-xorg-input-vmmouse (1:12.6.9-4) experimental; urgency=low * Merge xsfbs to get unversioned Provides. commit adc177e3af9dc5da982ceb7a93e9c5e3bc6aed59 Author: Adam Jackson <[email protected]> Date: Tue Aug 10 10:36:33 2010 -0400 xf86-input-vmmouse 12.6.10 Signed-off-by: Adam Jackson <[email protected]> diff --git a/configure.ac b/configure.ac index 6c29dc2..8c1322c 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-vmmouse], - 12.6.9, + 12.6.10, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-vmmouse) commit cc76aec9b712403c777b7ce1290fa1e7ca62bf8c Author: Adam Jackson <[email protected]> Date: Tue Aug 10 10:36:21 2010 -0400 Fix distcheck diff --git a/tools/Makefile.am b/tools/Makefile.am index 02a721e..77a9731 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -31,7 +31,7 @@ callouts_SCRIPTS = hal-probe-vmmouse hal-probe-vmmouse: hal-probe-vmmouse.in $(AM_V_GEN)$(SED) -e 's|__BIN_PREFIX__|$(bindir)|g' \ -e 's|__HAL_BIN_PREFIX__|$(HAL_BIN_DIR)|g' \ - < hal-probe-vmmouse.in > $@ + < $< > $@ EXTRA_DIST = hal-probe-vmmouse.in @@ -52,7 +52,8 @@ udev_DATA = 69-xorg-vmmouse.rules $(udev_DATA): $(udev_DATA).in sed -e 's|__BIN_PREFIX__|$(bindir)|g' < $< > $@ -EXTRA_DIST += $(udev_DATA).in CLEANFILES += $(udev_DATA) endif # HAS_UDEV_RULES_DIR + +EXTRA_DIST = $(udev_DATA).in hal-probe-vmmouse.in commit 61608b87c01ce87bd29869c1554a2ade5998782c Author: Alan Coopersmith <[email protected]> Date: Fri Jul 9 20:45:53 2010 -0700 Improve Solaris compatibility of hal-probe-vmmouse generation rule Use $(SED) from AC_PROG_SED to ensure a good version of sed is found Use explicit input file name instead of $< to workaround Solaris make issue with $< in explicit rules. Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/tools/Makefile.am b/tools/Makefile.am index 581ad65..02a721e 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -29,9 +29,9 @@ calloutsdir=$(HAL_CALLOUTS_DIR) callouts_SCRIPTS = hal-probe-vmmouse hal-probe-vmmouse: hal-probe-vmmouse.in - sed -e 's|__BIN_PREFIX__|$(bindir)|g' \ + $(AM_V_GEN)$(SED) -e 's|__BIN_PREFIX__|$(bindir)|g' \ -e 's|__HAL_BIN_PREFIX__|$(HAL_BIN_DIR)|g' \ - < $< > $@ + < hal-probe-vmmouse.in > $@ EXTRA_DIST = hal-probe-vmmouse.in commit d7700bed84f6632913a6590cc9cc9d10b815a08c Author: Fernando Carrijo <[email protected]> Date: Thu Jul 1 07:14:14 2010 -0300 Purge macro NEED_EVENTS Signed-off-by: Fernando Carrijo <[email protected]> Acked-by: Tiago Vignatti <[email protected]> Reviewed-by: Alan Coopersmith <[email protected]> diff --git a/src/vmmouse.c b/src/vmmouse.c index 1b08eff..f5ad234 100644 --- a/src/vmmouse.c +++ b/src/vmmouse.c @@ -48,7 +48,6 @@ #endif #include <stdio.h> -#define NEED_EVENTS #include <X11/X.h> #include <X11/Xproto.h> commit 4e3bf19d2637cb034e31611ef184348f12677e81 Author: Gaetan Nadon <[email protected]> Date: Sat Jun 12 10:09:48 2010 -0400 COPYING: update and refactor Copyright notices Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/COPYING b/COPYING index 901b59f..ae6cbd9 100644 --- a/COPYING +++ b/COPYING @@ -1,23 +1,51 @@ -Copyright (c) 2006 VMware, Inc. +Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. +Copyright 1993 by David Dawes <[email protected]> +Copyright 2002 by SuSE Linux AG, Author: Egbert Eich +Copyright 1994-2002 by The XFree86 Project, Inc. +Copyright 2002 by Paul Elliott +Copyright 2002-2006 by VMware, Inc. -Permission is hereby granted, free of charge, to any person obtaining a copy of this -software and associated documentation files (the "Software"), to deal in the Software -without restriction, including without limitation the rights to use, copy, modify, merge, -publish, distribute, sublicense, and/or sell copies of the Software, and to permit -persons to whom the Software is furnished to do so, subject to the following conditions: +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the names of copyright holders not be +used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. The copyright holders +make no representations about the suitability of this +software for any purpose. It is provided "as is" without express or +implied warranty. -The above copyright notice and this permission notice shall be included in all copies or -substantial portions of the Software. +THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY +SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER +RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF +CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE -FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. +Copyright (c) 1999-2003 by The XFree86 Project, Inc. +Copyright 2002-2006 by VMware, Inc. -Except as contained in this notice, the name of the copyright holder(s) and author(s) -shall not be used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from the copyright holder(s) and -author(s). - +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the copyright holder(s) +and author(s) shall not be used in advertising or otherwise to promote +the sale, use or other dealings in this Software without prior written +authorization from the copyright holder(s) and author(s). -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
