usbutils/usbutils-003-hwdata.patch

--- usbutils-003/Makefile.am	2011-03-22 00:23:33.000000000 +0100
+++ usbutils-003_/Makefile.am	2011-06-16 15:41:20.927882420 +0200
@@ -4,15 +4,9 @@
 AM_LDFLAGS = \
 	-Wl,--as-needed
 
-data_DATA = \
-	usb.ids
-
 bin_PROGRAMS = \
 	lsusb
 
-sbin_SCRIPTS = \
-	update-usbids.sh
-
 bin_SCRIPTS = \
 	usb-devices \
 	lsusb.py
@@ -27,37 +21,22 @@
 
 lsusb_CPPFLAGS = \
 	$(AM_CPPFLAGS) $(LIBUSB_CFLAGS) \
-	-DDATADIR=\"$(datadir)\"
+	-DDATADIR=\"$(datadir)/hwdata\"
 
 lsusb_LDADD = \
 	$(LIBUSB_LIBS)
 
-if HAVE_ZLIB
-data_DATA += usb.ids.gz
-lsusb_CPPFLAGS += -DHAVE_LIBZ
-lsusb_LDADD += -lz
-endif
-
 man_MANS = \
 	lsusb.8	\
 	usb-devices.1
 
 EXTRA_DIST = \
-	usb.ids \
-	update-usbids.sh.in \
 	lsusb.8.in \
 	usb-devices.1.in \
 	usb-devices \
 	lsusb.py \
 	usbutils.pc.in
 
-usb.ids.gz: $(srcdir)/usb.ids
-	gzip -c -9 $< > $@
-
-update-usbids.sh: $(srcdir)/update-usbids.sh.in
-	sed 's|@usbids@|$(datadir)/usb.ids|g' $< >$@
-	chmod 755 $@
-
 lsusb.8: $(srcdir)/lsusb.8.in
 	sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@
 
@@ -71,10 +50,8 @@
 	sed 's|@usbids@|$(datadir)/usb.ids|g;s|@VERSION[@]|$(VERSION)|g' $< >$@
 
 DISTCLEANFILES = \
-	usb.ids.gz \
 	lsusb.8 \
 	usb-devices.1 \
-	update-usbids.sh \
 	usbutils.pc
 
 distclean-local:
--- usbutils-003/lsusb.py	2010-12-16 01:07:09.000000000 +0100
+++ usbutils-003_/lsusb.py	2011-08-11 09:57:57.079327430 +0200
@@ -16,7 +16,7 @@
 warnsort = False
 
 prefix = "/sys/bus/usb/devices/"
-usbids = "/usr/share/usb.ids"
+usbids = "/usr/share/hwdata/usb.ids"
 
 esc = chr(27)
 norm = esc + "[0;0m"
update to usbutils-003 2011-06-16 13:44:45 +00:00			`--- usbutils-003/Makefile.am 2011-03-22 00:23:33.000000000 +0100`
			`+++ usbutils-003_/Makefile.am 2011-06-16 15:41:20.927882420 +0200`
			`@@ -4,15 +4,9 @@`
New version - monit fixes in spec file 2009-09-16 11:44:30 +00:00			`AM_LDFLAGS = \`
			`-Wl,--as-needed`
update to usbutils-003 2011-06-16 13:44:45 +00:00
New version - monit fixes in spec file 2009-09-16 11:44:30 +00:00			`-data_DATA = \`
			`- usb.ids`
			`-`
update to new upstream 001 - updated usbhid-dump subproject - usbutils: Support UVC frame-based descriptors - usbutils: Support UVC MPEG2-TS format descriptor - lsusb: Fix getting BOS and DEVQUAL descriptors - lsusb: Dump the Pipe Usage desciptor - lsusb: Fix bMaxBurst reporting - lsusb: install into /usr/bin - usbmisc: pull in unistd.h for readlink() - lsusb: pull in stdlib.h for exit() - lsusb: constify! - usbutils: convert to libusb-1.0 - Update usbhid-dump to release 1.2 - usbutils: Fix compile error on Ubuntu 9.04 - usbutils: Make lsusb -t show USB 3.0 devices 2011-01-06 11:47:24 +00:00			`bin_PROGRAMS = \`
New version - monit fixes in spec file 2009-09-16 11:44:30 +00:00			`lsusb`
update to usbutils-003 2011-06-16 13:44:45 +00:00
New version - monit fixes in spec file 2009-09-16 11:44:30 +00:00			`-sbin_SCRIPTS = \`
			`- update-usbids.sh`
			`-`
			`bin_SCRIPTS = \`
update to usbutils-002 2011-04-26 16:53:37 +00:00			`usb-devices \`
			`lsusb.py`
update to usbutils-003 2011-06-16 13:44:45 +00:00			`@@ -27,37 +21,22 @@`

New version - monit fixes in spec file 2009-09-16 11:44:30 +00:00			`lsusb_CPPFLAGS = \`
new version - 0.90 2010-08-30 11:50:38 +00:00			`$(AM_CPPFLAGS) $(LIBUSB_CFLAGS) \`
New version - monit fixes in spec file 2009-09-16 11:44:30 +00:00			`- -DDATADIR=\"$(datadir)\"`
			`+ -DDATADIR=\"$(datadir)/hwdata\"`
update to usbutils-003 2011-06-16 13:44:45 +00:00
New version - monit fixes in spec file 2009-09-16 11:44:30 +00:00			`lsusb_LDADD = \`
			`$(LIBUSB_LIBS)`
update to usbutils-003 2011-06-16 13:44:45 +00:00
			`-if HAVE_ZLIB`
			`-data_DATA += usb.ids.gz`
			`-lsusb_CPPFLAGS += -DHAVE_LIBZ`
			`-lsusb_LDADD += -lz`
			`-endif`
			`-`
			`man_MANS = \`
			`lsusb.8 \`
New version - monit fixes in spec file 2009-09-16 11:44:30 +00:00			`usb-devices.1`
update to usbutils-003 2011-06-16 13:44:45 +00:00
New version - monit fixes in spec file 2009-09-16 11:44:30 +00:00			`EXTRA_DIST = \`
			`- usb.ids \`
			`- update-usbids.sh.in \`
			`lsusb.8.in \`
			`usb-devices.1.in \`
			`usb-devices \`
update to usbutils-002 2011-04-26 16:53:37 +00:00			`lsusb.py \`
New version - monit fixes in spec file 2009-09-16 11:44:30 +00:00			`usbutils.pc.in`
update to usbutils-003 2011-06-16 13:44:45 +00:00
New version - monit fixes in spec file 2009-09-16 11:44:30 +00:00			`-usb.ids.gz: $(srcdir)/usb.ids`
			`- gzip -c -9 $< > $@`
			`-`
			`-update-usbids.sh: $(srcdir)/update-usbids.sh.in`
			`- sed 's\|@usbids@\|$(datadir)/usb.ids\|g' $< >$@`
			`- chmod 755 $@`
			`-`
			`lsusb.8: $(srcdir)/lsusb.8.in`
			`sed 's\|VERSION\|$(VERSION)\|g;s\|@usbids@\|$(datadir)/usb.ids\|g' $< >$@`
update to usbutils-003 2011-06-16 13:44:45 +00:00
			`@@ -71,10 +50,8 @@`
New version - monit fixes in spec file 2009-09-16 11:44:30 +00:00			`sed 's\|@usbids@\|$(datadir)/usb.ids\|g;s\|@VERSION[@]\|$(VERSION)\|g' $< >$@`
update to usbutils-003 2011-06-16 13:44:45 +00:00
New version - monit fixes in spec file 2009-09-16 11:44:30 +00:00			`DISTCLEANFILES = \`
			`- usb.ids.gz \`
			`lsusb.8 \`
			`usb-devices.1 \`
			`- update-usbids.sh \`
			`usbutils.pc`
update to usbutils-003 2011-06-16 13:44:45 +00:00
New version - monit fixes in spec file 2009-09-16 11:44:30 +00:00			`distclean-local:`
fixed path to usb.ids in lsusb.py 2011-08-13 16:51:23 +00:00			`--- usbutils-003/lsusb.py 2010-12-16 01:07:09.000000000 +0100`
			`+++ usbutils-003_/lsusb.py 2011-08-11 09:57:57.079327430 +0200`
			`@@ -16,7 +16,7 @@`
			`warnsort = False`

			`prefix = "/sys/bus/usb/devices/"`
			`-usbids = "/usr/share/usb.ids"`
			`+usbids = "/usr/share/hwdata/usb.ids"`

			`esc = chr(27)`
			`norm = esc + "[0;0m"`