[people/pmueller/ipfire-3.x.git] / usbutils / patches / 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"
Commit	Line	Data
b7135891 MT	1	--- usbutils-003/Makefile.am 2011-03-22 00:23:33.000000000 +0100
	2	+++ usbutils-003_/Makefile.am 2011-06-16 15:41:20.927882420 +0200
	3	@@ -4,15 +4,9 @@
	4	AM_LDFLAGS = \
	5	-Wl,--as-needed
	6
	7	-data_DATA = \
	8	- usb.ids
	9	-
	10	bin_PROGRAMS = \
	11	lsusb
	12
	13	-sbin_SCRIPTS = \
	14	- update-usbids.sh
	15	-
	16	bin_SCRIPTS = \
	17	usb-devices \
	18	lsusb.py
	19	@@ -27,37 +21,22 @@
	20
	21	lsusb_CPPFLAGS = \
	22	$(AM_CPPFLAGS) $(LIBUSB_CFLAGS) \
	23	- -DDATADIR=\"$(datadir)\"
	24	+ -DDATADIR=\"$(datadir)/hwdata\"
	25
	26	lsusb_LDADD = \
	27	$(LIBUSB_LIBS)
	28
	29	-if HAVE_ZLIB
	30	-data_DATA += usb.ids.gz
	31	-lsusb_CPPFLAGS += -DHAVE_LIBZ
	32	-lsusb_LDADD += -lz
	33	-endif
	34	-
	35	man_MANS = \
	36	lsusb.8 \
	37	usb-devices.1
	38
	39	EXTRA_DIST = \
	40	- usb.ids \
	41	- update-usbids.sh.in \
	42	lsusb.8.in \
	43	usb-devices.1.in \
	44	usb-devices \
	45	lsusb.py \
	46	usbutils.pc.in
	47
	48	-usb.ids.gz: $(srcdir)/usb.ids
	49	- gzip -c -9 $< > $@
	50	-
	51	-update-usbids.sh: $(srcdir)/update-usbids.sh.in
	52	- sed 's\|@usbids@\|$(datadir)/usb.ids\|g' $< >$@
	53	- chmod 755 $@
	54	-
	55	lsusb.8: $(srcdir)/lsusb.8.in
	56	sed 's\|VERSION\|$(VERSION)\|g;s\|@usbids@\|$(datadir)/usb.ids\|g' $< >$@
	57
	58	@@ -71,10 +50,8 @@
	59	sed 's\|@usbids@\|$(datadir)/usb.ids\|g;s\|@VERSION[@]\|$(VERSION)\|g' $< >$@
	60
	61	DISTCLEANFILES = \
	62	- usb.ids.gz \
	63	lsusb.8 \
	64	usb-devices.1 \
65	- update-usbids.sh \
66	usbutils.pc
67
68	distclean-local:
69	--- usbutils-003/lsusb.py 2010-12-16 01:07:09.000000000 +0100
70	+++ usbutils-003_/lsusb.py 2011-08-11 09:57:57.079327430 +0200
71	@@ -16,7 +16,7 @@
72	warnsort = False
73
74	prefix = "/sys/bus/usb/devices/"
75	-usbids = "/usr/share/usb.ids"
76	+usbids = "/usr/share/hwdata/usb.ids"
77
78	esc = chr(27)
79	norm = esc + "[0;0m"