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

2011-12-31 Thread Cyril Brulebois 
 ChangeLog|   22 +
 configure.ac |2 -
 debian/changelog |   22 +
 debian/control   |4 +--
 src/mouse.c  |2 +
 src/mouse.h  |1 
 src/sun_mouse.c  |   68 ---
 7 files changed, 50 insertions(+), 71 deletions(-)

New commits:
commit bafcbe466ad8d8c1ac14d01fabbdfad376dc8315
Author: Cyril Brulebois k...@debian.org
Date:   Sat Dec 31 17:15:25 2011 +0100

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 47754e5..54fa57c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-input-mouse (1:1.7.1-1+exp1) UNRELEASED; urgency=low
+xserver-xorg-input-mouse (1:1.7.1-1+exp1) experimental; urgency=low
 
   * Build against Xserver 1.12 RC1.
 
- -- Cyril Brulebois k...@debian.org  Sat, 31 Dec 2011 17:14:12 +0100
+ -- Cyril Brulebois k...@debian.org  Sat, 31 Dec 2011 17:15:20 +0100
 
 xserver-xorg-input-mouse (1:1.7.1-1) unstable; urgency=low
 

commit e9f3c57306839397e76a68e3667d21660cf195ae
Author: Cyril Brulebois k...@debian.org
Date:   Sat Dec 31 17:14:28 2011 +0100

Build against Xserver 1.12 RC1.

diff --git a/debian/changelog b/debian/changelog
index 4234291..47754e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-mouse (1:1.7.1-1+exp1) UNRELEASED; urgency=low
+
+  * Build against Xserver 1.12 RC1.
+
+ -- Cyril Brulebois k...@debian.org  Sat, 31 Dec 2011 17:14:12 +0100
+
 xserver-xorg-input-mouse (1:1.7.1-1) unstable; urgency=low
 
   * New upstream release:
diff --git a/debian/control b/debian/control
index a40be49..f8ccb63 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.11.99.901),
  x11proto-input-dev,
  x11proto-core-dev,
  x11proto-randr-dev,

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

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

2011-04-03 Thread Cyril Brulebois 
 debian/changelog |7 +++
 debian/control   |   13 +
 debian/xserver-xorg-input-mouse-udeb.install |1 +
 3 files changed, 21 insertions(+)

New commits:
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


-- 
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/e1q6yc8-0006en...@alioth.debian.org

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

2011-04-03 Thread Cyril Brulebois 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
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
 


-- 
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/e1q6ymx-0006jy...@alioth.debian.org

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

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

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

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

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

New commits:
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 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:

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

2011-02-20 Thread Cyril Brulebois 
 ChangeLog|  421 
 configure.ac |2 
 debian/README.source |   24 -
 debian/changelog |   36 +
 debian/compat|2 
 debian/control   |   21 -
 debian/rules |  106 -
 debian/watch |1 
 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/mousedrv.man |   27 -
 src/Makefile.am  |1 
 src/bsd_mouse.c  |   44 +-
 src/hurd_mouse.c |   31 -
 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 -
 24 files changed, 1022 insertions(+), 1685 deletions(-)

New commits:
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 k...@debian.org  Mon, 21 Feb 2011 02:21:38 +0100
+
 xserver-xorg-input-mouse (1:1.6.99.901-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 39333c6..083a0f5 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.4),
+ xserver-xorg-dev (= 2:1.9.99.902),
  x11proto-input-dev,
  x11proto-core-dev,
  x11proto-randr-dev,

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

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

2010-11-19 Thread Cyril Brulebois 
 debian/changelog |9 +++--
 debian/control   |2 +-
 debian/copyright |   51 ++-
 3 files changed, 30 insertions(+), 32 deletions(-)

New commits:
commit 9439cc1ba3d954eab0314c62ecbebaac4dd2dd26
Author: Cyril Brulebois k...@debian.org
Date:   Fri Nov 19 22:56:46 2010 +0100

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 4566c3e..e2c3639 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-mouse (1:1.6.0-1) UNRELEASED; urgency=low
+xserver-xorg-input-mouse (1:1.6.0-1) experimental; urgency=low
 
   [ Robert Hooker ]
   * New upstream release.
@@ -8,7 +8,7 @@ xserver-xorg-input-mouse (1:1.6.0-1) UNRELEASED; urgency=low
   * Update debian/copyright from upstream COPYING.
   * Add myself to Uploaders.
 
- -- Robert Hooker sarv...@ubuntu.com  Mon, 18 Oct 2010 15:30:30 -0400
+ -- Cyril Brulebois k...@debian.org  Fri, 19 Nov 2010 22:56:42 +0100
 
 xserver-xorg-input-mouse (1:1.5.0-3) experimental; urgency=low
 

commit 01ac90805e1621b0a71747129d1549848464e95e
Author: Cyril Brulebois k...@debian.org
Date:   Fri Nov 19 22:54:58 2010 +0100

Add myself to Uploaders.

diff --git a/debian/changelog b/debian/changelog
index 5f0e3c4..4566c3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ xserver-xorg-input-mouse (1:1.6.0-1) UNRELEASED; urgency=low
 
   [ Cyril Brulebois ]
   * Update debian/copyright from upstream COPYING.
+  * Add myself to Uploaders.
 
  -- Robert Hooker sarv...@ubuntu.com  Mon, 18 Oct 2010 15:30:30 -0400
 
diff --git a/debian/control b/debian/control
index f097791..07428d5 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
+Uploaders: David Nusinow dnusi...@debian.org, Drew Parsons 
dpars...@debian.org, Cyril Brulebois k...@debian.org
 Build-Depends:
  debhelper (= 5),
  pkg-config,

commit a5de3f8d53d386bb88dbe724fae33786bd359dcc
Author: Cyril Brulebois k...@debian.org
Date:   Fri Nov 19 22:54:25 2010 +0100

Update debian/copyright from upstream COPYING.

diff --git a/debian/changelog b/debian/changelog
index cecd297..5f0e3c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 xserver-xorg-input-mouse (1:1.6.0-1) UNRELEASED; urgency=low
 
+  [ Robert Hooker ]
   * New upstream release.
   * Bump xutils-dev requirement for new util-macros.
 
+  [ Cyril Brulebois ]
+  * Update debian/copyright from upstream COPYING.
+
  -- Robert Hooker sarv...@ubuntu.com  Mon, 18 Oct 2010 15:30:30 -0400
 
 xserver-xorg-input-mouse (1:1.5.0-3) experimental; urgency=low
diff --git a/debian/copyright b/debian/copyright
index 6617170..f9f1188 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,33 @@
 This package was downloaded from
 http://xorg.freedesktop.org/releases/individual/driver/
 
+Copyright (c) 2004-2005, 2008-2010, Oracle and/or its affiliates.
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the Software),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
 Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
 Copyright 1993 by David Dawes da...@xfree86.org
 Copyright 2002 by SuSE Linux AG, Author: Egbert Eich
 Copyright 1994-2002 by The XFree86 Project, Inc.
 Copyright 2002 by Paul Elliott
-Patch for PS/2 Intellimouse by Tim Goodwin 1997-11-06.
 
 Permission to use, copy, modify, distribute, and sell this software and its
 documentation for any purpose is hereby granted without fee, provided that
@@ -112,31 +133,3 @@ 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 2004-2005 Sun Microsystems, Inc.  All rights reserved.
-

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

2010-10-18 Thread Robert Hooker 
 .gitignore|   76 +++
 COPYING   |   50 +-
 ChangeLog |  414 +++
 Makefile.am   |   16 
 README|  340 +++-
 README.sgml   | 1125 --
 configure.ac  |   59 +-
 debian/changelog  |7 
 debian/control|2 
 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 
 18 files changed, 831 insertions(+), 1756 deletions(-)

New commits:
commit 74d23755e3a8c18e68f675ce9bb16e56176278e9
Author: Robert Hooker sarv...@ubuntu.com
Date:   Mon Oct 18 15:32:44 2010 -0400

Bump xutils-dev requirement for new util-macros.

diff --git a/debian/changelog b/debian/changelog
index 71aa25d..cecd297 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-input-mouse (1:1.6.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump xutils-dev requirement for new util-macros.
 
  -- Robert Hooker sarv...@ubuntu.com  Mon, 18 Oct 2010 15:30:30 -0400
 
diff --git a/debian/control b/debian/control
index f517476..f097791 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
  dpkg-dev (= 1.14.17),
  automake,
  libtool,
- xutils-dev (= 1:7.5~1)
+ xutils-dev (= 1:7.5+4)
 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 6292397b05cee06924cfdf1e0f3dfcc88192eae7
Author: Robert Hooker sarv...@ubuntu.com
Date:   Mon Oct 18 15:31:31 2010 -0400

Update changelogs.

diff --git a/ChangeLog b/ChangeLog
index d800f1f..27c275a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,417 @@
+commit 6d6c24768b2b347436a6d35c4aaa129227c7392e
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Wed Sep 8 23:11:19 2010 -0700
+
+xf86-input-mouse 1.6.0
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 4719334800b7eb88479acdcbbc176019ba9c5bd2
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Wed Sep 8 22:58:30 2010 -0700
+
+Bring README a little closer to the current state of reality
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit cb11e9ca60e8ca2590c77f844bfd19e5278f518f
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Wed Aug 11 21:30:40 2010 -0700
+
+MouseCtrl doesn't need to save values we never use
+
+Makes it into a no-op, like evdev's PtrCtrl function, now that
+mouse acceleration is completely handled in dix.
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
+Reviewed-by: Patrick E. Kane pekane52 at gmail.com
+Reviewed-by: Simon Thum simon.t...@gmx.de
+
+commit 374725ef73ca929f8a951061528d11ee796cb069
+Author: Alan Coopersmith alan.coopersm...@oracle.com
+Date:   Wed Aug 11 20:21:33 2010 -0700
+
+Sun's copyrights belong to Oracle now
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit 5b208a2b8d1032489a02c465830150422d1123cc
+Author: Henry Zhao henry.z...@oracle.com
+Date:   Wed Aug 11 20:16:44 2010 -0700
+
+Check for NULL currentMode in vuidMouseSendScreenSize()
+
+Fixes Sun bug 6920647:
+  Core dump in resume when monitor changed in suspend
+  http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6920647
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+
+commit b9d6d0309abdec7b384cb1f0958b9bcd60364e60
+Author: Samuel Thibault samuel.thiba...@ens-lyon.org
+Date:   Wed Jul 28 21:23:25 2010 +0200
+
+Do not return the address of a local buffer
+
+Make the const buffer returned by FindDevice a static const buffer, to 
avoid
+letting be on the stack.
+
+Signed-off-by: Samuel Thibault samuel.thiba...@ens-lyon.org
+
+commit 75300d6ae5a5b2324224423c9f976cba50e47547
+Author: Patrick E. Kane pekan...@gmail.com
+Date:   Fri Jul 16 11:13:20 2010 -0500
+
+xf86-input-mouse: Update sun_mouse devPrivates code #29049
+
+Update the sun_mouse devPrivates code to conform to the new API
+(introducted by commit faeebead7bfcc78535757ca7acc1faf7554c03b7)
+that requires the PrivateKey to be registered.
+
+Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=29049
+
+Signed-off-by: Patrick E. Kane pekan...@gmail.com
+Reviewed-by: Jamey Sharp ja...@minilop.net
+Signed-off-by: Jamey Sharp ja...@minilop.net
+
+commit 112caa1724e139caeb91c792c394b21d1391b370
+Author: Fernando Carrijo fcarr...@yahoo.com.br
+Date:   Thu Jul 1 07:13:05 2010 -0300
+
+Purge macro NEED_EVENTS
+
+Signed-off-by: Fernando Carrijo fcarr...@yahoo.com.br
+Acked-by: Tiago Vignatti

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

2010-10-12 Thread Cyril Brulebois 
 debian/README.source  |2 +-
 debian/changelog  |   14 ++
 debian/control|6 ++
 debian/rules  |   10 +-
 debian/xsfbs/xsfbs.mk |   35 ++-
 5 files changed, 44 insertions(+), 23 deletions(-)

New commits:
commit b21bebc52c8e123ff28486ba6c6ca19c890fe520
Author: Cyril Brulebois k...@debian.org
Date:   Wed Oct 13 01:11:00 2010 +0200

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index c4e4929..ce8de3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-input-mouse (1:1.5.0-3) UNRELEASED; urgency=low
+xserver-xorg-input-mouse (1:1.5.0-3) experimental; urgency=low
 
   * Build against Xserver 1.9.1 rc1.
 
- -- Cyril Brulebois k...@debian.org  Wed, 13 Oct 2010 01:10:22 +0200
+ -- Cyril Brulebois k...@debian.org  Wed, 13 Oct 2010 01:10:55 +0200
 
 xserver-xorg-input-mouse (1:1.5.0-2) unstable; urgency=medium
 

commit bbc45801d4e19c60b8fd8207d95060b007b21383
Author: Cyril Brulebois k...@debian.org
Date:   Wed Oct 13 01:10:53 2010 +0200

Build against Xserver 1.9.1 rc1.

diff --git a/debian/changelog b/debian/changelog
index 8ded95a..c4e4929 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-mouse (1:1.5.0-3) UNRELEASED; urgency=low
+
+  * Build against Xserver 1.9.1 rc1.
+
+ -- Cyril Brulebois k...@debian.org  Wed, 13 Oct 2010 01:10:22 +0200
+
 xserver-xorg-input-mouse (1:1.5.0-2) unstable; urgency=medium
 
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
diff --git a/debian/control b/debian/control
index 9f84a85..f517476 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.6.901),
+ xserver-xorg-dev (= 2:1.9.0.901),
  x11proto-input-dev,
  x11proto-core-dev,
  x11proto-randr-dev,

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 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.

