xserver-xorg-input-mouse: Changes to 'debian-unstable'
debian/changelog | 7 +++++++
debian/patches/bsd-array-bounds.diff | 7 +++++--
2 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit fc16ff32653cbc131f958de67ce5fe661823dcbb
Author: Cyril Brulebois <kibi@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 <kibi@debian.org> Mon, 16 Jul 2012 00:31:00 +0200
+ -- Cyril Brulebois <kibi@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 <kibi@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 <kibi@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.Salinger@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;
Reply to: