diff -Nru v4l-utils-1.10.0+r3474/debian/bzr-builder.manifest v4l-utils-1.10.0+r3476/debian/bzr-builder.manifest --- v4l-utils-1.10.0+r3474/debian/bzr-builder.manifest 2017-09-29 10:31:36.000000000 +0000 +++ v4l-utils-1.10.0+r3476/debian/bzr-builder.manifest 2017-10-07 18:16:37.000000000 +0000 @@ -1,3 +1,3 @@ -# bzr-builder format 0.3 deb-version {debupstream}+r3474-71 -lp:libv4l revid:git-v1:997ed5a4abba619282d9ffb8bb173e8589176d73 +# bzr-builder format 0.3 deb-version {debupstream}+r3476-71 +lp:libv4l revid:git-v1:01c04f7c8ad1a91af33e20621eba9200f447737e nest packaging lp:~libv4l/+junk/packaging debian revid:gjasny@googlemail.com-20160320110140-z8p5e9zmhomgtciv diff -Nru v4l-utils-1.10.0+r3474/debian/changelog v4l-utils-1.10.0+r3476/debian/changelog --- v4l-utils-1.10.0+r3474/debian/changelog 2017-09-29 10:31:36.000000000 +0000 +++ v4l-utils-1.10.0+r3476/debian/changelog 2017-10-07 18:16:37.000000000 +0000 @@ -1,8 +1,8 @@ -v4l-utils (1.10.0+r3474-71~ubuntu15.04.1) vivid; urgency=low +v4l-utils (1.10.0+r3476-71~ubuntu15.04.1) vivid; urgency=low * Auto build. - -- Launchpad Package Builder Fri, 29 Sep 2017 10:31:36 +0000 + -- Launchpad Package Builder Sat, 07 Oct 2017 18:16:37 +0000 v4l-utils (1.10.0-2) unstable; urgency=low diff -Nru v4l-utils-1.10.0+r3474/.pc/.quilt_patches v4l-utils-1.10.0+r3476/.pc/.quilt_patches --- v4l-utils-1.10.0+r3474/.pc/.quilt_patches 2017-09-29 10:31:36.000000000 +0000 +++ v4l-utils-1.10.0+r3476/.pc/.quilt_patches 2017-10-07 18:16:37.000000000 +0000 @@ -1 +1 @@ -/home/buildd/build-RECIPEBRANCHBUILD-1457840/chroot-autobuild/home/buildd/work/tree/v4l-utils-1.10.0+r3474/debian/patches +/home/buildd/build-RECIPEBRANCHBUILD-1462542/chroot-autobuild/home/buildd/work/tree/v4l-utils-1.10.0+r3476/debian/patches diff -Nru v4l-utils-1.10.0+r3474/.pc/.quilt_series v4l-utils-1.10.0+r3476/.pc/.quilt_series --- v4l-utils-1.10.0+r3474/.pc/.quilt_series 2017-09-29 10:31:36.000000000 +0000 +++ v4l-utils-1.10.0+r3476/.pc/.quilt_series 2017-10-07 18:16:37.000000000 +0000 @@ -1 +1 @@ -/home/buildd/build-RECIPEBRANCHBUILD-1457840/chroot-autobuild/home/buildd/work/tree/v4l-utils-1.10.0+r3474/debian/patches/series +/home/buildd/build-RECIPEBRANCHBUILD-1462542/chroot-autobuild/home/buildd/work/tree/v4l-utils-1.10.0+r3476/debian/patches/series diff -Nru v4l-utils-1.10.0+r3474/utils/keytable/keytable.c v4l-utils-1.10.0+r3476/utils/keytable/keytable.c --- v4l-utils-1.10.0+r3474/utils/keytable/keytable.c 2017-09-29 10:31:34.000000000 +0000 +++ v4l-utils-1.10.0+r3476/utils/keytable/keytable.c 2017-10-07 18:16:36.000000000 +0000 @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -271,6 +272,7 @@ char *sysfs_name; /* Device sysfs node name */ char *input_name; /* Input device file name */ char *drv_name; /* Kernel driver that implements it */ + char *dev_name; /* Kernel device name */ char *keytable_name; /* Keycode table name */ enum sysfs_ver version; /* sysfs version */ @@ -990,10 +992,16 @@ { FILE *fp; char name[4096]; + struct stat st; strcpy(name, rc_dev->sysfs_name); strcat(name, "/protocols"); + if (!stat(name, &st) && !(st.st_mode & 0222)) { + fprintf(stderr, _("Protocols for device can not be changed\n")); + return 0; + } + fp = fopen(name, "w"); if (!fp) { perror(name); @@ -1076,6 +1084,10 @@ rc_dev->drv_name = malloc(strlen(uevent->value) + 1); strcpy(rc_dev->drv_name, uevent->value); } + if (!strcmp(uevent->key, "DEV_NAME")) { + rc_dev->dev_name = malloc(strlen(uevent->value) + 1); + strcpy(rc_dev->dev_name, uevent->value); + } if (!strcmp(uevent->key, "NAME")) { rc_dev->keytable_name = malloc(strlen(uevent->value) + 1); strcpy(rc_dev->keytable_name, uevent->value); @@ -1416,9 +1428,8 @@ get_rate(fd, &delay, &period); } -static void device_info(int fd, char *prepend) +static void device_name(int fd, char *prepend) { - struct input_id id; char buf[32]; int rc; @@ -1427,6 +1438,12 @@ fprintf(stderr,_("%sName: %.*s\n"),prepend, rc, buf); else perror ("EVIOCGNAME"); +} + +static void device_info(int fd, char *prepend) +{ + struct input_id id; + int rc; rc = ioctl(fd, EVIOCGID, &id); if (rc >= 0) @@ -1452,7 +1469,10 @@ fprintf(stderr, _("Found %s (%s) with:\n"), rc_dev->sysfs_name, rc_dev->input_name); - fprintf(stderr, _("\tDriver %s, table %s\n"), + if (rc_dev->dev_name) + fprintf(stderr, _("\tName: %s\n"), + rc_dev->dev_name); + fprintf(stderr, _("\tDriver: %s, table: %s\n"), rc_dev->drv_name, rc_dev->keytable_name); fprintf(stderr, _("\tSupported protocols: ")); @@ -1461,6 +1481,8 @@ display_proto(rc_dev); fd = open(rc_dev->input_name, O_RDONLY); if (fd > 0) { + if (!rc_dev->dev_name) + device_name(fd, "\t"); device_info(fd, "\t"); show_evdev_attribs(fd); close(fd); @@ -1495,6 +1517,7 @@ perror(_("Can't open device")); return -1; } + device_name(fd, ""); device_info(fd, ""); close(fd); return 0;