xserver-xorg-input-mouse: Changes to 'debian-unstable'
COPYING | 49 +++++++++++++++++++++++++++++++++++++++++--------
ChangeLog | 16 ++++++++++++++++
debian/changelog | 9 +++++++++
debian/copyright | 21 +++++++++++++++++++++
src/mouse.c | 4 ++--
5 files changed, 89 insertions(+), 10 deletions(-)
New commits:
commit e89a3c1769b92bb2386e9567d71aa5d81616a9c4
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat Sep 22 16:23:29 2007 +0200
Grab upstream commits to fix #443552.
diff --git a/ChangeLog b/ChangeLog
index ff3cf84..e25e05e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+commit f42ea3027c13046dfa7a603737b476fbf2833764
+Author: Fredrik Rinnestam <fredrik@obra.se>
+Date: Wed Sep 19 23:24:13 2007 +0200
+
+ Bug #12145: Don't confine the pointer to one screen in zaphod mode.
+
+ Fix ported from evdev's b4a5a20476f7bc77d54a860d7cdd81c223bdb81f.
+
+commit 53bdd4db01f05595beb37e68842118eb649308d3
+Author: Daniel Drake <ddrake@brontes3d.com>
+Date: Tue May 29 12:14:00 2007 -0800
+
+ Bug #11089: xf86-input-mouse COPYING file
+
+ X.Org Bugzilla #11089 <https://bugs.freedesktop.org/show_bug.cgi?id=11089>
+
commit 111081a2f15b416c2fd05b667bca3b3982f93245
Author: Matthias Hopf <mhopf@suse.de>
Date: Wed Aug 1 15:55:51 2007 +0200
diff --git a/debian/changelog b/debian/changelog
index a742c25..8a8ef05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xserver-xorg-input-mouse (1:1.2.2-6) unstable; urgency=low
+
+ * Grab upstream commits up to f42ea3027c13046dfa7a603737b476fbf2833764
+ so that the pointer is not confined in the right screen in zaphod mode,
+ closes: #443552.
+ + Update debian/copyright using the new upstream COPYING file.
+
+ -- Brice Goglin <bgoglin@debian.org> Sat, 22 Sep 2007 16:22:22 +0200
+
xserver-xorg-input-mouse (1:1.2.2-5) unstable; urgency=low
* Upload to unstable
diff --git a/debian/copyright b/debian/copyright
index 2179a03..eeca443 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -26,3 +26,24 @@ 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.
+
+
+Copyright 1998 by Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
+
+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 name of Kazutaka YOKOTA not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. Kazutaka YOKOTA makes no representations
+about the suitability of this software for any purpose. It is provided
+"as is" without express or implied warranty.
+
+KAZUTAKA YOKOTA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL KAZUTAKA YOKOTA 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.
commit f42ea3027c13046dfa7a603737b476fbf2833764
Author: Fredrik Rinnestam <fredrik@obra.se>
Date: Wed Sep 19 23:24:13 2007 +0200
Bug #12145: Don't confine the pointer to one screen in zaphod mode.
Fix ported from evdev's b4a5a20476f7bc77d54a860d7cdd81c223bdb81f.
diff --git a/src/mouse.c b/src/mouse.c
index f3abc23..293af74 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -1740,10 +1740,10 @@ MouseProc(DeviceIntPtr device, int what)
);
/* X valuator */
- xf86InitValuatorAxisStruct(device, 0, 0, -1, 1, 0, 1);
+ xf86InitValuatorAxisStruct(device, 0, -1, -1, 1, 0, 1);
xf86InitValuatorDefaults(device, 0);
/* Y valuator */
- xf86InitValuatorAxisStruct(device, 1, 0, -1, 1, 0, 1);
+ xf86InitValuatorAxisStruct(device, 1, -1, -1, 1, 0, 1);
xf86InitValuatorDefaults(device, 1);
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
xf86MotionHistoryAllocate(pInfo);
commit 53bdd4db01f05595beb37e68842118eb649308d3
Author: Daniel Drake <ddrake@brontes3d.com>
Date: Tue May 29 12:14:00 2007 -0800
Bug #11089: xf86-input-mouse COPYING file
X.Org Bugzilla #11089 <https://bugs.freedesktop.org/show_bug.cgi?id=11089>
diff --git a/COPYING b/COPYING
index 7f33cbf..17ba88f 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,45 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
+Copyright 1993 by David Dawes <dawes@xfree86.org>
+Copyright 2002 by SuSE Linux AG, Author: Egbert Eich
+Copyright 1994-2002 by The XFree86 Project, Inc.
+Copyright 2002 by Paul Elliott
-Please submit updated COPYING files to the Xorg bugzilla:
+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.
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+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.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
-http://lists.freedesktop.org/mailman/listinfo/xorg
+Copyright 1998 by Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
+
+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 name of Kazutaka YOKOTA not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. Kazutaka YOKOTA makes no representations
+about the suitability of this software for any purpose. It is provided
+"as is" without express or implied warranty.
+
+KAZUTAKA YOKOTA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL KAZUTAKA YOKOTA 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.
Reply to: