xserver-xorg-input-mouse: Changes to 'debian-unstable'

2016-11-17 Thread Timo Aaltonen 
 debian/changelog|5 +++--
 debian/upstream/signing-key.asc |   24 
 2 files changed, 27 insertions(+), 2 deletions(-)

New commits:
commit f3a98453335d34d67d768820cd089935620f7653
Author: Timo Aaltonen 
Date:   Thu Nov 17 15:50:05 2016 +0200

release to sid

diff --git a/debian/changelog b/debian/changelog
index 829552a..fc62078 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-mouse (1:1.9.2-1) UNRELEASED; urgency=medium
+xserver-xorg-input-mouse (1:1.9.2-1) unstable; urgency=medium
 
   * New upstream release.
   * Use https URLs in Vcs-* control fields.
@@ -7,7 +7,7 @@ xserver-xorg-input-mouse (1:1.9.2-1) UNRELEASED; urgency=medium
   * control: Remove Drew and Cyril from uploaders.
   * signing-key.asc: Add the key from Peter Hutterer.
 
- -- Timo Aaltonen   Thu, 17 Nov 2016 14:58:33 +0200
+ -- Timo Aaltonen   Thu, 17 Nov 2016 15:45:22 +0200
 
 xserver-xorg-input-mouse (1:1.9.1-1) unstable; urgency=medium
 

commit faebb6a4ba840b580a2ce19d7096cde340b9d70d
Author: Timo Aaltonen 
Date:   Thu Nov 17 15:45:21 2016 +0200

signing-key.asc: Add the key from Peter Hutterer.

diff --git a/debian/changelog b/debian/changelog
index 0c1af73..829552a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xserver-xorg-input-mouse (1:1.9.2-1) UNRELEASED; urgency=medium
   * Use https URL in watch file.
   * Bump Standards-Version to 3.9.8.
   * control: Remove Drew and Cyril from uploaders.
+  * signing-key.asc: Add the key from Peter Hutterer.
 
  -- Timo Aaltonen   Thu, 17 Nov 2016 14:58:33 +0200
 
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
index 863981f..5a422f5 100644
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
@@ -58,3 +58,27 @@ 
n4u1yrMJfpnSblPMu5wJi3kjoA+Dd5ZFqx9nTi4wBjfVYGCPsleq59K8kQCYx1Cn
 lZcq630ITy9dB/aHCQry2gCbBwZ2Rsf9kr05S8uLhlwW3vRSvRs=
 =tc6G
 -END PGP PUBLIC KEY BLOCK-
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v1
+
+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-

xserver-xorg-input-mouse: Changes to 'debian-unstable'

2016-11-17 Thread Timo Aaltonen 
 ChangeLog|   68 +++
 README   |6 ++--
 configure.ac |2 -
 debian/changelog |   10 
 debian/control   |7 ++---
 debian/watch |2 -
 src/mouse.c  |   45 +---
 xorg-mouse.pc.in |4 +++
 8 files changed, 126 insertions(+), 18 deletions(-)

New commits:
commit c175ba2f44fd9616b576351161d1b92ecc95c95f
Author: Timo Aaltonen 
Date:   Thu Nov 17 15:01:13 2016 +0200

control: Remove Drew and Cyril from uploaders.

diff --git a/debian/changelog b/debian/changelog
index 3028bdb..0c1af73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-input-mouse (1:1.9.2-1) UNRELEASED; urgency=medium
   * 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 14:58:33 +0200
 
diff --git a/debian/control b/debian/control
index add3fa7..525dd73 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,6 @@ Source: xserver-xorg-input-mouse
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
-Uploaders: Drew Parsons , Cyril Brulebois 

 Build-Depends:
  debhelper (>= 8),
  dh-autoreconf,

commit e4e962f255a3fa805196e3974861e64ba1e7a840
Author: Timo Aaltonen 
Date:   Thu Nov 17 15:00:41 2016 +0200

Bump Standards-Version to 3.9.8.

diff --git a/debian/changelog b/debian/changelog
index dcc1087..3028bdb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-input-mouse (1:1.9.2-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Use https URLs in Vcs-* control fields.
   * Use https URL in watch file.
+  * Bump Standards-Version to 3.9.8.
 
  -- Timo Aaltonen   Thu, 17 Nov 2016 14:58:33 +0200
 
diff --git a/debian/control b/debian/control
index 017fcdf..add3fa7 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.4
+Standards-Version: 3.9.8
 Vcs-Git: 
https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-input-mouse.git
 Vcs-Browser: 
https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-input-mouse.git
 

commit b3109d0cf0c238716cd624bd003c8b09926bf327
Author: Timo Aaltonen 
Date:   Thu Nov 17 15:00:28 2016 +0200

Use https URL in watch file.

diff --git a/debian/changelog b/debian/changelog
index 41c187b..dcc1087 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-input-mouse (1:1.9.2-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Use https URLs in Vcs-* control fields.
+  * Use https URL in watch file.
 
  -- Timo Aaltonen   Thu, 17 Nov 2016 14:58:33 +0200
 
diff --git a/debian/watch b/debian/watch
index e5867b2..6556444 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 #git=git://anongit.freedesktop.org/xorg/driver/xf86-input-mouse
 version=3
 opts=pgpsigurlmangle=s/$/.sig/ \
-http://xorg.freedesktop.org/releases/individual/driver/ 
xf86-input-mouse-(.*)\.tar\.gz
+https://xorg.freedesktop.org/releases/individual/driver/ 
xf86-input-mouse-(.*)\.tar\.gz

commit 8e879aac480ff3d0f4209d5e950cde28ef40ed39
Author: Timo Aaltonen 
Date:   Thu Nov 17 15:00:10 2016 +0200

Use https URLs in Vcs-* control fields.

diff --git a/debian/changelog b/debian/changelog
index e4b4956..41c187b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-input-mouse (1:1.9.2-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Use https URLs in Vcs-* control fields.
 
  -- Timo Aaltonen   Thu, 17 Nov 2016 14:58:33 +0200
 
diff --git a/debian/control b/debian/control
index 0cdaaad..017fcdf 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,8 @@ Build-Depends:
  quilt,
  xutils-dev (>= 1:7.5+4)
 Standards-Version: 3.9.4
-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
+Vcs-Git: 
https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-input-mouse.git
+Vcs-Browser: 
https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-input-mouse.git
 
 Package: xserver-xorg-input-mouse
 Architecture: any

commit 025483d82f36cdbe58ddc602f613c4b27ef737bc
Author: Timo Aaltonen 
Date:   Thu Nov 17 14:59:04 2016 +0200

update changelogs

diff --git a/ChangeLog b/ChangeLog
index ac3fd50..4c45b5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,71 @@
+commit 9d6c38eae40a435b4057a33d55759810ea7b91c1
+Author: Peter Hutterer 
+Date:   Thu Nov 17 14:35:47 2016 +1000
+
+mouse

xserver-xorg-input-mouse: Changes to 'debian-unstable'

2014-10-26 Thread Julien Cristau 
 ChangeLog|  132 +++
 configure.ac |6 +
 debian/changelog |   13 +++
 debian/control   |8 +-
 debian/patches/bsd-array-bounds.diff |   28 ---
 debian/patches/series|2 
 debian/upstream/signing-key.asc  |   60 +++
 debian/watch |1 
 src/bsd_mouse.c  |   26 +-
 src/mouse.c  |  122 +++-
 src/sun_mouse.c  |   42 ---
 11 files changed, 361 insertions(+), 79 deletions(-)

New commits:
commit bbf5f488c755019a098320249cf9c7e2fff6f65c
Author: Julien Cristau jcris...@debian.org
Date:   Sun Oct 26 18:40:42 2014 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 4ca3bbe..0a357a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-mouse (1:1.9.1-1) UNRELEASED; urgency=medium
+xserver-xorg-input-mouse (1:1.9.1-1) unstable; urgency=medium
 
   [ Julien Cristau ]
   * New upstream release.
@@ -9,7 +9,7 @@ xserver-xorg-input-mouse (1:1.9.1-1) UNRELEASED; urgency=medium
   * Describe relationship to xserver-xorg-input-evdev in the long description
 (closes: #645432).
 
- -- Julien Cristau jcris...@debian.org  Sun, 26 Oct 2014 18:04:38 +0100
+ -- Julien Cristau jcris...@debian.org  Sun, 26 Oct 2014 18:35:08 +0100
 
 xserver-xorg-input-mouse (1:1.9.0-1) unstable; urgency=low
 

commit da6863c15a4db1fb3c8a557591f3fc09dca4238d
Author: Julien Cristau jcris...@debian.org
Date:   Sun Oct 26 18:23:44 2014 +0100

Drop bsd-array-bounds patch, #668949 is fixed in gcc 4.7+.

diff --git a/debian/changelog b/debian/changelog
index b721a04..4ca3bbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-input-mouse (1:1.9.1-1) UNRELEASED; urgency=medium
   [ Julien Cristau ]
   * New upstream release.
   * Allow uscan to verify tarball signatures.
+  * Drop bsd-array-bounds patch, #668949 is fixed in gcc 4.7+.
 
   [ Jonathan Nieder ]
   * Describe relationship to xserver-xorg-input-evdev in the long description
diff --git a/debian/patches/bsd-array-bounds.diff 
b/debian/patches/bsd-array-bounds.diff
deleted file mode 100644
index bf56b2d..000
--- a/debian/patches/bsd-array-bounds.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Robert Millan r...@debian.org
-Subject: Work around gcc bug resulting in build failure
-
-../../src/bsd_mouse.c: In function 'CheckProtocol':
-../../src/bsd_mouse.c:142:30: error: array subscript is above array bounds 
[-Werror=array-bounds]
-
-Debian bug#665390.
-
-Followup-From: Petr Salinger petr.salin...@seznam.cz
-Followup-Bug: #681506
-
-Index: xserver-xorg-input-mouse/src/bsd_mouse.c
-===
 xserver-xorg-input-mouse.orig/src/bsd_mouse.c
-+++ xserver-xorg-input-mouse/src/bsd_mouse.c
-@@ -139,10 +139,10 @@ CheckProtocol(const char *protocol)
- {
- int i;
- 
--for (i = 0; internalNames[i]; i++)
-+for (i = -1; internalNames[++i];)
- if (xf86NameCmp(protocol, internalNames[i]) == 0)
- return TRUE;
--for (i = 0; miscNames[i]; i++)
-+for (i = -1; miscNames[++i];)
- if (xf86NameCmp(protocol, miscNames[i]) == 0)
- return TRUE;
- return FALSE;
diff --git a/debian/patches/series b/debian/patches/series
index 9f8f801..fdffa2a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-bsd-array-bounds.diff
+# placeholder

commit 35bc7af90396d024e8b31944ec9c989df496ca1e
Author: Julien Cristau jcris...@debian.org
Date:   Sun Oct 26 18:09:20 2014 +0100

Describe relationship to xserver-xorg-input-evdev in the long description.

diff --git a/debian/changelog b/debian/changelog
index 28b629c..b721a04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 xserver-xorg-input-mouse (1:1.9.1-1) UNRELEASED; urgency=medium
 
+  [ Julien Cristau ]
   * New upstream release.
   * Allow uscan to verify tarball signatures.
 
+  [ Jonathan Nieder ]
+  * Describe relationship to xserver-xorg-input-evdev in the long description
+(closes: #645432).
+
  -- Julien Cristau jcris...@debian.org  Sun, 26 Oct 2014 18:04:38 +0100
 
 xserver-xorg-input-mouse (1:1.9.0-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 9d12366..0cdaaad 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,13 @@ Depends:
 Provides:
  ${xinpdriver:Provides}
 Description: X.Org X server -- mouse input driver
- This package provides the driver for mouse input devices.
+ This package provides the driver for mouse input devices.  It is mainly used
+ on non-Linux operating systems such as BSD and Solaris. Most
+ configurations on Linux will use evdev, the kernel's event delivery
+ mechanism, and do not need this package.
+ .
+ See the inputattach package if your mouse is

xserver-xorg-input-mouse: Changes to 'debian-unstable'

2013-09-05 Thread Julien Cristau 
 debian/changelog |   12 +---
 debian/control   |2 +-
 debian/patches/bsd-array-bounds.diff |8 
 debian/rules |4 
 4 files changed, 18 insertions(+), 8 deletions(-)

New commits:
commit 18f467ed948376bd0f2e67f9d6058a568a1d1ca1
Author: Julien Cristau jcris...@debian.org
Date:   Thu Sep 5 21:51:54 2013 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 018246c..89e7699 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-mouse (1:1.9.0-1) UNRELEASED; urgency=low
+xserver-xorg-input-mouse (1:1.9.0-1) unstable; urgency=low
 
   [ Michele Cane ]
   * New upstream release.
@@ -10,7 +10,7 @@ xserver-xorg-input-mouse (1:1.9.0-1) UNRELEASED; urgency=low
   * Don't install xorg-mouse.pc and xf86-mouse-properties.h.  If there's a user
 they can go in a new xserver-xorg-input-mouse-dev package later.
 
- -- Michele Cane michele.c...@gmail.com  Wed, 10 Jul 2013 22:24:42 +0200
+ -- Julien Cristau jcris...@debian.org  Thu, 05 Sep 2013 21:51:52 +0200
 
 xserver-xorg-input-mouse (1:1.7.2-3) unstable; urgency=medium
 

commit 733ba409a57f1f9c4b5d2fdff8ad1c7d4543f671
Author: Julien Cristau jcris...@debian.org
Date:   Thu Sep 5 21:51:14 2013 +0200

Don't install xorg-mouse.pc and xf86-mouse-properties.h.

If there's a user they can go in a new xserver-xorg-input-mouse-dev
package later.

diff --git a/debian/changelog b/debian/changelog
index 1bcbb32..018246c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ xserver-xorg-input-mouse (1:1.9.0-1) UNRELEASED; urgency=low
   [ Julien Cristau ]
   * Disable silent build rules.
   * Adjust bsd-array-bounds.diff for upstream whitespace changes.
+  * Don't install xorg-mouse.pc and xf86-mouse-properties.h.  If there's a user
+they can go in a new xserver-xorg-input-mouse-dev package later.
 
  -- Michele Cane michele.c...@gmail.com  Wed, 10 Jul 2013 22:24:42 +0200
 
diff --git a/debian/rules b/debian/rules
index c97da53..0fa30e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,7 @@ override_dh_auto_install:
 # Kill *.la files, and forget no-one:
 override_dh_install:
find debian/tmp -name '*.la' -delete
+   rm -rf debian/tmp/usr/include debian/tmp/usr/lib/pkgconfig
dh_install --fail-missing
 ifeq (kfreebsd, $(DEB_HOST_ARCH_OS))
dh_install -pxserver-xorg-input-mouse debian/local/10-x11-mouse.fdi \

commit 7aeb1850b472e0b39453a0f431664517411a2918
Author: Julien Cristau jcris...@debian.org
Date:   Thu Sep 5 21:46:09 2013 +0200

Adjust bsd-array-bounds.diff for upstream whitespace changes.

diff --git a/debian/changelog b/debian/changelog
index 62e2e5a..1bcbb32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ xserver-xorg-input-mouse (1:1.9.0-1) UNRELEASED; urgency=low
 
   [ Julien Cristau ]
   * Disable silent build rules.
+  * Adjust bsd-array-bounds.diff for upstream whitespace changes.
 
  -- Michele Cane michele.c...@gmail.com  Wed, 10 Jul 2013 22:24:42 +0200
 
diff --git a/debian/patches/bsd-array-bounds.diff 
b/debian/patches/bsd-array-bounds.diff
index 5bbf294..bf56b2d 100644
--- a/debian/patches/bsd-array-bounds.diff
+++ b/debian/patches/bsd-array-bounds.diff
@@ -19,10 +19,10 @@ Index: xserver-xorg-input-mouse/src/bsd_mouse.c
  
 -for (i = 0; internalNames[i]; i++)
 +for (i = -1; internalNames[++i];)
-   if (xf86NameCmp(protocol, internalNames[i]) == 0)
-   return TRUE;
+ if (xf86NameCmp(protocol, internalNames[i]) == 0)
+ return TRUE;
 -for (i = 0; miscNames[i]; i++)
 +for (i = -1; miscNames[++i];)
-   if (xf86NameCmp(protocol, miscNames[i]) == 0)
-   return TRUE;
+ if (xf86NameCmp(protocol, miscNames[i]) == 0)
+ return TRUE;
  return FALSE;

commit 59d122806d7efc2a54dadb6973c923f5f78cb6c6
Author: Julien Cristau jcris...@debian.org
Date:   Thu Sep 5 21:30:04 2013 +0200

Disable silent build rules.

diff --git a/debian/changelog b/debian/changelog
index de32faf..62e2e5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 xserver-xorg-input-mouse (1:1.9.0-1) UNRELEASED; urgency=low
 
+  [ Michele Cane ]
   * New upstream release.
   * Bump Standards-Version to 3.9.4, no changes needed.
 
+  [ Julien Cristau ]
+  * Disable silent build rules.
+
  -- Michele Cane michele.c...@gmail.com  Wed, 10 Jul 2013 22:24:42 +0200
 
 xserver-xorg-input-mouse (1:1.7.2-3) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index 2372c9f..c97da53 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,9 @@
 
 DEB_HOST_ARCH_OS   ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
+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

xserver-xorg-input-mouse: Changes to 'debian-unstable'

2013-07-21 Thread Julien Cristau 
 COPYING |1 
 ChangeLog   |  223 ++
 Makefile.am |8 
 autogen.sh  |4 
 configure.ac|   17 
 debian/changelog|8 
 debian/control  |4 
 include/Makefile.am |1 
 include/xf86-mouse-properties.h |   33 
 man/mousedrv.man|   25 
 src/Makefile.am |5 
 src/bsd_mouse.c |  536 ++--
 src/compat-api.h|   98 
 src/hurd_mouse.c|  118 -
 src/lnx_mouse.c |  180 -
 src/mouse.c | 4372 
 src/mouse.h |  255 +-
 src/mousePriv.h |   50 
 src/pnp.c   |  566 ++---
 src/sun_mouse.c |  627 ++---
 xorg-mouse.pc.in|6 
 21 files changed, 3831 insertions(+), 3306 deletions(-)

New commits:
commit df5e971676a3644997ada3ac96e8b07b1656cfcb
Author: Michele Cane michele.c...@gmail.com
Date:   Wed Jul 17 15:06:49 2013 +0200

Build against Xserver 1.14.

diff --git a/debian/changelog b/debian/changelog
index de32faf..760f5f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-input-mouse (1:1.9.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Bump Standards-Version to 3.9.4, no changes needed.
+  * Build against Xserver 1.14.
 
  -- Michele Cane michele.c...@gmail.com  Wed, 10 Jul 2013 22:24:42 +0200
 
diff --git a/debian/control b/debian/control
index 9d12366..519f292 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
  debhelper (= 8),
  dh-autoreconf,
  pkg-config,
- xserver-xorg-dev (= 2:1.9.99.902),
+ xserver-xorg-dev (= 2:1.14),
  x11proto-input-dev,
  x11proto-core-dev,
  x11proto-randr-dev,

commit 743ca446251e89b23821a2728bd0f9a2b01d9214
Author: Michele Cane michele.c...@gmail.com
Date:   Wed Jul 17 14:24:39 2013 +0200

Bump Standards-Version to 3.9.4, no changes needed.

diff --git a/debian/changelog b/debian/changelog
index 00f52ab..de32faf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-input-mouse (1:1.9.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump Standards-Version to 3.9.4, no changes needed.
 
  -- Michele Cane michele.c...@gmail.com  Wed, 10 Jul 2013 22:24:42 +0200
 
diff --git a/debian/control b/debian/control
index a40be49..9d12366 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.2
+Standards-Version: 3.9.4
 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 d9a720498034cfb27ceb7d4c9caee512e3d6f4f2
Author: Michele Cane michele.c...@gmail.com
Date:   Wed Jul 10 22:25:35 2013 +0200

Bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index f632888..6ea53e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,226 @@
+commit 35cae8f4352002c8dce85dbc86cebb50e915a478
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Wed Mar 27 10:59:05 2013 +1000
+
+mouse 1.9.0
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit 585f4030d77accf2a4ba115729ca08da82217863
+Author: Colin Walters walt...@verbum.org
+Date:   Wed Jan 4 17:37:06 2012 -0500
+
+autogen.sh: Implement GNOME Build API
+
+http://people.gnome.org/~walters/docs/build-api.txt
+
+Signed-off-by: Adam Jackson a...@redhat.com
+
+commit 8e74b1db7b32a2a2bb668a8edc6757cc5b77157a
+Author: Adam Jackson a...@redhat.com
+Date:   Wed Jan 16 13:11:11 2013 -0500
+
+configure: Drop AM_MAINTAINER_MODE
+
+Signed-off-by: Adam Jackson a...@redhat.com
+
+commit 3b199a175da8485c216b68df4cf539899619
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Wed Aug 15 14:38:28 2012 +1000
+
+Use signal-safe logging if available
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Chase Douglas chase.doug...@ubuntu.com
+
+commit cb1f60930bdc8121e5d7b9210f9491d1116d6aef
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Wed Aug 15 14:43:14 2012 +1000
+
+Fix compilation error with EXTMOUSEDEBUG on
+
+pInfo-atom was removed in xorg-server-1.9.0-26-g9802cca
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 29dbd85c4617a062d2003e0673806b92f8397492
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Tue Jul 31 09:39:38 2012 +1000
+
+xf86-input-mouse 1.8.1
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit 5a5f41659d4e43330407fa8895710c865d2b5328
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Mon Jul 30 15:56:18 2012 -0700
+
+Fix compiler warning in sun_mouse.c

xserver-xorg-input-mouse: Changes to 'debian-unstable'

2012-07-15 Thread Cyril Brulebois 
 debian/changelog |7 +++
 debian/patches/bsd-array-bounds.diff |7 +--
 2 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit fc16ff32653cbc131f958de67ce5fe661823dcbb
Author: Cyril Brulebois k...@debian.org
Date:   Mon Jul 16 00:34:16 2012 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index ebd0149..ff8be94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-input-mouse (1:1.7.2-3) UNRELEASED; urgency=low
+xserver-xorg-input-mouse (1:1.7.2-3) unstable; urgency=medium
 
   * Update bsd-array-bounds.diff patch to fix crashes on kfreebsd-*,
 thanks to Petr Salinger (Closes: #681506).
 
- -- Cyril Brulebois k...@debian.org  Mon, 16 Jul 2012 00:31:00 +0200
+ -- Cyril Brulebois k...@debian.org  Mon, 16 Jul 2012 00:33:57 +0200
 
 xserver-xorg-input-mouse (1:1.7.2-2) unstable; urgency=low
 

commit 4d62d89334350fd09a12610a367b721dff7f23c3
Author: Cyril Brulebois k...@debian.org
Date:   Mon Jul 16 00:29:59 2012 +0200

Update bsd-array-bounds.diff patch to fix crashes on kfreebsd-*.

Thanks to Petr Salinger (Closes: #681506).

diff --git a/debian/changelog b/debian/changelog
index bc1f843..ebd0149 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-mouse (1:1.7.2-3) UNRELEASED; urgency=low
+
+  * Update bsd-array-bounds.diff patch to fix crashes on kfreebsd-*,
+thanks to Petr Salinger (Closes: #681506).
+
+ -- Cyril Brulebois k...@debian.org  Mon, 16 Jul 2012 00:31:00 +0200
+
 xserver-xorg-input-mouse (1:1.7.2-2) unstable; urgency=low
 
   * Add patch from Robert Millan to work around a gcc bug resulting in FTBFS
diff --git a/debian/patches/bsd-array-bounds.diff 
b/debian/patches/bsd-array-bounds.diff
index 8db8d2e..5bbf294 100644
--- a/debian/patches/bsd-array-bounds.diff
+++ b/debian/patches/bsd-array-bounds.diff
@@ -6,6 +6,9 @@ Subject: Work around gcc bug resulting in build failure
 
 Debian bug#665390.
 
+Followup-From: Petr Salinger petr.salin...@seznam.cz
+Followup-Bug: #681506
+
 Index: xserver-xorg-input-mouse/src/bsd_mouse.c
 ===
 --- xserver-xorg-input-mouse.orig/src/bsd_mouse.c
@@ -15,11 +18,11 @@ Index: xserver-xorg-input-mouse/src/bsd_mouse.c
  int i;
  
 -for (i = 0; internalNames[i]; i++)
-+for (i = 0; i  (sizeof(internalNames) / sizeof(internalNames[0])); i++)
++for (i = -1; internalNames[++i];)
if (xf86NameCmp(protocol, internalNames[i]) == 0)
return TRUE;
 -for (i = 0; miscNames[i]; i++)
-+for (i = 0; i  (sizeof(miscNames) / sizeof(miscNames[0])); i++)
++for (i = -1; miscNames[++i];)
if (xf86NameCmp(protocol, miscNames[i]) == 0)
return TRUE;
  return FALSE;


-- 
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/e1sqxrl-00079n...@vasks.debian.org

xserver-xorg-input-mouse: Changes to 'debian-unstable'

2012-04-21 Thread Julien Cristau 
 debian/changelog |7 +++
 debian/patches/bsd-array-bounds.diff |   25 +
 debian/patches/series|1 +
 3 files changed, 33 insertions(+)

New commits:
commit d725d89553373e0a5dea8724bf0994d465041e2a
Author: Julien Cristau jcris...@debian.org
Date:   Sat Apr 21 12:36:30 2012 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 004fbf4..bc1f843 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-input-mouse (1:1.7.2-2) UNRELEASED; urgency=low
+xserver-xorg-input-mouse (1:1.7.2-2) unstable; urgency=low
 
   * Add patch from Robert Millan to work around a gcc bug resulting in FTBFS
 with -Werror=array-bounds (closes: #665390)
 
- -- Julien Cristau jcris...@debian.org  Sat, 21 Apr 2012 12:29:55 +0200
+ -- Julien Cristau jcris...@debian.org  Sat, 21 Apr 2012 12:31:32 +0200
 
 xserver-xorg-input-mouse (1:1.7.2-1) unstable; urgency=low
 

commit c921f5d3cf0e73194a491aa7604cb238019d06f9
Author: Julien Cristau jcris...@debian.org
Date:   Sat Apr 21 12:31:15 2012 +0200

Fix FTBFS on kfreebsd-amd64

Add patch from Robert Millan to work around a gcc bug resulting in FTBFS
with -Werror=array-bounds (closes: #665390)

diff --git a/debian/changelog b/debian/changelog
index 031fb7b..004fbf4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-mouse (1:1.7.2-2) UNRELEASED; urgency=low
+
+  * Add patch from Robert Millan to work around a gcc bug resulting in FTBFS
+with -Werror=array-bounds (closes: #665390)
+
+ -- Julien Cristau jcris...@debian.org  Sat, 21 Apr 2012 12:29:55 +0200
+
 xserver-xorg-input-mouse (1:1.7.2-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/bsd-array-bounds.diff 
b/debian/patches/bsd-array-bounds.diff
new file mode 100644
index 000..8db8d2e
--- /dev/null
+++ b/debian/patches/bsd-array-bounds.diff
@@ -0,0 +1,25 @@
+From: Robert Millan r...@debian.org
+Subject: Work around gcc bug resulting in build failure
+
+../../src/bsd_mouse.c: In function 'CheckProtocol':
+../../src/bsd_mouse.c:142:30: error: array subscript is above array bounds 
[-Werror=array-bounds]
+
+Debian bug#665390.
+
+Index: xserver-xorg-input-mouse/src/bsd_mouse.c
+===
+--- xserver-xorg-input-mouse.orig/src/bsd_mouse.c
 xserver-xorg-input-mouse/src/bsd_mouse.c
+@@ -139,10 +139,10 @@ CheckProtocol(const char *protocol)
+ {
+ int i;
+ 
+-for (i = 0; internalNames[i]; i++)
++for (i = 0; i  (sizeof(internalNames) / sizeof(internalNames[0])); i++)
+   if (xf86NameCmp(protocol, internalNames[i]) == 0)
+   return TRUE;
+-for (i = 0; miscNames[i]; i++)
++for (i = 0; i  (sizeof(miscNames) / sizeof(miscNames[0])); i++)
+   if (xf86NameCmp(protocol, miscNames[i]) == 0)
+   return TRUE;
+ return FALSE;
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..9f8f801 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+bsd-array-bounds.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/e1slxio-0001ps...@vasks.debian.org

xserver-xorg-input-mouse: Changes to 'debian-unstable'

2012-03-19 Thread Cyril Brulebois 
 ChangeLog|  102 +++
 configure.ac |2 -
 debian/changelog |6 +++
 src/bsd_mouse.c  |3 +
 src/mouse.c  |   17 ++---
 src/pnp.c|2 -
 src/sun_mouse.c  |   10 +++--
 7 files changed, 132 insertions(+), 10 deletions(-)

New commits:
commit f49e60a7541c0b6b065fb4b3043870101c6f8280
Author: Cyril Brulebois k...@debian.org
Date:   Mon Mar 19 23:12:13 2012 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 9ac71e3..031fb7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-input-mouse (1:1.7.2-1) UNRELEASED; urgency=low
+xserver-xorg-input-mouse (1:1.7.2-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Cyril Brulebois k...@debian.org  Mon, 19 Mar 2012 23:11:57 +0100
+ -- Cyril Brulebois k...@debian.org  Mon, 19 Mar 2012 23:12:09 +0100
 
 xserver-xorg-input-mouse (1:1.7.1-1) unstable; urgency=low
 

commit ba7e75c5593b96103c6cee1c4851df4e216be9a3
Author: Cyril Brulebois k...@debian.org
Date:   Mon Mar 19 23:12:07 2012 +0100

Bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index 05419b6..f632888 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,105 @@
+commit 80d724d13a8de585722967f7d18a65b4b555badd
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Thu Mar 15 23:34:21 2012 -0700
+
+xf86-input-mouse 1.7.2
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 68a1e2f74dd58c913e5d1f8d6138cd8ce73232a4
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Thu Dec 22 20:55:45 2011 -0800
+
+sun_mouse.c: remove unused variables
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit a5126694b29bdf9c852254b53174fcf37537b121
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Thu Dec 22 20:54:14 2011 -0800
+
+Mark symtab_t.name in pnp.c as const to fix gcc -Wwrite-strings warnings
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 8bc8502c698115c3f4885ba42e60ede0e681caaa
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Wed Nov 30 19:29:01 2011 -0800
+
+Avoid NULL pointer dereference in autoProbeMouse if proto == PROT_UNSUP
+
+Error: Null pointer dereference (CWE 476)
+   Read from null pointer 'GetProtocol(proto)'
+at line 3477 of src/mouse.c in function 'autoProbeMouse'.
+  Function 'GetProtocol' may return constant 'NULL' at line 736, 
called at line 3477.
+  Null pointer introduced at line 736 in function 'GetProtocol'.
+
+We already handle one of the two cases that make GetProtocol return NULL,
+proto == PROTO_UNKNOWN, but not PROT_UNSUP.
+
+[ This bug was found by the Parfait 0.4.2 bug checking tool.
+  For more information see http://labs.oracle.com/projects/parfait/ ]
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+Reviewed-by: Alexandr Shadchin alexandr.shadc...@gmail.com
+
+commit b65651974ee5620086b484086ea12d78c92fa369
+Author: Alexandr Shadchin alexandr.shadc...@gmail.com
+Date:   Fri Aug 19 21:07:13 2011 +0600
+
+Fix wrong read Protocol and Device from xorg.conf
+
+Add call xf86CollectInputOptions() before using pInfo-options.
+The bug is seeing by ABI  12.
+
+Signed-off-by: Alexandr Shadchin alexandr.shadc...@gmail.com
+Reviewed-by: Matthieu Herrb matthieu.he...@laas.fr
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit 7bb5cbecbcc24f20467546f957fb95c9190514c0
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Mon Jul 25 21:11:50 2011 -0700
+
+sun_mouse.c: Ensure vuidMouse setup routines are called for protocol Auto
+
+Fixes regression caused by commit b12fa0d5ab23 in which devices with
+protocol Auto (generally just PS/2 devices on Solaris, since HAL
+sets protocol VUID for USB devices already) weren't going through
+vuidMousePreInit and setting up the device_control  read_input pointers
+to the routines which know how to decode VUID packets.
+
+Adds a check to vuidPreInit to ensure we don't leak memory if called
+twice for the same device, just in case I missed a code path, or a
+new one appears in the future.
+
+Fixes Solaris bug 7070321: Mouse protocol Auto does not work in build 170
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+Acked-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit 94fb2250b12fbaf840352b83dd9f832319c92b0f
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Mon Jul 25 20:40:03 2011 -0700
+
+No need to merge NULL options list with existing options
+
+Appending NULL to an existing options list simply walks the entire
+existing list before returning it unchanged, so if we aren't creating
+a new list to merge, don't bother merging it either.
+
+Signed-off-by: Alan Coopersmith

xserver-xorg-input-mouse: Changes to 'debian-unstable'

2011-07-05 Thread Cyril Brulebois 
 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

xserver-xorg-input-mouse: Changes to 'debian-unstable'

2011-06-15 Thread Cyril Brulebois 
 debian/changelog |   25 +
 debian/control   |   15 ++-
 debian/xserver-xorg-input-mouse-udeb.install |1 +
 3 files changed, 40 insertions(+), 1 deletion(-)

New commits:
commit a96ffe1ab8e214154003dad12652111aef4cf860
Author: Cyril Brulebois k...@debian.org
Date:   Wed Jun 15 14:53:23 2011 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index f557279..6cf9ad2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-mouse (1:1.7.0-4) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Cyril Brulebois k...@debian.org  Wed, 15 Jun 2011 14:53:10 +0200
+
 xserver-xorg-input-mouse (1:1.7.0-3) experimental; urgency=low
 
   * Add udeb needed for the graphical install on non-Linux ports since

commit adb7c2b116f30f5c0da4fd46ced04a7bc7fab813
Author: Cyril Brulebois k...@debian.org
Date:   Mon Apr 4 03:11:51 2011 +0200

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 4d2d23d..f557279 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-input-mouse (1:1.7.0-3) UNRELEASED; urgency=low
+xserver-xorg-input-mouse (1:1.7.0-3) experimental; urgency=low
 
   * Add udeb needed for the graphical install on non-Linux ports since
 evdev is Linux-only (Closes: #596590).
 
- -- Cyril Brulebois k...@debian.org  Mon, 04 Apr 2011 02:58:16 +0200
+ -- Cyril Brulebois k...@debian.org  Mon, 04 Apr 2011 03:11:45 +0200
 
 xserver-xorg-input-mouse (1:1.7.0-2+exp1) experimental; urgency=low
 

commit 86ebe4659e3cd42b5233588b110713dd1dae9917
Author: Cyril Brulebois k...@debian.org
Date:   Mon Apr 4 03:00:54 2011 +0200

Add udeb needed for the graphical install on non-Linux ports since evdev is 
Linux-only (Closes: #596590).

diff --git a/debian/changelog b/debian/changelog
index 0fdf8e1..4d2d23d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-mouse (1:1.7.0-3) UNRELEASED; urgency=low
+
+  * Add udeb needed for the graphical install on non-Linux ports since
+evdev is Linux-only (Closes: #596590).
+
+ -- Cyril Brulebois k...@debian.org  Mon, 04 Apr 2011 02:58:16 +0200
+
 xserver-xorg-input-mouse (1:1.7.0-2+exp1) experimental; urgency=low
 
   * Rebuild in experimental against Xserver 1.10.
diff --git a/debian/control b/debian/control
index 083a0f5..11828a9 100644
--- a/debian/control
+++ b/debian/control
@@ -32,3 +32,16 @@ Description: X.Org X server -- mouse input driver
  URL:http://www.X.org
  .
  This package is built from the X.org xf86-input-mouse driver module.
+
+Package: xserver-xorg-input-mouse-udeb
+XC-Package-Type: udeb
+Section: debian-installer
+Architecture: hurd-any kfreebsd-any
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ ${xinpdriver:Depends},
+Provides:
+ ${xinpdriver:Provides}
+Description: X.Org X server -- mouse input driver
+ This is a udeb, or a microdeb, for the debian-installer.
diff --git a/debian/xserver-xorg-input-mouse-udeb.install 
b/debian/xserver-xorg-input-mouse-udeb.install
new file mode 100644
index 000..4ac2576
--- /dev/null
+++ b/debian/xserver-xorg-input-mouse-udeb.install
@@ -0,0 +1 @@
+usr/lib/xorg/modules/input/*.so

commit 4403cfa8e2d1c6328d906945a4550e0393c01922
Author: Cyril Brulebois k...@debian.org
Date:   Thu Mar 10 12:04:32 2011 +0100

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 588e946..e5f94c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-mouse (1:1.7.0-1+exp1) experimental; urgency=low
+
+  * Rebuild in experimental against Xserver 1.10.
+
+ -- Cyril Brulebois k...@debian.org  Thu, 10 Mar 2011 12:04:30 +0100
+
 xserver-xorg-input-mouse (1:1.7.0-1) unstable; urgency=low
 
   * New upstream release:

commit 6fcf551c59d2874a100d399df4da15bf00190145
Author: Cyril Brulebois k...@debian.org
Date:   Mon Feb 21 02:21:55 2011 +0100

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index c78aceb..fc06829 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-input-mouse (1:1.6.99.901-1+exp1) UNRELEASED; urgency=low
+xserver-xorg-input-mouse (1:1.6.99.901-1+exp1) experimental; urgency=low
 
   * Rebuild against Xserver 1.10 rc2.
 
- -- Cyril Brulebois k...@debian.org  Mon, 21 Feb 2011 02:21:38 +0100
+ -- Cyril Brulebois k...@debian.org  Mon, 21 Feb 2011 02:21:51 +0100
 
 xserver-xorg-input-mouse (1:1.6.99.901-1) unstable; urgency=low
 

commit e1631367fc869297b608ea66fcd0d5e17f846d26
Author: Cyril Brulebois k...@debian.org
Date:   Mon Feb 21 02:21:46 2011 +0100

Rebuild against Xserver 1.10 rc2.

diff --git a/debian/changelog b/debian/changelog
index 8c93b5e..c78aceb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-mouse (1:1.6.99.901-1+exp1) UNRELEASED; urgency=low
+
+  * Rebuild against Xserver 1.10 rc2.
+
+ -- Cyril Brulebois

xserver-xorg-input-mouse: Changes to 'debian-unstable'

2011-03-31 Thread Cyril Brulebois 
 ChangeLog|   22 ++
 debian/changelog |7 +++
 src/hurd_mouse.c |8 
 src/mouse.c  |2 ++
 4 files changed, 39 insertions(+)

New commits:
commit e49cd0ca5509f72b5f0d8aaa9f5126cb3645ac7a
Author: Cyril Brulebois k...@debian.org
Date:   Fri Apr 1 02:19:05 2011 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index f880d4f..0c45fac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-input-mouse (1:1.7.0-2) UNRELEASED; urgency=low
+xserver-xorg-input-mouse (1:1.7.0-2) unstable; urgency=low
 
   * Merge two more commits from upstream to fix Hurd support, thanks to
 Samuel Thibault (Closes: #620089).
 
- -- Cyril Brulebois k...@debian.org  Fri, 01 Apr 2011 02:17:28 +0200
+ -- Cyril Brulebois k...@debian.org  Fri, 01 Apr 2011 02:18:50 +0200
 
 xserver-xorg-input-mouse (1:1.7.0-1) unstable; urgency=low
 

commit 90c839a1d9a5d785e2c00755b7e992d771e1cb00
Author: Cyril Brulebois k...@debian.org
Date:   Fri Apr 1 02:18:48 2011 +0200

Bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index c809cc5..f4c972b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+commit 1780667854d73bbd0e0596271b09f93321cd0b1d
+Author: Samuel Thibault samuel.thiba...@ens-lyon.org
+Date:   Wed Mar 30 02:26:25 2011 +0200
+
+Fix Hurd mouse driver with XInput ABI before 12
+
+Commit 7bf22a36 (Use pInfo-options instead of conf-idev.) updated the
+xf86CollectInputOptions call into keeping previous options (for ABI before
+12). The hurd mouse driver also needs to be updated.
+
+commit d6e9623875de5714e85f7da5782ea665116f86dc
+Author: Samuel Thibault samuel.thiba...@ens-lyon.org
+Date:   Wed Mar 30 01:00:47 2011 +0200
+
+Fix OSMouse OS-defined protocol support
+
+Fix regression introduced by 0a088df6: in the case of an OS-specific
+protocol, the protocol is PROT_UNKNOWN, but should not be rejected: the 
core
+mouse drive just needs to let the OS driver handle it.
+
+Signed-off-by: Samuel Thibault samuel.thiba...@ens-lyon.org
+
 commit a07c353f01f99ef3e62f84a32e91d539a4e4863a
 Author: Peter Hutterer peter.hutte...@who-t.net
 Date:   Thu Mar 10 08:32:23 2011 +1000
diff --git a/debian/changelog b/debian/changelog
index ba9425d..f880d4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-mouse (1:1.7.0-2) UNRELEASED; urgency=low
+
+  * Merge two more commits from upstream to fix Hurd support, thanks to
+Samuel Thibault (Closes: #620089).
+
+ -- Cyril Brulebois k...@debian.org  Fri, 01 Apr 2011 02:17:28 +0200
+
 xserver-xorg-input-mouse (1:1.7.0-1) unstable; urgency=low
 
   * New upstream release:

commit 1780667854d73bbd0e0596271b09f93321cd0b1d
Author: Samuel Thibault samuel.thiba...@ens-lyon.org
Date:   Wed Mar 30 02:26:25 2011 +0200

Fix Hurd mouse driver with XInput ABI before 12

Commit 7bf22a36 (Use pInfo-options instead of conf-idev.) updated the
xf86CollectInputOptions call into keeping previous options (for ABI before
12). The hurd mouse driver also needs to be updated.

diff --git a/src/hurd_mouse.c b/src/hurd_mouse.c
index a285a87..031e44b 100644
--- a/src/hurd_mouse.c
+++ b/src/hurd_mouse.c
@@ -144,7 +144,15 @@ OsMousePreInit(InputInfoPtr pInfo, const char *protocol, 
int flags)
 xf86Msg(X_CONFIG, %s: Protocol: %s\n, pInfo-name, protocol);
 
 /* Collect the options, and process the common options. */
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION)  12
+/* need some special handling here. xf86CollectInputOptions will reset
+ * pInfo-options. To re-merge the previously set arguments, pass the
+ * original pInfo-options in.
+ */
+xf86CollectInputOptions(pInfo, NULL, pInfo-options);
+#else
 COLLECT_INPUT_OPTIONS(pInfo, NULL);
+#endif
 xf86ProcessCommonOptions(pInfo, pInfo-options);
 
 /* Check if the device can be opened. */

commit d6e9623875de5714e85f7da5782ea665116f86dc
Author: Samuel Thibault samuel.thiba...@ens-lyon.org
Date:   Wed Mar 30 01:00:47 2011 +0200

Fix OSMouse OS-defined protocol support

Fix regression introduced by 0a088df6: in the case of an OS-specific
protocol, the protocol is PROT_UNKNOWN, but should not be rejected: the core
mouse drive just needs to let the OS driver handle it.

Signed-off-by: Samuel Thibault samuel.thiba...@ens-lyon.org

diff --git a/src/mouse.c b/src/mouse.c
index edb998f..c3498ea 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -953,6 +953,8 @@ MousePreInit(InputDriverPtr drv, InputInfoPtr pInfo, int 
flags)
 MouseFindDevice(pInfo, protocol);
 
 xf86Msg(protocolFrom, %s: Protocol: \%s\\n, pInfo-name, protocol);
+if (protocolID == PROT_UNKNOWN)
+goto out;
 if (!(pProto = GetProtocol(protocolID)))
 {
rc = BadValue;


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive:

xserver-xorg-input-mouse: Changes to 'debian-unstable'

2011-03-10 Thread Cyril Brulebois 
 ChangeLog|   31 +++
 configure.ac |2 +-
 debian/changelog |7 +++
 src/bsd_mouse.c  |   27 +--
 src/mouse.c  |5 +
 src/mouse.h  |1 +
 6 files changed, 46 insertions(+), 27 deletions(-)

New commits:
commit 308e9ff5422219ed8966e2c05756dd6befbd3454
Author: Cyril Brulebois k...@debian.org
Date:   Thu Mar 10 11:59:25 2011 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index ecb216a..ba9425d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-input-mouse (1:1.7.0-1) UNRELEASED; urgency=low
+xserver-xorg-input-mouse (1:1.7.0-1) unstable; urgency=low
 
   * New upstream release:
 - Fix BSD issues with new ABI12 init process.
 
- -- Cyril Brulebois k...@debian.org  Thu, 10 Mar 2011 11:58:23 +0100
+ -- Cyril Brulebois k...@debian.org  Thu, 10 Mar 2011 11:59:21 +0100
 
 xserver-xorg-input-mouse (1:1.6.99.901-1) unstable; urgency=low
 

commit cc56346e084f05623b75675a8eabcfcc367015ad
Author: Cyril Brulebois k...@debian.org
Date:   Thu Mar 10 11:59:17 2011 +0100

Bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index c93df20..c809cc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+commit a07c353f01f99ef3e62f84a32e91d539a4e4863a
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Thu Mar 10 08:32:23 2011 +1000
+
+mouse 1.7.0
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit a22879c6779283684fe4a61543fc95179b4f5d0b
+Author: Alexandr Shadchin alexandr.shadc...@gmail.com
+Date:   Wed Mar 9 20:09:59 2011 +0500
+
+Fix BSD issues with new ABI12 init process.
+
+From Bug 34794:
+Until xf86-input-mouse-1.6.0, the MousePreInit() function exited if an
+os specific PreInit function existed. It let the os-specific function 
finish
+all initialisations that remained to be done after osInfo-PreInit() was
+called.
+
+The code in master now continues, and does things that the 
bsdMousePreInit()
+function in bsd_mouse.c doesn't expect.
+
+Fix up wsconsPreInit to deal with the new init process.
+
+Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=34794
+
+Signed-off-by: Alexandr Shadchin alexandr.shadc...@gmail.com
+Reviewed-by: Matthieu Herrb matthieu.he...@laas.fr
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
 commit 2e507df6704ebd2cab6ada450ed40d89a2d3ca19
 Author: Peter Hutterer peter.hutte...@who-t.net
 Date:   Mon Feb 21 10:06:54 2011 +1000
diff --git a/debian/changelog b/debian/changelog
index 8c93b5e..ecb216a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-mouse (1:1.7.0-1) UNRELEASED; urgency=low
+
+  * New upstream release:
+- Fix BSD issues with new ABI12 init process.
+
+ -- Cyril Brulebois k...@debian.org  Thu, 10 Mar 2011 11:58:23 +0100
+
 xserver-xorg-input-mouse (1:1.6.99.901-1) unstable; urgency=low
 
   * New upstream release.

commit a07c353f01f99ef3e62f84a32e91d539a4e4863a
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Thu Mar 10 08:32:23 2011 +1000

mouse 1.7.0

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/configure.ac b/configure.ac
index ed7c6fa..55eeac5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-input-mouse],
-[1.6.99.901],
+[1.7.0],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-input-mouse])
 AC_CONFIG_SRCDIR([Makefile.am])

commit a22879c6779283684fe4a61543fc95179b4f5d0b
Author: Alexandr Shadchin alexandr.shadc...@gmail.com
Date:   Wed Mar 9 20:09:59 2011 +0500

Fix BSD issues with new ABI12 init process.

From Bug 34794:
Until xf86-input-mouse-1.6.0, the MousePreInit() function exited if an
os specific PreInit function existed. It let the os-specific function finish
all initialisations that remained to be done after osInfo-PreInit() was
called.

The code in master now continues, and does things that the bsdMousePreInit()
function in bsd_mouse.c doesn't expect.

Fix up wsconsPreInit to deal with the new init process.

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=34794

Signed-off-by: Alexandr Shadchin alexandr.shadc...@gmail.com
Reviewed-by: Matthieu Herrb matthieu.he...@laas.fr
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/src/bsd_mouse.c b/src/bsd_mouse.c
index e9e2649..14b529d 100644
--- a/src/bsd_mouse.c
+++ b/src/bsd_mouse.c
@@ -102,7 +102,7 @@ SupportedInterfaces(void)
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || 
defined(__DragonFly__)
 return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO | MSE_MISC;
 #else
-return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO;
+return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO | MSE_MISC;
 #endif
 }
 
@@ -454,31

xserver-xorg-input-mouse: Changes to 'debian-unstable'

2011-02-20 Thread Cyril Brulebois 
 ChangeLog |  421 
 configure.ac  |2 
 debian/changelog  |6 
 man/mousedrv.man  |   27 +--
 src/Makefile.am   |1 
 src/bsd_mouse.c   |   44 ++---
 src/hurd_mouse.c  |   22 +-
 src/lnx_mouse.c   |   20 +-
 src/mouse.c   |  433 +++---
 src/mouse.h   |  260 +++-
 src/pnp.c |1 
 src/sun_mouse.c   |   60 +++
 src/xf86OSmouse.h |  274 --
 13 files changed, 957 insertions(+), 614 deletions(-)

New commits:
commit aee0ab3737aa5e0d850638ec9f397ee0ad28af18
Author: Cyril Brulebois k...@debian.org
Date:   Mon Feb 21 02:17:37 2011 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 76a2d07..8c93b5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-input-mouse (1:1.6.99.901-1) UNRELEASED; urgency=low
+xserver-xorg-input-mouse (1:1.6.99.901-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Cyril Brulebois k...@debian.org  Mon, 21 Feb 2011 02:17:04 +0100
+ -- Cyril Brulebois k...@debian.org  Mon, 21 Feb 2011 02:17:29 +0100
 
 xserver-xorg-input-mouse (1:1.6.0-3) unstable; urgency=low
 

commit a698cce519f9315872a16ad92b37d3aa14f7332a
Author: Cyril Brulebois k...@debian.org
Date:   Mon Feb 21 02:17:17 2011 +0100

Bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index 27c275a..c93df20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,403 @@
+commit 2e507df6704ebd2cab6ada450ed40d89a2d3ca19
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Mon Feb 21 10:06:54 2011 +1000
+
+mouse 1.6.99.901
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit 70f1d8579ef86dd428eabcb3752b5d1bce47b8f7
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Mon Feb 21 09:40:13 2011 +1000
+
+man: ClearDTR and ClearRTS are handled by the X server.
+
+If it breaks, we know who to blame (or file a bug against).
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Cyril Brulebois k...@debian.org
+
+commit 194c5913e92c84d1a30447d43b5beee77a98b7ba
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Mon Feb 21 09:33:37 2011 +1000
+
+man: protocol option isn't mandatory, it's platform-specific.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Cyril Brulebois k...@debian.org
+
+commit f70a9817a2eb845eb9718c0ed6540de1ffe7e531
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Mon Feb 21 09:30:36 2011 +1000
+
+man: fix typo Auto platform → Auto protocol
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Cyril Brulebois k...@debian.org
+
+commit a45b5d0eaf871c139b057f757869a20fd617d529
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Mon Feb 21 09:29:59 2011 +1000
+
+man: README.mouse is just README
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Cyril Brulebois k...@debian.org
+
+commit 9140e2640319833658a2be5ab2f8349a79ff20aa
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Mon Feb 21 09:28:26 2011 +1000
+
+man: add mention of xorg.conf.d snippet
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Cyril Brulebois k...@debian.org
+
+commit af784aad332d67bb746597d5de032ca320928d51
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Mon Feb 21 09:24:38 2011 +1000
+
+man: remove mention of core pointer.
+
+This doesn't apply to X servers 1.7 and later.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Cyril Brulebois k...@debian.org
+
+commit 6b5a82e4e85ab12df23ecf30f2b07eb4c5763e93
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Mon Nov 29 22:25:52 2010 -0800
+
+Add ABI checks around XI86_CONFIGURED uses in OS-specific PreInits
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit 73bb42e10033cfeb41ba540ea0303b882ff7e61e
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Thu Nov 25 11:35:29 2010 +1000
+
+Bump to 1.6.99
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit 0a088df6b2f5cac05a00c4f461274b83feb1a9a8
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Mon Oct 25 14:34:28 2010 +1000
+
+Adjust to new Input ABI 12.
+
+New PreInit prototype and a couple of other minor changes.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Chase Douglas chase.doug...@canonical.com
+
+commit fedd52ba781da1960ada0a96b85293afe2509a4a
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Mon Oct 25 11:16:22 2010 +1000
+
+ABI 12 requires per-valuator modes.
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Chase Douglas

xserver-xorg-input-mouse: Changes to 'debian-unstable'

2011-02-17 Thread Cyril Brulebois 
 debian/changelog |7 +++
 src/hurd_mouse.c |9 ++---
 2 files changed, 13 insertions(+), 3 deletions(-)

New commits:
commit 2189038cba7b9259a4a897e46c8396f61fb6d73d
Author: Cyril Brulebois k...@debian.org
Date:   Thu Feb 17 23:04:36 2011 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index f531303..cb39149 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-input-mouse (1:1.6.0-3) UNRELEASED; urgency=low
+xserver-xorg-input-mouse (1:1.6.0-3) unstable; urgency=low
 
   * Cherry-pick from upstream, thanks to Samuel Thibault:
 - Fix mouse data buffering
 
- -- Cyril Brulebois k...@debian.org  Thu, 17 Feb 2011 23:03:40 +0100
+ -- Cyril Brulebois k...@debian.org  Thu, 17 Feb 2011 23:04:17 +0100
 
 xserver-xorg-input-mouse (1:1.6.0-2) unstable; urgency=low
 

commit 9f886747e6b481455105423b46711b6ab509b6bd
Author: Cyril Brulebois k...@debian.org
Date:   Thu Feb 17 23:04:15 2011 +0100

Document the cherry-pick.

diff --git a/debian/changelog b/debian/changelog
index 812ffea..f531303 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-mouse (1:1.6.0-3) UNRELEASED; urgency=low
+
+  * Cherry-pick from upstream, thanks to Samuel Thibault:
+- Fix mouse data buffering
+
+ -- Cyril Brulebois k...@debian.org  Thu, 17 Feb 2011 23:03:40 +0100
+
 xserver-xorg-input-mouse (1:1.6.0-2) unstable; urgency=low
 
   * Switch to dh:

commit 290afd625aec351037500b6a76913dd6fe60dfe1
Author: Samuel Thibault samuel.thiba...@ens-lyon.org
Date:   Sun Sep 5 21:20:33 2010 +0200

Fix mouse data buffering

Check remaining buffer size *before* reading a character from the device.  
Also
keep extra characters in the static buffer until next invocation.

Signed-off-by: Samuel Thibault samuel.thiba...@ens-lyon.org
(cherry picked from commit 35f277a718f2da6a09080af020aaf29ef96fe807)

diff --git a/src/hurd_mouse.c b/src/hurd_mouse.c
index 4dac225..3008d28 100644
--- a/src/hurd_mouse.c
+++ b/src/hurd_mouse.c
@@ -86,6 +86,7 @@ OsMouseReadInput(InputInfoPtr pInfo)
 {
 MouseDevPtr pMse;
 static kd_event eventList[NUMEVENTS];
+static int remainder = 0;
 int n, c; 
 kd_event *event = eventList;
 unsigned char *pBuf;
@@ -94,13 +95,14 @@ OsMouseReadInput(InputInfoPtr pInfo)
 
 XisbBlockDuration(pMse-buffer, -1);
 pBuf = (unsigned char *)eventList;
-n = 0;
-while ((c = XisbRead(pMse-buffer)) = 0  n  sizeof(eventList))
+n = remainder;
+while (n  sizeof(eventList)  (c = XisbRead(pMse-buffer)) = 0)
pBuf[n++] = (unsigned char)c;
 
-if (n == 0)
+if (n == remainder)
return;
 
+remainder = n % sizeof(kd_event);
 n /= sizeof(kd_event);
 while( n-- ) {
int buttons = pMse-lastButtons;
@@ -126,6 +128,7 @@ OsMouseReadInput(InputInfoPtr pInfo)
pMse-PostEvent(pInfo, buttons, dx, dy, 0, 0);
++event;
 }
+memcpy(eventList, event, remainder);
 return;
 }
 


-- 
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/e1pqc3b-lr...@alioth.debian.org

xserver-xorg-input-mouse: Changes to 'debian-unstable'

2011-02-05 Thread Cyril Brulebois 
 .gitignore   |   76 +-
 COPYING  |   50 -
 ChangeLog|  414 +++
 Makefile.am  |   16 
 README   |  340 -
 README.sgml  | 1125 ---
 configure.ac |   59 -
 debian/README.source |   24 
 debian/changelog |   35 
 debian/compat|2 
 debian/control   |   23 
 debian/copyright |   51 -
 debian/rules |  106 --
 debian/xserver-xorg-input-mouse.docs |1 
 debian/xserver-xorg-input-mouse.install  |2 
 debian/xserver-xorg-input-mouse.manpages |1 
 debian/xsfbs/repack.sh   |   32 
 debian/xsfbs/xsfbs.mk|  285 ---
 debian/xsfbs/xsfbs.sh|  622 -
 man/Makefile.am  |   65 -
 src/Makefile.am  |2 
 src/hurd_mouse.c |4 
 src/lnx_mouse.c  |1 
 src/mouse.c  |   29 
 src/pnp.c|3 
 src/sco_mouse.c  |  258 ---
 src/sun_mouse.c  |  133 ++-
 src/xf86OSmouse.h|3 
 28 files changed, 909 insertions(+), 2853 deletions(-)

New commits:
commit f3ac1e2f48acb2a8151e2bdcd1b5d4d396faad56
Author: Cyril Brulebois k...@debian.org
Date:   Sat Feb 5 14:39:23 2011 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 6f3e9c8..812ffea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-mouse (1:1.6.0-2) UNRELEASED; urgency=low
+xserver-xorg-input-mouse (1:1.6.0-2) unstable; urgency=low
 
   * Switch to dh:
 - Use debhelper 8.
@@ -13,7 +13,7 @@ xserver-xorg-input-mouse (1:1.6.0-2) 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 05:11:51 +0100
+ -- Cyril Brulebois k...@debian.org  Sat, 05 Feb 2011 14:39:23 +0100
 
 xserver-xorg-input-mouse (1:1.6.0-1) experimental; urgency=low
 

commit 62fb5cd942a1691187ea5372f6f0b81e37b5d9e9
Author: Cyril Brulebois k...@debian.org
Date:   Fri Feb 4 11:40:10 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 7efe334..2372c9f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,4 +20,4 @@ override_dh_shlibdeps:
dh_shlibdeps -- --warnings=6
 
 %:
-   dh $@ --with autoreconf,quilt,xsf --builddirectory=build/
+   dh $@ --with quilt,autoreconf,xsf --builddirectory=build/

commit b30d11d1e44ee53117bd207a1f778d5311e3204f
Author: Cyril Brulebois k...@debian.org
Date:   Thu Feb 3 05:24:04 2011 +0100

Bump Standards-Version to 3.9.1 (no changes needed).

diff --git a/debian/changelog b/debian/changelog
index f8e6a26..6f3e9c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ xserver-xorg-input-mouse (1:1.6.0-2) UNRELEASED; urgency=low
   * Remove long obsolete Replaces.
   * Update Uploaders list. Thanks, David!
   * Wrap Depends/Provides.
+  * Bump Standards-Version to 3.9.1 (no changes needed).
 
  -- Cyril Brulebois k...@debian.org  Thu, 03 Feb 2011 05:11:51 +0100
 
diff --git a/debian/control b/debian/control
index 6a10cda..39333c6 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.8.3
+Standards-Version: 3.9.1
 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 660d9ec0ec98ef537b751a3484d0f611741d6d60
Author: Cyril Brulebois k...@debian.org
Date:   Thu Feb 3 05:23:42 2011 +0100

Wrap Depends/Provides.

diff --git a/debian/changelog b/debian/changelog
index 48ad418..f8e6a26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ xserver-xorg-input-mouse (1:1.6.0-2) UNRELEASED; urgency=low
   * Remove xsfbs accordingly.
   * Remove long obsolete Replaces.
   * Update Uploaders list. Thanks, David!
+  * Wrap Depends/Provides.
 
  -- Cyril Brulebois k...@debian.org  Thu, 03 Feb 2011 05:11:51 +0100
 
diff --git a/debian/control b/debian/control
index b695f1c..6a10cda 100644
--- a/debian/control
+++ b/debian/control
@@ -19,8 +19,12 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-mouse.g
 
 Package: xserver-xorg-input-mouse

xserver-xorg-input-mouse: Changes to 'debian-unstable'

2010-05-23 Thread Julien Cristau 
 debian/README.source  |2 +-
 debian/changelog  |   17 -
 debian/control|4 ++--
 debian/xsfbs/xsfbs.mk |   35 ++-
 4 files changed, 37 insertions(+), 21 deletions(-)

New commits:
commit 27963188bf161b11c5071e7555650787b241bbbd
Author: Julien Cristau jcris...@debian.org
Date:   Sun May 23 23:26:18 2010 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index d0a6472..8ded95a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,10 @@
-xserver-xorg-input-mouse (1:1.5.0-2) UNRELEASED; urgency=low
+xserver-xorg-input-mouse (1:1.5.0-2) unstable; urgency=medium
 
-  [ Julien Cristau ]
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
 good reason.  Thanks, Colin Watson!
   * Update xsfbs and use new ${xinpdriver:Depends} substvar.
 
- -- Timo Aaltonen tjaal...@ubuntu.com  Sat, 05 Dec 2009 01:49:04 +0200
+ -- Julien Cristau jcris...@debian.org  Sun, 23 May 2010 23:26:11 +0200
 
 xserver-xorg-input-mouse (1:1.5.0-1) experimental; urgency=low
 

commit 72121c4f5075fa7dbf22774162b77268c15be69f
Author: Julien Cristau jcris...@debian.org
Date:   Sun May 23 23:25:29 2010 +0200

Update xsfbs and use new ${xinpdriver:Depends} substvar.

diff --git a/debian/changelog b/debian/changelog
index e18b672..d0a6472 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-input-mouse (1:1.5.0-2) UNRELEASED; urgency=low
   [ Julien Cristau ]
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
 good reason.  Thanks, Colin Watson!
+  * Update xsfbs and use new ${xinpdriver:Depends} substvar.
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Sat, 05 Dec 2009 01:49:04 +0200
 
diff --git a/debian/control b/debian/control
index 117077f..9f84a85 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow dnusi...@debian.org, Drew Parsons 
dpars...@debian.or
 Build-Depends:
  debhelper (= 5),
  pkg-config,
- xserver-xorg-dev (= 2:1.7),
+ xserver-xorg-dev (= 2:1.7.6.901),
  x11proto-input-dev,
  x11proto-core-dev,
  x11proto-randr-dev,
@@ -21,7 +21,7 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-mouse.g
 
 Package: xserver-xorg-input-mouse
 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 -- mouse input driver

commit 81fc271788605b52e85c2d11635a0371fb44605e
Author: Cyril Brulebois k...@debian.org
Date:   Sun May 2 02:14:45 2010 +0200

Add xorg-driver-{video,input} to Provides.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 77c4a39..3c59c20 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -261,8 +261,8 @@ INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 
2/dev/null)
 # these two can be removed post-squeeze
 VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2/dev/null)
 INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2/dev/null)
-VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
-INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
+VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video
+INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input
 
 ifeq ($(PACKAGE),)
 PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }'  debian/control)

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 = $(shell cat /usr/share/xserver-xorg/videodrvdep 2/dev/null)
+INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2/dev/null)
+
+# these two can be removed post-squeeze
 VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2/dev/null)
 INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2/dev/null)
-SERVER_DEPENDS = xserver-xorg-core (= $(SERVERMINVERS))
 VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
 INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
+
 ifeq ($(PACKAGE),)
 PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }'  debian/control)
 endif
 
 .PHONY: serverabi
 serverabi: install
-ifeq ($(SERVERMINVERS),)
-   @echo error: xserver-xorg-dev needs to be installed
+ifeq ($(VIDEODEP),)
+   @echo 'error:

xserver-xorg-input-mouse: Changes to 'debian-unstable'

2010-05-07 Thread Mikhail Gusarov 
 debian/control |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 56894b68452608ca57b170200beacd5f65bc0f36
Author: Mikhail Gusarov dotted...@debian.org
Date:   Fri May 7 18:58:56 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 ef051c1..117077f 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,5 @@ Description: X.Org X server -- mouse 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-mouse 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/e1oamme-000748...@alioth.debian.org

xserver-xorg-input-mouse: Changes to 'debian-unstable'

2010-01-16 Thread Julien Cristau 
 debian/changelog |5 +
 debian/rules |   10 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit a46d8405354c9f19f2bb40acc362d4f2017e47d5
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jan 16 16:48:40 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 044950b..1eb79e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 xserver-xorg-input-mouse (1:1.5.0-1) UNRELEASED; urgency=low
 
+  [ Timo Aaltonen ]
   * New upstream release.
   * Bump the build-dep on xutils-dev (= 1:7.5~1).
   * Build against Xserver 1.7.
 
+  [ 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  Sat, 05 Dec 2009 01:49:04 +0200
 
 xserver-xorg-input-mouse (1:1.4.0-4) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index d41a543..2477466 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,12 +38,12 @@ configure: $(STAMP_DIR)/patch
 
 build: build-stamp
 build-stamp: configure
-   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
@@ -55,7 +55,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)
@@ -68,7 +68,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-mouse: Changes to 'debian-unstable'

2009-12-04 Thread Timo Aaltonen 
 debian/changelog |3 ++-
 debian/control   |2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 78e6c0dfd9dfdf4f2c01402a657581ce922c8a91
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 f7ad30f..044950b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xserver-xorg-input-mouse (1:1.5.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Bump the build-dep on xutils-dev (= 1:7.5~1).
+  * Build against Xserver 1.7.
 
- -- Timo Aaltonen tjaal...@ubuntu.com  Mon, 30 Nov 2009 15:30:50 +0200
+ -- Timo Aaltonen tjaal...@ubuntu.com  Sat, 05 Dec 2009 01:49:04 +0200
 
 xserver-xorg-input-mouse (1:1.4.0-4) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index c212ee8..ef051c1 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow dnusi...@debian.org, Drew Parsons 
dpars...@debian.or
 Build-Depends:
  debhelper (= 5),
  pkg-config,
- xserver-xorg-dev (= 2:1.5.99.901),
+ 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-mouse: Changes to 'debian-unstable'

2009-11-30 Thread Timo Aaltonen 
 .gitignore|6 +
 ChangeLog |  198 ++
 configure.ac  |   19 +---
 debian/changelog  |7 +
 debian/control|2 
 debian/xsfbs/xsfbs.mk |   21 
 debian/xsfbs/xsfbs.sh |  233 --
 man/.cvsignore|2 
 man/mousedrv.man  |3 
 src/.cvsignore|6 -
 src/mouse.c   |  198 +++---
 src/mouse.h   |3 
 src/sun_mouse.c   |  104 --
 13 files changed, 336 insertions(+), 466 deletions(-)

New commits:
commit 9e230a8beaa8ac77f159a9b1f20408689b8bc8d6
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Mon Nov 30 15:39:14 2009 +0200

Bump the build-dep on xutils-dev (= 1:7.5~1).

diff --git a/debian/changelog b/debian/changelog
index 53c1a52..f7ad30f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-input-mouse (1:1.5.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump the build-dep on xutils-dev (= 1:7.5~1).
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Mon, 30 Nov 2009 15:30:50 +0200
 
diff --git a/debian/control b/debian/control
index 2a04c08..c212ee8 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
  dpkg-dev (= 1.14.17),
  automake,
  libtool,
- xutils-dev (= 1:7.4+4)
+ xutils-dev (= 1:7.5~1)
 Standards-Version: 3.8.3
 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 c12a06ddabe311e71d8ac4fcec6ed3c1e38eab31
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Mon Nov 30 15:31:17 2009 +0200

Update the changelogs.

diff --git a/ChangeLog b/ChangeLog
index 84f370f..d800f1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,201 @@
+commit 2b6dc8ccfe85356d309e3191cf5b942c6d4e0cd5
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Tue Oct 6 12:09:46 2009 +1000
+
+mouse 1.5.0
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit 6bae95035db026b7f3189a21942ce7953a6e3437
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Tue Oct 6 12:07:45 2009 +1000
+
+Require macros 1.3 for XORG_DEFAULT_OPTIONS
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit 622cf1834725c3348cfdc41c12e39b327011c836
+Author: Alan Coopersmith alan.coopersm...@sun.com
+Date:   Sat Sep 12 20:18:06 2009 -0700
+
+Fix crashes due to MouseBlockHandler/MouseWakeupHandler with invalid 
devices
+
+Don't install the handlers if devices failed to open/initalize.
+Remove the handlers when disabling Emulate3Soft mode, since otherwise
+they'll be left around when device is closed  device structs are freed.
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@sun.com
+
+commit bc7933171e08215ba28bc06c80ee1bc1febc0522
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Wed Sep 9 11:48:58 2009 +1000
+
+mouse 1.4.99.1
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit 04a29c8c8ebc6fbc6f5b67026b659a2ffdd6540b
+Author: Gaetan Nadon mems...@videotron.ca
+Date:   Mon Sep 7 11:12:13 2009 -0400
+
+xf86-input-mouse: Remove unused .cvsignore file #23776
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit fa997144458527856b71fa162a105a46af8e688a
+Author: Donald Kayser x...@kayser.net
+Date:   Thu Sep 3 09:22:30 2009 +1000
+
+signed/unsigned fixes for delta x,y movement
+
+Changed the cast of (char) to (signed char) while computing delta x
+and delta y mouse movements. The C standard does not define compiler
+behavior, and currently with PPC builds, the (char) cast is unsigned.
+To guarantee that the compiler will generate signed values, the cast
+has been changed
+
+Signed-off-by: Donald Kayser x...@kayser.net
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit f292f23baf4db048917a2acd4def9fab4293bc85
+Author: Alan Coopersmith alan.coopersm...@sun.com
+Date:   Thu Aug 20 13:49:52 2009 -0700
+
+sun_mouse: Don't try calling ioctls if mouse fd wasn't opened
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@sun.com
+
+commit f93c927178a352eec00b3323eb935cc6f27243b0
+Author: Alan Coopersmith alan.coopersm...@sun.com
+Date:   Thu Aug 20 13:29:25 2009 -0700
+
+Remove check for OS/2
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@sun.com
+
+commit 1be9e3cf0c491cddfb5985b6b3cc65581313f98f
+Author: Alan Coopersmith alan.coopersm...@sun.com
+Date:   Thu Aug 20 13:26:40 2009 -0700
+
+sun_mouse: Check if streams module is already on the stack before pushing 
it
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@sun.com
+
+commit bf95ccf496d6674a83c44d559e3eef8729c69449
+Author: Dima Kogan dko...@secretsauce.net
+Date:   Sun Aug 16 22:27:28 2009 -0700
+
+Restrict wheel emulation to a single axis at a

xserver-xorg-input-mouse: Changes to 'debian-unstable'

2009-08-23 Thread Julien Cristau 
 debian/changelog |6 --
 debian/rules |2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 3ebc0ac6b92dc5e1db0d935a4e306e0297a008df
Author: Julien Cristau jcris...@debian.org
Date:   Sun Aug 23 11:10:19 2009 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index d35b0fb..3a7153b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-xserver-xorg-input-mouse (1:1.4.0-3) UNRELEASED; urgency=low
+xserver-xorg-input-mouse (1:1.4.0-3) unstable; urgency=low
 
   * Add README.source, bump Standards-Version to 3.8.3.
   * Install an fdi file to pick up the mouse driver on kfreebsd (closes:
 #542806).  Thanks, Aurélien Jarno!
   * Fix DEB_BUILD_OPTIONS parsing to use space-separated options.
+  * Remove myself from Uploaders, I don't maintain this driver.
 
- -- Julien Cristau jcris...@debian.org  Sat, 22 Aug 2009 22:58:56 +0200
+ -- Julien Cristau jcris...@debian.org  Sun, 23 Aug 2009 11:10:16 +0200
 
 xserver-xorg-input-mouse (1:1.4.0-2) unstable; urgency=low
 

commit 9939130f500c6242f968eb98d8153e4a86505728
Author: Julien Cristau jcris...@debian.org
Date:   Sun Aug 23 11:09:42 2009 +0200

Fix DEB_BUILD_OPTIONS parsing to use space-separated options.

diff --git a/debian/changelog b/debian/changelog
index 2f29162..d35b0fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-input-mouse (1:1.4.0-3) UNRELEASED; urgency=low
   * Add README.source, bump Standards-Version to 3.8.3.
   * Install an fdi file to pick up the mouse driver on kfreebsd (closes:
 #542806).  Thanks, Aurélien Jarno!
+  * Fix DEB_BUILD_OPTIONS parsing to use space-separated options.
 
  -- Julien Cristau jcris...@debian.org  Sat, 22 Aug 2009 22:58:56 +0200
 
diff --git a/debian/rules b/debian/rules
index b92a9fa..d41a543 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@
 include debian/xsfbs/xsfbs.mk
 
 CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
 else
CFLAGS += -O2


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

xserver-xorg-input-mouse: Changes to 'debian-unstable'

2009-08-23 Thread Julien Cristau 
 debian/changelog|6 ++
 debian/local/10-x11-input-mouse.fdi |   10 --
 debian/local/10-x11-mouse.fdi   |   10 ++
 3 files changed, 16 insertions(+), 10 deletions(-)

New commits:
commit 73f03dde8c519d77f6a6030dbf2464418f7b5b4e
Author: Julien Cristau jcris...@debian.org
Date:   Sun Aug 23 20:12:14 2009 +0200

Rename the fdi file to match what we're installing... (closes: #542806)

diff --git a/debian/changelog b/debian/changelog
index 3a7153b..ebb8a07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-mouse (1:1.4.0-4) unstable; urgency=low
+
+  * Rename the fdi file to match what we're installing... (closes: #542806)
+
+ -- Julien Cristau jcris...@debian.org  Sun, 23 Aug 2009 20:12:24 +0200
+
 xserver-xorg-input-mouse (1:1.4.0-3) unstable; urgency=low
 
   * Add README.source, bump Standards-Version to 3.8.3.
diff --git a/debian/local/10-x11-input-mouse.fdi 
b/debian/local/10-x11-input-mouse.fdi
deleted file mode 100644
index ba391ef..000
--- a/debian/local/10-x11-input-mouse.fdi
+++ /dev/null
@@ -1,10 +0,0 @@
-?xml version=1.0 encoding=ISO-8859-1?
-deviceinfo version=0.2
-  device
-match key=/org/freedesktop/Hal/devices/computer:system.kernel.name 
string=GNU/kFreeBSD
-  match key=info.capabilities contains=input.mouse
-merge key=input.x11_driver type=stringmouse/merge
-  /match
-/match
-  /device
-/deviceinfo
diff --git a/debian/local/10-x11-mouse.fdi b/debian/local/10-x11-mouse.fdi
new file mode 100644
index 000..ba391ef
--- /dev/null
+++ b/debian/local/10-x11-mouse.fdi
@@ -0,0 +1,10 @@
+?xml version=1.0 encoding=ISO-8859-1?
+deviceinfo version=0.2
+  device
+match key=/org/freedesktop/Hal/devices/computer:system.kernel.name 
string=GNU/kFreeBSD
+  match key=info.capabilities contains=input.mouse
+merge key=input.x11_driver type=stringmouse/merge
+  /match
+/match
+  /device
+/deviceinfo


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

xserver-xorg-input-mouse: Changes to 'debian-unstable'

2009-08-22 Thread Julien Cristau 
 debian/README.source|   73 
 debian/changelog|8 +++
 debian/control  |4 -
 debian/local/10-x11-input-mouse.fdi |   10 
 debian/rules|6 ++
 debian/xsfbs/xsfbs.sh   |   12 -
 6 files changed, 98 insertions(+), 15 deletions(-)

New commits:
commit 69964fcfa2559d1b4d2123882e05075566ad7b0e
Author: Julien Cristau jcris...@debian.org
Date:   Sat Aug 22 23:12:26 2009 +0200

Install an fdi file to pick up the mouse driver on kfreebsd (closes: 
#542806).

Thanks, Aurélien Jarno!

diff --git a/debian/changelog b/debian/changelog
index 73df97a..2f29162 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 xserver-xorg-input-mouse (1:1.4.0-3) UNRELEASED; urgency=low
 
   * Add README.source, bump Standards-Version to 3.8.3.
+  * Install an fdi file to pick up the mouse driver on kfreebsd (closes:
+#542806).  Thanks, Aurélien Jarno!
 
  -- Julien Cristau jcris...@debian.org  Sat, 22 Aug 2009 22:58:56 +0200
 
diff --git a/debian/local/10-x11-input-mouse.fdi 
b/debian/local/10-x11-input-mouse.fdi
new file mode 100644
index 000..ba391ef
--- /dev/null
+++ b/debian/local/10-x11-input-mouse.fdi
@@ -0,0 +1,10 @@
+?xml version=1.0 encoding=ISO-8859-1?
+deviceinfo version=0.2
+  device
+match key=/org/freedesktop/Hal/devices/computer:system.kernel.name 
string=GNU/kFreeBSD
+  match key=info.capabilities contains=input.mouse
+merge key=input.x11_driver type=stringmouse/merge
+  /match
+/match
+  /device
+/deviceinfo
diff --git a/debian/rules b/debian/rules
index df12398..b92a9fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
 endif
 
-DEB_HOST_ARCH  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_OS   ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
@@ -78,6 +78,10 @@ binary-arch: build install serverabi
dh_installdocs README
dh_installchangelogs ChangeLog
dh_install --sourcedir=debian/tmp --list-missing --exclude=mouse_drv.la 
--exclude=usr/share/man/man4
+ifeq (kfreebsd, $(DEB_HOST_ARCH_OS))
+   install -d -m 755 
debian/xserver-xorg-input-mouse/usr/share/hal/fdi/policy/20thirdparty
+   install -m 644 debian/local/10-x11-mouse.fdi 
debian/xserver-xorg-input-mouse/usr/share/hal/fdi/policy/20thirdparty/
+endif
dh_installman
dh_link
dh_strip

commit 9390e130ea9fa403607134b26a060250cb30752a
Author: Julien Cristau jcris...@debian.org
Date:   Sat Aug 22 22:59:15 2009 +0200

Bump Standards-Version to 3.8.3.

diff --git a/debian/changelog b/debian/changelog
index dc0c444..73df97a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-mouse (1:1.4.0-3) UNRELEASED; urgency=low
+
+  * Add README.source, bump Standards-Version to 3.8.3.
+
+ -- Julien Cristau jcris...@debian.org  Sat, 22 Aug 2009 22:58:56 +0200
+
 xserver-xorg-input-mouse (1:1.4.0-2) unstable; urgency=low
 
   * Upload to unstable.
diff --git a/debian/control b/debian/control
index 9ef71cf..2a04c08 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-input-mouse
 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, Julien Cristau jcris...@debian.org
+Uploaders: David Nusinow dnusi...@debian.org, Drew Parsons 
dpars...@debian.org
 Build-Depends:
  debhelper (= 5),
  pkg-config,
@@ -15,7 +15,7 @@ Build-Depends:
  automake,
  libtool,
  xutils-dev (= 1:7.4+4)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.3
 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 8f72294ada477f003888b6776883c1dd98289f3f
Author: Julien Cristau jcris...@debian.org
Date:   Wed Jun 3 03:37:37 2009 +0200

Kill custom readlink function

This was needed for very, very old versions of debianutils.
Closes: #498890

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 197eb74..781826f 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -303,16 +303,6 @@ EOF
   fi
 }
 
-# we require a readlink command or shell function
-if ! which readlink  /dev/null 21; then
-  message The readlink command was not found.  Please install version \
-  1.13.1 or later of the debianutils package.
-  readlink () {
-# returns what symlink in $1 actually points to
-perl -e '$l = shift; exit 1 unless -l $l; $r = readlink $l; exit 1 unless 
$r; print $r\n' $1
-  }
-fi
-
 check_symlink () {
   #

xserver-xorg-input-mouse: Changes to 'debian-unstable'

2009-04-09 Thread Julien Cristau 
 COPYING|   93 
 ChangeLog  |  232 
 Makefile.am|   15 
 Makefile.in|  681 -
 aclocal.m4 | 8256 -
 config.guess   | 1526 ---
 config.h.in|   66 
 config.sub | 1658 ---
 configure  |22916 -
 configure.ac   |   49 
 debian/changelog   |   23 
 debian/control |   13 
 debian/copyright   |   93 
 debian/rules   |   19 
 debian/xsfbs/repack.sh |   32 
 debian/xsfbs/xsfbs.mk  |   47 
 debian/xsfbs/xsfbs.sh  |   66 
 depcomp|  589 -
 install-sh |  519 -
 ltmain.sh  | 6964 --
 man/Makefile.in|  430 
 man/mousedrv.man   |   75 
 missing|  367 
 mkinstalldirs  |  161 
 src/Makefile.am|   24 
 src/Makefile.in|  520 -
 src/bsd_mouse.c|  798 +
 src/hurd_mouse.c   |  242 
 src/lnx_mouse.c|  221 
 src/mouse.c|   52 
 src/mouse.h|4 
 src/mousePriv.h|1 
 src/pnp.c  |   28 
 src/sco_mouse.c|  258 
 src/sun_mouse.c|  748 +
 src/xf86OSmouse.h  |  277 
 36 files changed, 3210 insertions(+), 44853 deletions(-)

New commits:
commit 99cb7df3eb4ef66ed46adffea593143ce829810b
Author: Julien Cristau jcris...@debian.org
Date:   Thu Apr 9 16:22:03 2009 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 7ed5b77..dc0c444 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-mouse (1:1.4.0-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Julien Cristau jcris...@debian.org  Thu, 09 Apr 2009 16:22:01 +0100
+
 xserver-xorg-input-mouse (1:1.4.0-1) experimental; urgency=low
 
   * New upstream release.

commit fa6396d6bf68b9a0154089146287245f9ad60a1e
Author: Julien Cristau jcris...@debian.org
Date:   Wed Feb 25 21:31:03 2009 +0100

xsfbs: repack.sh needs to be executable

diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh
old mode 100644
new mode 100755

commit 2ed171f9f390de4e97141c0016d3ba615e8c943e
Author: Julien Cristau jcris...@debian.org
Date:   Tue Feb 17 17:20:42 2009 +0100

xsfbs.sh: kill {,de}register_x_lib_dir_with_ld_so

libx11's postinst was the only post-sarge user, and it's gone now.

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 72efa95..8840ff9 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -719,72 +719,6 @@ run () {
   fi
 }
 
-register_x_lib_dir_with_ld_so () {
-  # syntax: register_x_lib_dir_with_ld_so
-  #
-  # Configure the dynamic loader ld.so to search /usr/X11R6/lib for shared
-  # libraries.
-  #
-  # Call this function from the postinst script of a package that places a
-  # shared library in /usr/X11R6/lib, before invoking ldconfig.
-
-  local dir ldsoconf
-
-  dir=/usr/X11R6/lib
-  ldsoconf=/etc/ld.so.conf
-
-  # is the line not already present?
-  if ! fgrep -qsx $dir $ldsoconf; then
-observe adding $dir directory to $ldsoconf
-echo $dir  $ldsoconf
-  fi
-}
-
-deregister_x_lib_dir_with_ld_so () {
-  # syntax: deregister_x_lib_dir_with_ld_so
-  #
-  # Configure dynamic loader ld.so to not search /usr/X11R6/lib for shared
-  # libraries, if and only if no shared libaries remain there.
-  #
-  # Call this function from the postrm script of a package that places a shared
-  # library in /usr/X11R6/lib, in the event $1 is remove, and before
-  # invoking ldconfig.
-
-  local dir ldsoconf fgrep_status cmp_status
-
-  dir=/usr/X11R6/lib
-  ldsoconf=/etc/ld.so.conf
-
-  # is the line present?
-  if fgrep -qsx $dir $ldsoconf; then
-# are there any shared objects in the directory?
-if [ $(echo $dir/lib*.so.*.*) = $dir/lib*.so.*.* ]; then
-  # glob expansion produced nothing, so no shared libraries are present
-  observe removing $dir directory from $ldsoconf
-  # rewrite the file (very carefully)
-  set +e
-  fgrep -svx $dir $ldsoconf  $ldsoconf.dpkg-tmp
-  fgrep_status=$?
-  set -e
-  case $fgrep_status in
-0|1) ;; # we don't actually care if any lines matched or not
-*) die error reading \$ldsoconf\; fgrep exited with status \
-  $fgrep_status ;;
-  esac
-  set +e
-  cmp -s $ldsoconf.dpkg-tmp $ldsoconf
-  cmp_status=$?
-  set -e
-  case $cmp_status in
-0) rm $ldsoconf.dpkg-tmp ;; # files are identical
-1) mv $ldsoconf.dpkg-tmp $ldsoconf ;; # files differ
-*) die error comparing \$ldsoconf.dpkg-tmp\ to \$ldsoconf\; \
-  cmp exited with status $cmp_status ;;
-  esac
-fi
-  fi
-}
-
 make_symlink_sane () {
   # syntax: make_symlink_sane symlink target
   #

commit 84b7d5bf7a57cab80ba3696ce95028c2f67ba76d
Author: Julien Cristau jcris...@debian.org
Date:   Sun Feb 1 01:31:31 2009 +0100

xsfbs: add a repack script for uscan

This will automatically

xserver-xorg-input-mouse: Changes to 'debian-unstable'

2008-05-30 Thread Julien Cristau 
 ChangeLog| 
  30 
 Makefile.in  | 
 155 -
 aclocal.m4   | 
 413 ++--
 config.guess | 
  32 
 config.sub   | 
  44 
 configure| 
 914 +++---
 configure.ac | 
   2 
 debian/changelog | 
  12 
 debian/control   | 
   6 
 debian/patches/0001-Don-t-flush-buttons-release-events-can-cause-paste.patch | 
  44 
 debian/patches/series| 
   1 
 debian/rules | 
   2 
 debian/xsfbs/xsfbs-autoreconf.mk | 
 150 -
 debian/xsfbs/xsfbs.mk| 
  59 
 debian/xsfbs/xsfbs.sh| 
 387 ++--
 depcomp  | 
  93 -
 install-sh   | 
 514 +++--
 ltmain.sh| 
  58 
 man/Makefile.am  | 
   1 
 man/Makefile.in  | 
  97 -
 man/mousedrv.man | 
   3 
 missing  | 
  61 
 mkinstalldirs| 
   5 
 src/Makefile.in  | 
 143 -
 src/mouse.c  | 
  12 
 25 files changed, 1950 insertions(+), 1288 deletions(-)

New commits:
commit 5f814e6882e979a1e00819e5db384ddf110e4415
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri May 30 13:55:27 2008 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index cae1b3d..63541b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-mouse (1:1.3.0-1) UNRELEASED; urgency=low
+xserver-xorg-input-mouse (1:1.3.0-1) unstable; urgency=low
 
   * New upstream release.
   * Drop patch added in 1:1.2.3-2, it's applied in this release.
@@ -8,7 +8,7 @@ xserver-xorg-input-mouse (1:1.3.0-1) UNRELEASED; urgency=low
 dpkg-shlibdeps to shut up about symbols it can't find.  Build-depend on
 dpkg-dev = 1.14.17.
 
- -- Julien Cristau [EMAIL PROTECTED]  Fri, 21 Mar 2008 20:39:16 +0100
+ -- Julien Cristau [EMAIL PROTECTED]  Fri, 30 May 2008 13:55:10 +0200
 
 xserver-xorg-input-mouse (1:1.2.3-2) unstable; urgency=low
 

commit 4cdd8b42355840ce47ed416a011b683c9f5e6237
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri May 30 13:51:00 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 fb594fc..cae1b3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ xserver-xorg-input-mouse (1:1.3.0-1) UNRELEASED; urgency=low
   * New upstream release.
   * Drop patch added in 1:1.2.3-2, it's applied in this release.
   * Drop the XS- prefix from Vcs-* control fields.
+  * 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.
 
  -- Julien Cristau [EMAIL PROTECTED]  Fri, 21 Mar 2008 20:39:16 +0100
 
diff --git a/debian/control b/debian/control
index f4087cd..e91e6c3 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], Julien Cristau [EMAIL PROTECTED]
-Build-Depends: debhelper (= 5), pkg-config, xserver-xorg-dev (= 2:1.4), 
x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev, quilt
+Build-Depends: debhelper (= 5), pkg-config, xserver-xorg-dev (= 2:1.4), 
x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev, quilt, dpkg-dev (= 
1.14.17)
 Standards-Version: 3.7.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-mouse
 Vcs-Browser:

xserver-xorg-input-mouse: Changes to 'debian-unstable'

2007-12-06 Thread Julien Cristau 
 debian/changelog | 
   8 +
 debian/control   | 
   2 
 debian/patches/0001-Don-t-flush-buttons-release-events-can-cause-paste.patch | 
  44 ++
 debian/patches/series| 
   2 
 4 files changed, 54 insertions(+), 2 deletions(-)

New commits:
commit 15b73bdd4c05b1ef2a4ee611431db24356a668a5
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Thu Dec 6 18:47:45 2007 +0100

Prepare changelog for upload.

diff --git a/debian/changelog b/debian/changelog
index 5edec46..ae94947 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-input-mouse (1:1.2.3-2) UNRELEASED; urgency=low
+xserver-xorg-input-mouse (1:1.2.3-2) unstable; urgency=low
 
   * New patch from Peter Hutterer (from upstream bug#13144): don't flush
 buttons, release events can cause paste events.
   * Bump Standards-Version to 3.7.3.
 
- -- Julien Cristau [EMAIL PROTECTED]  Thu, 06 Dec 2007 18:44:01 +0100
+ -- Julien Cristau [EMAIL PROTECTED]  Thu, 06 Dec 2007 18:44:31 +0100
 
 xserver-xorg-input-mouse (1:1.2.3-1) unstable; urgency=low
 

commit 0e4e616e30fd384ba3ab93c701259ab0962651aa
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Thu Dec 6 18:44:26 2007 +0100

* Bump Standards-Version to 3.7.3.

diff --git a/debian/changelog b/debian/changelog
index 7bb436a..5edec46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xserver-xorg-input-mouse (1:1.2.3-2) UNRELEASED; urgency=low
 
   * New patch from Peter Hutterer (from upstream bug#13144): don't flush
 buttons, release events can cause paste events.
+  * Bump Standards-Version to 3.7.3.
 
- -- Julien Cristau [EMAIL PROTECTED]  Thu, 06 Dec 2007 18:33:31 +0100
+ -- Julien Cristau [EMAIL PROTECTED]  Thu, 06 Dec 2007 18:44:01 +0100
 
 xserver-xorg-input-mouse (1:1.2.3-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 702c623..6036ca5 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: David Nusinow [EMAIL PROTECTED], Drew Parsons [EMAIL 
PROTECTED], Julien Cristau [EMAIL PROTECTED]
 Build-Depends: debhelper (= 5), pkg-config, xserver-xorg-dev (= 2:1.4), 
x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev, quilt
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-mouse
 XS-Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-mouse.git
 

commit fc8bd584931ff3d2dc1058d2a883258bc6ff9cb6
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Thu Dec 6 18:35:49 2007 +0100

Don't flush buttons.

Add patch by Peter Hutterer: flushing buttons causes paste events on vt
switch, so don't do it.
https://bugs.freedesktop.org/show_bug.cgi?id=13144
https://bugs.freedesktop.org/attachment.cgi?id=12580

diff --git a/debian/changelog b/debian/changelog
index a2b572d..7bb436a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-mouse (1:1.2.3-2) UNRELEASED; urgency=low
+
+  * New patch from Peter Hutterer (from upstream bug#13144): don't flush
+buttons, release events can cause paste events.
+
+ -- Julien Cristau [EMAIL PROTECTED]  Thu, 06 Dec 2007 18:33:31 +0100
+
 xserver-xorg-input-mouse (1:1.2.3-1) unstable; urgency=low
 
   * New upstream version.
diff --git 
a/debian/patches/0001-Don-t-flush-buttons-release-events-can-cause-paste.patch 
b/debian/patches/0001-Don-t-flush-buttons-release-events-can-cause-paste.patch
new file mode 100644
index 000..c935639
--- /dev/null
+++ 
b/debian/patches/0001-Don-t-flush-buttons-release-events-can-cause-paste.patch
@@ -0,0 +1,44 @@
+From 51fe5125c92969cf7de8bd7d06605c50d10c8ba7 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer [EMAIL PROTECTED]
+Date: Fri, 16 Nov 2007 16:45:45 +1030
+Subject: [PATCH] Don't flush buttons, release events can cause paste events.
+
+---
+ src/mouse.c |   11 +--
+ 1 files changed, 1 insertions(+), 10 deletions(-)
+
+diff --git a/src/mouse.c b/src/mouse.c
+index 293af74..953f542 100644
+--- a/src/mouse.c
 b/src/mouse.c
+@@ -1854,26 +1854,17 @@ MouseConvert(InputInfoPtr pInfo, int first, int num, 
int v0, int v1, int v2,
+ 
+ /**
+  *
+- * FlushButtons -- send button up events for sanity.
++ * FlushButtons -- reset button states.
+  *
+  **/
+ 
+ static void
+ FlushButtons(MouseDevPtr pMse)
+ {
+-
+-/* If no button down is pending xf86PostButtonEvent()
+- * will discard them. So we are on the safe side. */
+-
+ int i, blocked;
+ 
+ pMse-lastButtons = 0;
+ pMse-lastMappedButtons = 0;
+-
+-blocked = xf86BlockSIGIO ();
+-for (i = 1; i = 5; i++)
+-

xserver-xorg-input-mouse: Changes to 'debian-unstable'

2007-09-22 Thread Brice Goglin 
 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 [EMAIL PROTECTED]
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 [EMAIL PROTECTED]
+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 [EMAIL PROTECTED]
+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 [EMAIL PROTECTED]
 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 [EMAIL PROTECTED]  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 [EMAIL PROTECTED]
+
+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 [EMAIL PROTECTED]
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 [EMAIL PROTECTED]
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,

xserver-xorg-input-mouse: Changes to 'debian-unstable'

2007-09-16 Thread David Nusinow 
 debian/changelog |   25 +
 debian/control   |4 ++--
 debian/copyright |3 +++
 3 files changed, 30 insertions(+), 2 deletions(-)

New commits:
commit d79b24b34d4eeb5420d3825a2b6140cb17bf734a
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sun Sep 16 15:32:20 2007 -0400

* Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 860eb67..a742c25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-mouse (1:1.2.2-5) unstable; urgency=low
+
+  * Upload to unstable
+
+ -- David Nusinow [EMAIL PROTECTED]  Sun, 16 Sep 2007 15:13:38 -0400
+
 xserver-xorg-input-mouse (1:1.2.2-4) UNRELEASED; urgency=low
 
   * Add upstream URL to debian/copyright.

commit 0ac2b34d64f2485ab0cfcd9abf647b2cbd55b332
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Sat Sep 15 01:48:25 2007 +0200

Add upstream URL to debian/copyright

diff --git a/debian/changelog b/debian/changelog
index cfd14d8..860eb67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-mouse (1:1.2.2-4) UNRELEASED; urgency=low
+
+  * Add upstream URL to debian/copyright.
+
+ -- Brice Goglin [EMAIL PROTECTED]  Sat, 15 Sep 2007 01:48:04 +0200
+
 xserver-xorg-input-mouse (1:1.2.2-3) experimental; urgency=low
 
   * Rebuild against xserver 1.4.
diff --git a/debian/copyright b/debian/copyright
index 31e20fd..2179a03 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,6 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/driver/
+
 Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
 Copyright 1993 by David Dawes [EMAIL PROTECTED]
 Copyright 2002 by SuSE Linux AG, Author: Egbert Eich

commit 4d130dd1229fa980023db9c209c09b3ae24c1695
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Mon Sep 10 15:14:38 2007 +0200

Prepare changelog for upload.

diff --git a/debian/changelog b/debian/changelog
index 670fb8a..cfd14d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-input-mouse (1:1.2.2-3) UNRELEASED; urgency=low
+xserver-xorg-input-mouse (1:1.2.2-3) experimental; urgency=low
 
   * Rebuild against xserver 1.4.
 
- -- Julien Cristau [EMAIL PROTECTED]  Thu, 06 Sep 2007 18:46:49 +0200
+ -- Julien Cristau [EMAIL PROTECTED]  Mon, 10 Sep 2007 15:13:59 +0200
 
 xserver-xorg-input-mouse (1:1.2.2-2) experimental; urgency=low
 

commit 60aeb9598e73269ce3dedcb19a8ecaf8ac080b5c
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Thu Sep 6 18:48:34 2007 +0200

Rebuild against xserver 1.4

diff --git a/debian/changelog b/debian/changelog
index 69bd111..670fb8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-mouse (1:1.2.2-3) UNRELEASED; urgency=low
+
+  * Rebuild against xserver 1.4.
+
+ -- Julien Cristau [EMAIL PROTECTED]  Thu, 06 Sep 2007 18:46:49 +0200
+
 xserver-xorg-input-mouse (1:1.2.2-2) experimental; urgency=low
 
   * Rebuild against xserver 1.3.99.0.
diff --git a/debian/control b/debian/control
index 8596747..702c623 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], Julien Cristau [EMAIL PROTECTED]
-Build-Depends: debhelper (= 5), pkg-config, xserver-xorg-dev (= 2:1.3.99.0), 
x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev, quilt
+Build-Depends: debhelper (= 5), pkg-config, xserver-xorg-dev (= 2:1.4), 
x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev, quilt
 Standards-Version: 3.7.2
 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-mouse
 XS-Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-mouse.git

commit d96f6491e19a07d7394d528992b7750606d15d50
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sat Aug 18 10:56:33 2007 +0200

Build against xserver 1.3.99.0.

diff --git a/debian/changelog b/debian/changelog
index 495a7ad..69bd111 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-mouse (1:1.2.2-2) experimental; urgency=low
+
+  * Rebuild against xserver 1.3.99.0.
+  * Generate the Provides field automatically.
+
+ -- Julien Cristau [EMAIL PROTECTED]  Sat, 18 Aug 2007 19:59:51 +0200
+
 xserver-xorg-input-mouse (1:1.2.2-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 63eefd4..8596747 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], Julien Cristau [EMAIL PROTECTED]
-Build-Depends: debhelper (= 5), pkg-config, xserver-xorg-dev (= 
2:1.2.99.902), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev, quilt
+Build-Depends: debhelper (= 5), pkg-config, xserver-xorg-dev (= 2:1.3.99.0),

xserver-xorg-input-mouse: Changes to 'debian-unstable'

2007-08-17 Thread Julien Cristau 
 ChangeLog|   15 
 Makefile.in  |  129 +++---
 aclocal.m4   |  676 +---
 config.guess |6 
 config.sub   |   10 
 configure| 1147 ++-
 configure.ac |2 
 debian/changelog |7 
 debian/control   |2 
 depcomp  |   64 ++-
 install-sh   |  348 
 ltmain.sh|  233 +++
 man/Makefile.in  |   96 ++--
 man/mousedrv.man |2 
 missing  |   61 +-
 mkinstalldirs|5 
 src/Makefile.in  |  121 +++--
 17 files changed, 1890 insertions(+), 1034 deletions(-)

New commits:
commit d53614f0bff049c985a6aa040187a6e62411ffa7
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Aug 17 13:03:33 2007 +0200

Remove Branden from Uploaders with his permission; add myself.

diff --git a/debian/changelog b/debian/changelog
index 5169712..495a7ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 xserver-xorg-input-mouse (1:1.2.2-1) unstable; urgency=low
 
   * New upstream release.
+  * Remove Branden from Uploaders with his permission, and add myself.
 
- -- Julien Cristau [EMAIL PROTECTED]  Fri, 17 Aug 2007 12:40:39 +0200
+ -- Julien Cristau [EMAIL PROTECTED]  Fri, 17 Aug 2007 13:02:57 +0200
 
 xserver-xorg-input-mouse (1:1.2.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 4c80a06..63eefd4 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-input-mouse
 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], Drew Parsons [EMAIL 
PROTECTED], Julien Cristau [EMAIL PROTECTED]
 Build-Depends: debhelper (= 5), pkg-config, xserver-xorg-dev (= 
2:1.2.99.902), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev, quilt
 Standards-Version: 3.7.2
 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-mouse

commit 7687741a4b5451ebede1042b9d4cb7bfdee00603
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Aug 17 12:53:58 2007 +0200

Update changelogs.

diff --git a/ChangeLog b/ChangeLog
index f0471e3..ff3cf84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+commit 111081a2f15b416c2fd05b667bca3b3982f93245
+Author: Matthias Hopf [EMAIL PROTECTED]
+Date:   Wed Aug 1 15:55:51 2007 +0200
+
+bump to 1.2.2
+
+commit 8d329a4a23cdaa970e41fa33ee2babc4687189f2
+Author: Brice Goglin [EMAIL PROTECTED]
+Date:   Wed Jul 25 19:22:27 2007 +0200
+
+Fix typo in mousedrv.man
+
+Reported by A. Costa [EMAIL PROTECTED] in
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=432060
+
 commit c7c012d8bf735dfa894146b379a2e1fd55f57fca
 Author: Drew Parsons [EMAIL PROTECTED]
 Date:   Thu Jun 14 00:24:07 2007 +1000
diff --git a/debian/changelog b/debian/changelog
index c905195..5169712 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-mouse (1:1.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Julien Cristau [EMAIL PROTECTED]  Fri, 17 Aug 2007 12:40:39 +0200
+
 xserver-xorg-input-mouse (1:1.2.1-1) unstable; urgency=low
 
   [ Brice Goglin ]

commit 15f27395d86ea761819a2ad2f5437443b0ba7208
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Aug 17 12:51:30 2007 +0200

autoreconf

diff --git a/Makefile.in b/Makefile.in
index 8e534e1..6c52e1a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -33,15 +33,11 @@
 #  ADAM JACKSON 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.
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
 am__cd = CDPATH=$${ZSH_VERSION+.}$(PATH_SEPARATOR)  cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -55,17 +51,17 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \

xserver-xorg-input-mouse: Changes to 'debian-unstable'

2007-06-13 Thread Drew Parsons 
 .cvsignore  |   19 
 .gitignore  |   20 
 ChangeLog   |  572 
--
 README  |   55 
 config.guess|   32 
 config.sub  |   16 
 configure   |   20 
 configure.ac|2 
 debian/changelog|   10 
 debian/patches/01_work_around_race_condition_during_VT_switch.patch |   22 
 debian/patches/series   |2 
 man/mousedrv.man|9 
 src/mouse.c |   45 
 src/mousePriv.h |2 
 14 files changed, 659 insertions(+), 167 deletions(-)

New commits:
commit 15c9a80c5d83326cf288c15a55d7af858e7d650b
Author: Drew Parsons [EMAIL PROTECTED]
Date:   Thu Jun 14 00:48:38 2007 +1000

Upload new version 1.2.1 (+git) to unstable.

Includes 01_work_around_race_condition_during_VT_switch.patch.
autoreconf as well.
Latest git includes Sensitivity option.

diff --git a/ChangeLog b/ChangeLog
index b0ff392..f0471e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,112 +1,536 @@
-2006-05-15  Matthias Hopf  [EMAIL PROTECTED]
+commit c7c012d8bf735dfa894146b379a2e1fd55f57fca
+Author: Drew Parsons [EMAIL PROTECTED]
+Date:   Thu Jun 14 00:24:07 2007 +1000
 
-   * configure.ac,src/mouse.c:
-   Bump to 1.1.1.
+Update version using PACKAGE_VERSION_*
 
-2006-04-21  Matthias Hopf  [EMAIL PROTECTED]
+commit e567cb0792ea3dc2cd68c46628332c1f8bbb173d
+Author: Jürgen Appel [EMAIL PROTECTED]
+Date:   Mon Apr 23 15:54:08 2007 +0200
 
-   * man/mouse.man:
-   Fixed default for YAxisMapping.
-   Changed default for ZAxisMapping. Added short explanation.
-   * src/mouse.c: (MouseCommonOptions), (MouseReadInput):
-   Autodetect (one way only) single wheel only for EXPS2.
-   Use singlebit protocol for multiwheel EXPS2 mice.
+Added Sensitivity option. Use for slowing down high resolution mice.
 
-2006-04-20  Matthias Hopf  [EMAIL PROTECTED]
+commit 4666e5f14b2cb63f5cd7c863331fe69658c989df
+Author: Alan Coopersmith [EMAIL PROTECTED]
+Date:   Mon Feb 26 13:36:15 2007 -0800
 
-   * src/mouse.c: (MousePostEvent):
-   Overhaul of wheel processing. Does work correctly with multibit
-   zaxis events now.
+renamed: .cvsignore - .gitignore
 
-2006-04-06  Adam Jackson  [EMAIL PROTECTED]
+commit 92a8e2a39d7c9d6bfdaa0a5ac0118599008638ff
+Author: Alan Coopersmith [EMAIL PROTECTED]
+Date:   Mon Feb 26 13:35:42 2007 -0800
 
-   * configure.ac:
-   * src/mouse.c:
-   * src/pnp.c:
-   Unlibcwrap.  Bump server version requirement.  Bump to 1.1.0.
+Update text version of README to match sgml
+
+Oops - forgot to regen text when the sgml changes were checked in for
+commit 28c5410df7ba8af07b994c0907519e869c9df750
 
-2006-03-09  Eric Anholt  [EMAIL PROTECTED]
+commit e355dc2e04b1b4756d4ad8553794b4e9721c
+Author: Daniel Stone [EMAIL PROTECTED]
+Date:   Thu Nov 30 19:57:28 2006 +0200
 
-   * src/mouse.c: (MouseCommonOptions):
-   Coverity #875: Correct several memory leaks in options parsing.
+bump to 1.2.1
 
-2006-02-28  Adam Jackson  [EMAIL PROTECTED]
+commit fb347fb74e1a50fa900f225d13eee1aa829fa2f9
+Author: Matthias Hopf [EMAIL PROTECTED]
+Date:   Thu Nov 23 18:17:33 2006 +0100
 
-   * configure.ac:
-   * src/mouse.c:
-   Bump to 1.0.4.
+Work around race condition during VT switch.
+
+https://bugzilla.novell.com/show_bug.cgi?id=219946
 
-2006-02-02  Matthias Hopf  [EMAIL PROTECTED]
+commit 7a866ae143c3638d6b1e3836d48f16e300e90b09
+Author: Daniel Stone [EMAIL PROTECTED]
+Date:   Thu Nov 2 04:47:12 2006 +0200
 
-   * man/mouse.man:
-   Fixed ButtonMapping default.
+bump to 1.2.0
 
-2006-01-17  Matthias Hopf  [EMAIL PROTECTED]
+commit ddc0db4fe85e2b8de31ad67a6d4f97808bce018f
+Author: Daniel Stone [EMAIL PROTECTED]
+Date:   Thu Nov 2 00:07:01 2006 +0200
 
-   * src/mouse.c: (MouseDoPostEvent):
-   Bug #5071: EmulateWheelTimeout didn't work as anticipated.
+port to new motion history api, add right number of args to IPDS
+
+Use new motion history API from the DIX if available, and also use the
+right number of args to InitPointerDeviceStruct, depending on the ABI
+version.
 
-2006-01-09  Daniel Stone  [EMAIL PROTECTED]
+commit 167dbbc2af6cad5d3b320e4e384bd78dd3450a5c
+Author: Adam Jackson [EMAIL PROTECTED]
+Date:   Fri Oct 13 18:28:46 2006 -0400
 
-   * src/mouse.c:
-   Remove #ifdef

xserver-xorg-input-mouse: Changes to 'debian-unstable'

2007-04-24 Thread Brice Goglin 
 .cvsignore  |   19 
 Makefile.in |   16 
 aclocal.m4  | 1858 -
 autogen.sh  |   12 
 config.guess|  125 
 config.h.in |9 
 config.sub  |  102 
 configure   |11382 
--
 configure.ac|2 
 debian/changelog|   19 
 debian/control  |   12 
 debian/patches/01_work_around_race_condition_during_VT_switch.patch |   22 
 debian/patches/series   |1 
 debian/rules|6 
 debian/xsfbs/xsfbs-autoreconf.mk|  150 
 debian/xsfbs/xsfbs.mk   |  379 
 debian/xsfbs/xsfbs.sh   |  907 
 ltmain.sh   |  775 
 man/.cvsignore  |2 
 man/Makefile.am |6 
 man/Makefile.in |   24 
 man/mouse.man   |  248 
 man/mousedrv.man|  248 
 mkinstalldirs   |   89 
 src/.cvsignore  |6 
 src/Makefile.in |   18 
 src/mouse.c |7 
 src/pnp.c   |2 
 28 files changed, 9199 insertions(+), 7247 deletions(-)

New commits:
commit 7a19c87fe7d23ca728492e790e1dfd5de318fac1
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Wed Apr 25 00:42:59 2007 +0200

autoreconf

diff --git a/aclocal.m4 b/aclocal.m4
index 80e0481..aaae5ad 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -6585,7 +6585,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 
's/\..*$//'`
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 
's/^[0-9]*\.//' -e 's/\..*$//'`]
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least 
${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
-   [XORG_MACROS_version=1.1.2
+   [XORG_MACROS_version=1.1.5
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' 
-e 's/\..*$//'`]
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@@ -7038,7 +7038,8 @@ dnl
 # 
 # Adds --with/without-release-string and changes the PACKAGE and
 # PACKAGE_TARNAME to use $PACKAGE{_TARNAME}-$RELEASE_VERSION.  If
-# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged.
+# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged.  Also
+# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
  
 AC_DEFUN([XORG_RELEASE_VERSION],[
AC_ARG_WITH(release-version,
@@ -7051,6 +7052,23 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
PACKAGE_TARNAME=$PACKAGE_TARNAME-$RELEASE_VERSION
AC_MSG_NOTICE([Building with package name set to $PACKAGE])
fi
+   AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
+   [`echo $PACKAGE_VERSION | cut -d . -f 1`],
+   [Major version of this package])
+   PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+   if test x$PVM = x; then
+   PVM=0
+   fi
+   AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
+   [$PVM],
+   [Minor version of this package])
+   PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+   if test x$PVP = x; then
+   PVP=0
+   fi
+   AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL],
+   [$PVP],
+   [Patch version of this package])
 ])
 
 # Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
diff --git a/config.guess b/config.guess
index 910f4ee..396482d 100755
--- a/config.guess
+++ b/config.guess
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.

xserver-xorg-input-mouse: Changes to 'debian-unstable'

2007-01-28 Thread David Nusinow 
New branch 'debian-unstable' available with the following commits:
commit b436bb968ee9b8dc32c590ee7adca2170ed692bf
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 32d66e27cbcaff2c6838cfc9d8db4d381d26da84
Author: Thierry Reding [EMAIL PROTECTED]
Date:   Tue Sep 26 10:26:34 2006 +

Add some more watch files.

commit 3383ba982e2e0cfbb1cc808cd96dec23cd717472
Author: Drew Parsons [EMAIL PROTECTED]
Date:   Fri Sep 22 23:57:17 2006 +

* Upload to unstable (X11R7.1 transition).

commit a0830e02cf34e38e4fd54d6213e644f7f8488b1d
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 4d18e5578b65d8d5fbaeab31876351dcd2c1377d
Author: David Martínez [EMAIL PROTECTED]
Date:   Sat May 13 22:02:30 2006 +

 - Added DRIVER_MAN_DIR=\$$\(mandir\)/man4 to
   configure call in order to ship mouse.man as mouse.4x, but inside
   /usr/share/man/man4/.  I did this because otherwise it would conflict
   with mouse.4 from manpages.  Many thanks to Russ Albery for the hint.

commit f1f0506aec325c300ef4602ceedeb48156d50450
Author: David Martínez [EMAIL PROTECTED]
Date:   Sat May 13 21:47:17 2006 +

Change distribution to unstable.  Prepare for release.

commit 497558815806596bd06195900723d040c8525c11
Author: David Martínez [EMAIL PROTECTED]
Date:   Sat May 13 21:29:59 2006 +

* Added DRIVER_MAN_SUFFIX=4x in order to ship mouse.man as mouse.4x (I
  *know* that it makes lintian shout).  I did this because otherwise it
   would conflict witn mouse.4 from manpages.
* Added README to installed docs.
* Added /usr/share/man to xserver-xorg-input-mouse.install.

commit 33426ff299de4e751d84c82acc1f972f4a75e00f
Author: David Martínez [EMAIL PROTECTED]
Date:   Sat May 13 11:25:22 2006 +

  - Added --list-missing to dh_install.
* debian/control:
  - Updated Standards-Version to 3.7.2.0.
  - Added Depends on xserver-xorg-core (= 1:0.99.0-1).

commit 03942aa282c3f07075a6a75fbfe4673ed5eba6dd
Author: David Nusinow [EMAIL PROTECTED]
Date:   Fri May 12 15:36:53 2006 +

* Add quilt to build-depends

commit ad7491ef4abbd43ec75ba70a74cf8bcc73339d70
Author: David Martínez [EMAIL PROTECTED]
Date:   Fri May 12 12:10:05 2006 +

* debian/rules: Added support for patches.
* 01_stolen_fron_HEAD_spurious_mouse_events.diff: Added patch for mouse.c
  from CVS in order to fix fast scrolling and wrong events. Closes: #366787.

commit a3d0588d1b3a69bfe1651025baf2a713d8b1d1f8
Author: David Martínez [EMAIL PROTECTED]
Date:   Fri May 12 11:00:53 2006 +

Follow SVN best practices and rename mouse input driver tree.

commit 2966201102e130acb1734156be18d02bc8b21897
Author: David Nusinow [EMAIL PROTECTED]
Date:   Wed Apr 5 00:10:22 2006 +

Prepare changelogs for upload to unstable

commit cf40c55c9475740d1a375f849ba0557f3b42e308
Author: David Nusinow [EMAIL PROTECTED]
Date:   Wed Mar 22 02:47:19 2006 +

Version bump for drivers and delete obsolete versions

commit 41ed64335eff9539ade3a6ab8967e34f897e80e7
Author: David Nusinow [EMAIL PROTECTED]
Date:   Wed Mar 22 02:43:39 2006 +

Copy mouse driver 1.0.4 over to working branch

commit f4154700d8a5a9db9587e57f6823d8b0e2e192f9
Author: David Nusinow [EMAIL PROTECTED]
Date:   Wed Mar 22 02:41:07 2006 +

Vendor drop of new mouse and citron drivers


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]