Control: tags 916610 + pending
Dear maintainer, I've prepared an NMU for spacenavd (versioned as 0.6-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. diff -Nru spacenavd-0.6/debian/changelog spacenavd-0.6/debian/changelog --- spacenavd-0.6/debian/changelog 2015-05-18 10:04:05.000000000 +0000 +++ spacenavd-0.6/debian/changelog 2019-06-01 11:13:33.000000000 +0000 @@ -1,3 +1,11 @@ +spacenavd (0.6-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix "conflict with /dev/input/js0" (Closes: #916610) + - Fixed upstream in 34ddda1246ad07e8ff2e6606224e710852e3e3d8 + + -- Jakob Haufe <su...@sur5r.net> Sat, 01 Jun 2019 11:13:33 +0000 + spacenavd (0.6-1) unstable; urgency=medium * Imported Upstream version 0.6 diff -Nru spacenavd-0.6/debian/patches/series spacenavd-0.6/debian/patches/series --- spacenavd-0.6/debian/patches/series 2015-05-18 10:04:05.000000000 +0000 +++ spacenavd-0.6/debian/patches/series 2019-06-01 11:04:55.000000000 +0000 @@ -1,2 +1,3 @@ add-buildflags-to-makefile.patch run.patch +skip-joystick-devices.patch diff -Nru spacenavd-0.6/debian/patches/skip-joystick-devices.patch spacenavd-0.6/debian/patches/skip-joystick-devices.patch --- spacenavd-0.6/debian/patches/skip-joystick-devices.patch 1970-01-01 00:00:00.000000000 +0000 +++ spacenavd-0.6/debian/patches/skip-joystick-devices.patch 2019-06-01 11:13:33.000000000 +0000 @@ -0,0 +1,37 @@ +Description: Skip joystick device files +Author: John Tsiombikas <nucl...@member.fsf.org> +Origin: upstream, https://github.com/FreeSpacenav/spacenavd/commit/34ddda1246ad07e8ff2e6606224e710852e3e3d8 +Bug-Debian: https://bugs.debian.org/916610 +--- +commit 34ddda1246ad07e8ff2e6606224e710852e3e3d8 +Author: John Tsiombikas <nucl...@member.fsf.org> +Date: Sat Oct 11 05:07:58 2014 +0000 + + added code to skip joystick device files while parsing /proc/bus/input/devices + + + git-svn-id: svn+ssh://svn.code.sf.net/p/spacenav/code/trunk/spacenavd@183 ef983eb1-d774-4af8-acfd-baaf7b16a646 + +diff --git a/src/dev_usb_linux.c b/src/dev_usb_linux.c +index 30db579..5f4baad 100644 +--- a/src/dev_usb_linux.c ++++ b/src/dev_usb_linux.c +@@ -342,11 +342,16 @@ struct usb_device_info *find_usb_devices(int (*match)(const struct usb_device_in + case 'H': + keyptr = strstr(cur_line, "Handlers="); + if(keyptr) { +- char *devfile, *valptr = keyptr + strlen("Handlers="); ++ char *devfile = 0, *valptr = keyptr + strlen("Handlers="); + static const char *prefix = "/dev/input/"; + + int idx = 0; +- while((devfile = strtok(idx ? 0 : valptr, " \t\v\n\r"))) { ++ while((devfile = strtok(devfile ? 0 : valptr, " \t\v\n\r"))) { ++ if(strstr(devfile, "js") == devfile) { ++ /* ignore joystick device files, can't use them */ ++ continue; ++ } ++ + if(!(devinfo.devfiles[idx] = malloc(strlen(devfile) + strlen(prefix) + 1))) { + perror("failed to allocate device filename buffer"); + continue;
