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 <[email protected]> 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 <[email protected]> Wed, 10 Jul 2013 22:24:42 +0200 + -- Julien Cristau <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 ae0da31a31de7c3c7310e48648a7f1b6c17cad04 Author: Julien Cristau <[email protected]> Date: Thu Sep 5 21:29:19 2013 +0200 Revert "Build against Xserver 1.14." Let's allow 1.12 in sid for now. This reverts commit df5e971676a3644997ada3ac96e8b07b1656cfcb. diff --git a/debian/changelog b/debian/changelog index 760f5f9..de32faf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,6 @@ 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 <[email protected]> Wed, 10 Jul 2013 22:24:42 +0200 diff --git a/debian/control b/debian/control index 519f292..9d12366 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 8), dh-autoreconf, pkg-config, - xserver-xorg-dev (>= 2:1.14), + xserver-xorg-dev (>= 2:1.9.99.902), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev, -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
