debian/changelog | 11 +++++++++-- debian/patches/0001-Fix-includes-for-kfreebsd.diff | 10 ++++++++++ debian/patches/series | 1 + 3 files changed, 20 insertions(+), 2 deletions(-)
New commits: commit 038bb3fc13593e305e2038d06462d1dd3593931f Author: Cyril Brulebois <[email protected]> Date: Sun Feb 19 16:05:03 2012 +0000 Upload to unstable with high urgency. diff --git a/debian/changelog b/debian/changelog index 5fb2ce2..b56e32a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-input-joystick (1:1.6.0-2) UNRELEASED; urgency=low +xserver-xorg-input-joystick (1:1.6.0-2) unstable; urgency=high [ Julien Cristau ] * Use kfreebsd-any wildcard for libusbhid build-dep (closes: #634707). @@ -7,8 +7,9 @@ xserver-xorg-input-joystick (1:1.6.0-2) UNRELEASED; urgency=low * Add patch to deal with the uncoordinated freebsd-libs transition, thanks to Steven Chamberlain (Closes: #660395): - 0001-Fix-includes-for-kfreebsd.diff + * Set urgency to “high” for the RC bug fix. - -- Julien Cristau <[email protected]> Wed, 20 Jul 2011 20:51:38 +0200 + -- Cyril Brulebois <[email protected]> Sun, 19 Feb 2012 16:04:42 +0000 xserver-xorg-input-joystick (1:1.6.0-1) unstable; urgency=low commit 69f637fbdbe36ef25059f0510cfb77e29729dc61 Author: Cyril Brulebois <[email protected]> Date: Sun Feb 19 16:04:29 2012 +0000 Unbreak the freebsd-libs mess (Closes: #660395). diff --git a/debian/changelog b/debian/changelog index d10e79f..5fb2ce2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,13 @@ xserver-xorg-input-joystick (1:1.6.0-2) UNRELEASED; urgency=low + [ Julien Cristau ] * Use kfreebsd-any wildcard for libusbhid build-dep (closes: #634707). + [ Cyril Brulebois ] + * Add patch to deal with the uncoordinated freebsd-libs transition, + thanks to Steven Chamberlain (Closes: #660395): + - 0001-Fix-includes-for-kfreebsd.diff + -- Julien Cristau <[email protected]> Wed, 20 Jul 2011 20:51:38 +0200 xserver-xorg-input-joystick (1:1.6.0-1) unstable; urgency=low diff --git a/debian/patches/0001-Fix-includes-for-kfreebsd.diff b/debian/patches/0001-Fix-includes-for-kfreebsd.diff new file mode 100644 index 0000000..0c731b3 --- /dev/null +++ b/debian/patches/0001-Fix-includes-for-kfreebsd.diff @@ -0,0 +1,10 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -98,6 +98,7 @@ + AC_CHECK_HEADERS([dev/usb/usb.h]) + AC_CHECK_HEADERS([usbhid.h dev/usb/usbhid.h],, [bsd_backend=no], + [[#if HAVE_DEV_USB_USB_H ++#include <sys/types.h> + #include <dev/usb/usb.h> + #endif + ]]) diff --git a/debian/patches/series b/debian/patches/series index e69de29..f047877 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-Fix-includes-for-kfreebsd.diff -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