commit 81fc271788605b52e85c2d11635a0371fb44605e

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

2009-12-05 Thread Cyril Brulebois 
 .gitignore|6 
 ChangeLog |  198 ++
 configure.ac  |   19 --
 debian/README.source  |   73 +
 debian/changelog  |   34 
 debian/control|8 -
 debian/local/10-x11-mouse.fdi |   10 +
 debian/rules  |8 -
 debian/xsfbs/repack.sh|   32 
 debian/xsfbs/xsfbs.mk |   21 --
 debian/xsfbs/xsfbs.sh |  311 --
 man/.cvsignore|2 
 man/mousedrv.man  |3 
 src/.cvsignore|6 
 src/mouse.c   |  198 +++---
 src/mouse.h   |3 
 src/sun_mouse.c   |  104 +++---
 17 files changed, 487 insertions(+), 549 deletions(-)

New commits:
commit 11a82baf260ad5b5f2d72f02a8ac0df18995aac2
Author: Cyril Brulebois k...@debian.org
Date:   Sat Dec 5 22:37:48 2009 +0100

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 044950b..35a5d41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-xserver-xorg-input-mouse (1:1.5.0-1) UNRELEASED; urgency=low
+xserver-xorg-input-mouse (1:1.5.0-1) experimental; urgency=low
 
+  [ Timo Aaltonen ]
   * New upstream release.
   * Bump the build-dep on xutils-dev (= 1:7.5~1).
   * Build against Xserver 1.7.
 
- -- Timo Aaltonen tjaal...@ubuntu.com  Sat, 05 Dec 2009 01:49:04 +0200
+  [ Cyril Brulebois ]
+  * Upload to experimental.
+
+ -- Cyril Brulebois k...@debian.org  Sat, 05 Dec 2009 22:37:33 +0100
 
 xserver-xorg-input-mouse (1:1.4.0-4) unstable; urgency=low
 

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,

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

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

2009-01-21 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  |   11 
 debian/control|   13 
 debian/copyright  |   93 
 debian/rules  |   19 
 debian/xsfbs/xsfbs.mk |   29 
 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 
 34 files changed, 3162 insertions(+), 44773 deletions(-)

New commits:
commit 36ac28d97a14c2e60d8ca004f30538ab0d9fd696
Author: Julien Cristau jcris...@debian.org
Date:   Wed Jan 21 21:53:26 2009 +0100

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index e7e8628..7ed5b77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-mouse (1:1.4.0-1) UNRELEASED; urgency=low
+xserver-xorg-input-mouse (1:1.4.0-1) experimental; urgency=low
 
   * New upstream release.
   * Run autoreconf on build.
@@ -7,7 +7,7 @@ xserver-xorg-input-mouse (1:1.4.0-1) UNRELEASED; urgency=low
   * Add copyright notices for OS mouse code to debian/copyright (from
 upstream's COPYING).
 
- -- Julien Cristau jcris...@debian.org  Wed, 21 Jan 2009 21:26:52 +0100
+ -- Julien Cristau jcris...@debian.org  Wed, 21 Jan 2009 21:53:06 +0100
 
 xserver-xorg-input-mouse (1:1.3.0-2) experimental; urgency=low
 

commit 81a79b99f71fb6f89b7aee2be465643c8d7b7d25
Author: Julien Cristau jcris...@debian.org
Date:   Wed Jan 21 21:45:39 2009 +0100

Add copyright notices for OS mouse code to debian/copyright

(stolen from upstream's COPYING).

diff --git a/debian/changelog b/debian/changelog
index f6752eb..e7e8628 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ xserver-xorg-input-mouse (1:1.4.0-1) UNRELEASED; urgency=low
   * Run autoreconf on build.
   * Handle parallel builds.
   * Build-depend on xserver 1.6 rc1, automake, libtool and xutils-dev 1:7.4+4.
+  * Add copyright notices for OS mouse code to debian/copyright (from
+upstream's COPYING).
 
  -- Julien Cristau jcris...@debian.org  Wed, 21 Jan 2009 21:26:52 +0100
 
diff --git a/debian/copyright b/debian/copyright
index eeca443..6617170 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -47,3 +47,96 @@ 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 (c) 1999-2003 by The XFree86 Project, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the Software),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the copyright holder(s)
+and author(s) shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Software without prior written
+authorization from the copyright holder(s) and author(s).
+
+Copyright 1997,1998 by UCHIYAMA Yasushi
+
+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

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

2008-07-13 Thread Julien Cristau 
 debian/changelog |   15 +
 debian/control   |2 
 debian/rules |2 
 debian/xsfbs/xsfbs-autoreconf.mk |  150 ---
 debian/xsfbs/xsfbs.mk|   24 --
 debian/xsfbs/xsfbs.sh|  387 +--
 6 files changed, 229 insertions(+), 351 deletions(-)

New commits:
commit 252e6b1d587f7169e77425857cf6ddf2b62ffb46
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Mon Jul 14 01:56:39 2008 +0200

Build against xserver 1.5 rc5.

diff --git a/debian/changelog b/debian/changelog
index 63541b4..d729acf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-mouse (1:1.3.0-2) experimental; urgency=low
+
+  * Build against xserver 1.5 rc5.
+
+ -- Julien Cristau [EMAIL PROTECTED]  Mon, 14 Jul 2008 01:56:30 +0200
+
 xserver-xorg-input-mouse (1:1.3.0-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index e91e6c3..9accfa5 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, dpkg-dev (= 
1.14.17)
+Build-Depends: debhelper (= 5), pkg-config, xserver-xorg-dev (= 
2:1.4.99.905), 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: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-mouse.git

commit 4c2fb5aa80a15b5a9a9b51b03c7dc30496a22561
Author: Brice Goglin [EMAIL PROTECTED]
Date:   Sat May 31 13:23:24 2008 +0200

Update xsfbs/quilt patching rules to be compatible with the
3.0 (quilt) source package.

Thanks to Raphael Hertzog.
See http://lists.debian.org/debian-x/2008/05/msg01250.html for details.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index c11923f..b871b3b 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -21,10 +21,8 @@
 # Pass $(DH_OPTIONS) into the environment for debhelper's benefit.
 export DH_OPTIONS
 
-# force quilt to not use ~/.quiltrc
-QUILT = quilt --quiltrc /dev/null
-# force QUILT_PATCHES to the default in case it is exported in the environment
-QUILT_PATCHES = patches/
+# force quilt to not use ~/.quiltrc and to use debian/patches
+QUILT = QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null
 
 # Set up parameters for the upstream build environment.
 
@@ -121,19 +119,11 @@ $(STAMP_DIR)/stampdir:
 # Set up the package build directory as quilt expects to find it.
 .PHONY: prepare
 stampdir_targets+=prepare
-prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare $(STAMP_DIR)/patches 
$(STAMP_DIR)/log
+prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare $(STAMP_DIR)/log
 $(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
-   if [ ! -e $(STAMP_DIR)/patches ]; then \
-   mkdir $(STAMP_DIR)/patches; \
-   ln -s $(STAMP_DIR)/patches .pc; \
-   echo 2 $(STAMP_DIR)/patches/.version; \
-   fi; \
if [ ! -e $(STAMP_DIR)/log ]; then \
mkdir $(STAMP_DIR)/log; \
fi; \
-   if [ -e debian/patches ]  [ ! -e patches ]; then \
-   ln -s debian/patches patches; \
-   fi; \
$@
 
 # Apply all patches to the upstream source.
@@ -162,10 +152,10 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
 
 # Revert all patches to the upstream source.
 .PHONY: unpatch
-unpatch:
+unpatch: $(STAMP_DIR)/prepare
rm -f $(STAMP_DIR)/patch
@echo -n Unapplying patches...; \
-   if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
+   if $(QUILT) applied /dev/null 2/dev/null; then \
  if $(QUILT) pop -a -v $(STAMP_DIR)/log/unpatch 21; then \
cat $(STAMP_DIR)/log/unpatch; \
echo successful.; \
@@ -192,7 +182,7 @@ cleanscripts:
 .PHONY: xsfclean
 xsfclean: cleanscripts unpatch
dh_testdir
-   rm -rf .pc patches
+   rm -rf .pc
rm -rf $(STAMP_DIR) $(SOURCE_DIR)
rm -rf imports
dh_clean debian/shlibs.local \

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

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

2008-03-21 Thread Julien Cristau 
 COPYING   |   49 ++-
 ChangeLog |   52 +++
 Makefile.in   |   29 +
 aclocal.m4|  265 +++--
 config.guess  |   32 +-
 config.sub|   44 ++
 configure |  776 +-
 configure.ac  |2 
 debian/changelog  |   38 ++
 debian/control|8 
 debian/copyright  |   21 +
 debian/patches/series |1 
 debian/xsfbs/xsfbs.mk |  105 +-
 debian/xsfbs/xsfbs.sh |7 
 depcomp   |   33 +-
 install-sh|  228 +++---
 ltmain.sh |   58 ++-
 man/Makefile.am   |1 
 man/Makefile.in   |7 
 man/mousedrv.man  |3 
 src/Makefile.in   |   29 -
 src/mouse.c   |   16 -
 22 files changed, 1212 insertions(+), 592 deletions(-)

New commits:
commit a2a25b3e8102e0885949b4e1947267737d9ada2b
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Mar 21 20:42:47 2008 +0100

Build against xserver 1.5 rc1, and use Vcs-* without the XS- prefix

diff --git a/debian/changelog b/debian/changelog
index 0c04769..e0fac36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ 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.
+  * Build against xserver 1.5 rc1.
+  * Drop the XS- prefix from Vcs-* control fields.
 
  -- Julien Cristau [EMAIL PROTECTED]  Fri, 21 Mar 2008 20:39:16 +0100
 
diff --git a/debian/control b/debian/control
index 6036ca5..ef92e44 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,10 @@ 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.99.901), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev, quilt
 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
+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
 
 Package: xserver-xorg-input-mouse
 Architecture: any

commit fc9a7d4961109d91cb1a5cc9f51bb882bb8d0b85
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Fri Mar 21 20:41:39 2008 +0100

autoreconf

diff --git a/Makefile.in b/Makefile.in
index ae1bc4e..2067b6b 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.1 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, 2007, 2008  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 \
$(top_srcdir)/configure COPYING ChangeLog config.guess \
config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
-subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
@@ -73,10 +69,13 @@ SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive

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

2007-09-14 Thread Brice Goglin 
 debian/changelog |6 ++
 debian/copyright |3 +++
 2 files changed, 9 insertions(+)

New commits:
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


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

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

2007-09-10 Thread Julien Cristau 
 debian/changelog |6 ++
 debian/control   |2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
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


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

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

2007-08-18 Thread Julien Cristau 
 .cvsignore|   19 
 .gitignore|   20 
 ChangeLog |  587 +
 Makefile.in   |  129 ++---
 README|   55 +-
 aclocal.m4|  698 -
 config.guess  |  147 --
 config.h.in   |9 
 config.sub|  120 +++--
 configure | 1170 +++---
 configure.ac  |2 
 debian/changelog  |   29 +
 debian/control|9 
 debian/patches/series |1 
 debian/rules  |2 
 depcomp   |   64 ++
 install-sh|  348 +++---
 ltmain.sh |  974 ++---
 man/Makefile.in   |   96 ++--
 man/mousedrv.man  |   11 
 missing   |   61 +-
 mkinstalldirs |   92 +++
 src/Makefile.in   |  121 ++---
 src/mouse.c   |   45 +
 src/mousePriv.h   |2 
 25 files changed, 3369 insertions(+), 1442 deletions(-)

New commits:
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), 
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
@@ -11,7 +11,7 @@ XS-Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-mous
 Package: xserver-xorg-input-mouse
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
-Provides: xserver-xorg-input
+Provides: ${xinpdriver:Provides}
 Replaces: xserver-xorg ( 6.8.2-35)
 Description: X.Org X server -- mouse input driver
  This package provides the driver for mouse input devices.

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
+

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

2007-04-16 Thread Julien Cristau 
 debian/changelog  |6 --
 debian/control|7 +++
 debian/xsfbs/xsfbs.mk |   19 ---
 3 files changed, 19 insertions(+), 13 deletions(-)

New commits:
commit b9b6aec16bb91fc523c3268a720907171bd6195f
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Mon Apr 16 19:28:14 2007 +0200

Drop obsolete CVS info from the description, add XS-Vcs-*.

diff --git a/debian/changelog b/debian/changelog
index 290d3e3..77eef20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-mouse (1:1.1.2-1) UNRELEASED; urgency=low
+xserver-xorg-input-mouse (1:1.1.2-1) experimental; urgency=low
 
   * New upstream release (X11R7.2).
   * Add link to xserver-xorg-core bug script, so that bugreports contain
@@ -7,8 +7,9 @@ xserver-xorg-input-mouse (1:1.1.2-1) UNRELEASED; urgency=low
 versions don't have the bug script.
   * Generate the dependency on xserver-xorg-core automatically.
   * Remove Fabio from Uploaders, with his permission.
+  * Drop obsolete CVS info from the description, add XS-Vcs-*.
 
- -- Julien Cristau [EMAIL PROTECTED]  Mon, 16 Apr 2007 19:22:03 +0200
+ -- Julien Cristau [EMAIL PROTECTED]  Mon, 16 Apr 2007 19:27:46 +0200
 
 xserver-xorg-input-mouse (1:1.1.1-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index e6ccd4a..590015f 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,8 @@ Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: David Nusinow [EMAIL PROTECTED], Branden Robinson [EMAIL 
PROTECTED], Drew Parsons [EMAIL PROTECTED]
 Build-Depends: debhelper (= 5), pkg-config, xserver-xorg-dev (= 2:1.2.0-3), 
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
 
 Package: xserver-xorg-input-mouse
 Architecture: any
@@ -17,6 +19,3 @@ Description: X.Org X server -- mouse input driver
  More information about X.Org can be found at:
  URL:http://xorg.freedesktop.org
  URL:http://lists.freedesktop.org/mailman/listinfo/xorg
- .
- This module can be found as the module 'driver/xf86-input-mouse' at
- :pserver:[EMAIL PROTECTED]:/cvs/xorg

commit 8e8f9e0dd038c9876425dd4a03e0a6a7dfcfcd49
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Mon Apr 16 19:22:29 2007 +0200

Remove Fabio from Uploaders, with his permission.

diff --git a/debian/changelog b/debian/changelog
index 5acc219..290d3e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ xserver-xorg-input-mouse (1:1.1.2-1) UNRELEASED; urgency=low
   * Bump dependency on xserver-xorg-core to = 2:1.1.1-11, as previous
 versions don't have the bug script.
   * Generate the dependency on xserver-xorg-core automatically.
+  * Remove Fabio from Uploaders, with his permission.
 
- -- Julien Cristau [EMAIL PROTECTED]  Sun, 18 Feb 2007 19:14:59 +0100
+ -- Julien Cristau [EMAIL PROTECTED]  Mon, 16 Apr 2007 19:22:03 +0200
 
 xserver-xorg-input-mouse (1:1.1.1-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 32c6783..e6ccd4a 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], Fabio M. Di Nitto [EMAIL PROTECTED], Drew Parsons [EMAIL 
PROTECTED]
+Uploaders: David Nusinow [EMAIL PROTECTED], Branden Robinson [EMAIL 
PROTECTED], Drew Parsons [EMAIL PROTECTED]
 Build-Depends: debhelper (= 5), pkg-config, xserver-xorg-dev (= 2:1.2.0-3), 
x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev, quilt
 Standards-Version: 3.7.2
 

commit 271778bd6338575afa3e4ae7f614f38cdff8e2fb
Author: Branden Robinson [EMAIL PROTECTED](none)
Date:   Thu Apr 12 23:18:32 2007 -0400

Test for existence of debian/patches directory before creating a symlink to 
it.

This prevents packages that apply no patches from ending up with a broken
symlink in them.

Remove SVN keyword.

Update copyright notice.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index d88c6db..63dde45 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -1,11 +1,10 @@
 #!/usr/bin/make -f
-# $Id$
 
-# Debian rules file for xorg-x11 source package
+# Debian X Strike Force Build System (XSFBS): Make portion
 
 # Copyright 1996 Stephen Early
 # Copyright 1997 Mark Eichin
-# Copyright 1998-2005 Branden Robinson
+# Copyright 1998-2005, 2007 Branden Robinson
 # Copyright 2005 David Nusinow
 #
 # Licensed under the GNU General Public License, version 2.  See the file
@@ -127,7 +126,7 @@ $(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
if [ ! -e $(STAMP_DIR)/log ]; then \
mkdir $(STAMP_DIR)/log; \
fi; \
-   if [ ! -e patches ]; then \
+   if [ -e

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

2007-02-18 Thread Julien Cristau 
New branch 'debian-experimental' available with the following commits:
commit c921bce3571d185b800b697c05ccdf2d70a8f989
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sun Feb 18 19:15:24 2007 +0100

Generate the dependency on xserver-xorg-core automatically.

commit ed802a84d84a73a1b74cb61ef49a0617ee7e68a9
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sun Feb 18 19:13:46 2007 +0100

New upstream release.

We don't need to install the manpage with a 4x extension, since it has 
been
renamed upstream.

commit 96b4f1a6fba16f2edbf9d7a74048a6d712c5874f
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sun Feb 18 19:12:47 2007 +0100

autoreconf

commit bd8b1e351642ce3cff61fd3db8f79e0ac4cda6b5
Merge: aead78c6e35ab8175fe58a280ea5a0e99728fbe5 
167dbbc2af6cad5d3b320e4e384bd78dd3450a5c
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sun Feb 18 19:07:21 2007 +0100

Merge tag 'xf86-input-mouse-1.1.2' into debian-experimental

commit aead78c6e35ab8175fe58a280ea5a0e99728fbe5
Merge: 6afee683ac39486bdf2df64eaf6fb6b20801adad 
6dbc6ad05d147831a62b161e23f5da29101f2cfa
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sun Feb 18 19:05:56 2007 +0100

Merge tag 'mouse-1_1_1' into debian-experimental

Conflicts:

man/Makefile.am
src/mouse.c

commit 6afee683ac39486bdf2df64eaf6fb6b20801adad
Merge: b436bb968ee9b8dc32c590ee7adca2170ed692bf 
9ed8b0c26438b90f187ef7c165d5a76cf8f340eb
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sun Feb 18 19:03:36 2007 +0100

Merge branch 'xsfbs' into debian-experimental

commit 9ed8b0c26438b90f187ef7c165d5a76cf8f340eb
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sat Feb 17 16:01:41 2007 +0100

Add new serverabi rule to generate drivers dependency on the server.

commit 502f9412dcaa6abd23b94372d86824c895cea3b8
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sun Feb 4 20:43:28 2007 -0500

Move the files so they'll be put in debian/xsfbs automatically when pulled
in to our git repos

commit d5595eaaa4dc5d692ead5d2889513d325142e4db
Author: David Nusinow [EMAIL PROTECTED]
Date:   Tue Aug 22 03:04:13 2006 +

Pull patches from ubuntu for ARCHITECTURE, LAPTOP, RECONFIGURE, FIRSTINST, 
and UPGRADE variables

commit 34afaedccc1aeb05d2c6a3869f51e78b2dd0d210
Author: David Nusinow [EMAIL PROTECTED]
Date:   Fri Jun 9 02:34:26 2006 +

Fix for bug #371152. Thanks Joey Hess.

commit f64226c1d9c22e2f6d908bf46e059561748d4418
Author: Branden Robinson [EMAIL PROTECTED]
Date:   Tue Jun 6 18:14:45 2006 +

Add high-level documentation to XSFBS shell library, intended to reduce
user confusion when reading X package maintainer scripts outside the source
tree.

Update Vim modeline.

commit 64309731c5939687e4492f0d960802d32ec1
Author: Branden Robinson [EMAIL PROTECTED]
Date:   Tue Jun 6 18:05:40 2006 +

Note probable out-of-dateness of maplink() function body.

commit b07ee1042902cef9587a76dcbf1df1ee0bde0770
Author: Branden Robinson [EMAIL PROTECTED]
Date:   Tue Jun 6 18:02:50 2006 +

Set svn:keywords property to Id (keyword already present).

commit 5a669d90089e7430c41f3e0d72e672aa2be6cbd8
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sun Apr 16 00:19:59 2006 +

Fix the last commit and fix spelling error. Thanks Brice Goglin for the 
spelling catch.

commit 7770385a76ddfb208fc6b0f5e8b42b42d6b5a5a0
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sat Apr 15 23:53:37 2006 +

Make us error out if we call patch and don't have quilt installed

commit 43c2db2476d959a5837a50b3ee329afc1d1b1f7d
Author: David Nusinow [EMAIL PROTECTED]
Date:   Wed Apr 12 01:17:17 2006 +

Move xsfbs back to its rightful place


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