--- usbutils-001.orig/usb.ids
+++ usbutils-001/usb.ids
@@ -9,8 +9,8 @@
 #	The latest version can be obtained from
 #		http://www.linux-usb.org/usb.ids
 #
-# Version: 2010.12.07
-# Date:    2010-12-07 20:34:05
+# Version: 2011.01.25
+# Date:    2011-01-25 20:34:02
 #
 
 # Vendors, devices and interfaces. Please keep sorted.
@@ -29,6 +29,7 @@
 	5301  GW-US54ZGL 802.11bg
 0079  DragonRise Inc.
 	0006  Generic USB Joystick
+	0011  Gamepad
 0105  Trust International B.V.
 	145f  NW-3100 802.11b/g 54Mbps Wireless Network Adapter [zd1211]
 0145  Unknown
@@ -85,9 +86,11 @@
 	204e  LUFA Dual CDC Demo Application
 	204f  LUFA Generic HID Demo Application
 	2060  Benito Programmer Project
-	2061  LUFA Combined Mas Storage and Keyboard Demo Application
+	2061  LUFA Combined Mass Storage and Keyboard Demo Application
 	2062  LUFA Combined CDC and Mouse Demo Application
 	2063  LUFA Datalogger Device
+	2064  Interfaceless Control-Only LUFA Devices
+	2065  LUFA Test and Measurement Demo Application
 	2103  JTAG ICE mkII
 	2104  AVR ISP mkII
 	2105  AVRONE!
@@ -103,7 +106,7 @@
 	5601  at76c510 Prism-II 802.11b Access Point
 	5603  Cisco 7920 WiFi IP Phone
 	6124  at91sam SAMBA bootloader
-	7603  at76c503a D-Link DWL-120 802.11b Adapter
+	7603  D-Link DWL-120 802.11b Wireless Adapter [Atmel at76c503a]
 	7604  at76c503a 802.11b Adapter
 	7605  at76c503a 802.11b Adapter
 	7606  at76c505 802.11b Adapter
@@ -222,6 +225,7 @@
 	1016  Jornada 548 / iPAQ HW6515 Pocket PC
 	1017  LaserJet 1300
 	1024  Smart Card Keyboard
+	1027  Virtual keyboard and mouse
 	1102  PhotoSmart 240 series
 	1104  DeskJet 959c
 	1105  ScanJet 5470c/5490c
@@ -679,6 +683,7 @@
 	f070  Serial Converter 422/485 [Vardaan VEUSB422R3]
 	f1a0  Asix PRESTO Programmer
 	f208  Papenmeier Braille-Display
+	f3c0  4N-GALAXY Serial Converter
 	f680  Suunto Sports Instrument
 	f758  GW Instek GDS-8x0 Oscilloscope
 	f850  USB-UIRT (Universal Infrared Receiver+Transmitter)
@@ -1276,6 +1281,7 @@
 	04c3  N800 Internet Tablet
 	04ce  E90 Communicator (PC Suite mode)
 	04cf  E90 Communicator (Storage mode)
+	04f0  Nokia N95 (PC Suite mode)
 	04f9  6300 (PC Suite mode)
 	0508  E65 (PC Suite mode)
 	0509  E65 (Storage mode)
@@ -1315,6 +1321,7 @@
 	2602  USB 2.0 Hub
 	2640  USB 2.0 Hub
 	4060  Ultra Fast Media Reader
+	4064  Ultra Fast Media Reader
 0425  Motorola Semiconductors HK, Ltd
 	0101  G-Tech Wireless Mouse & Keyboard
 	f102  G-Tech U+P Wireless Mouse
@@ -1814,6 +1821,7 @@
 	00f9  Wireless Desktop Receiver 3.1
 	0202  Xbox Controller
 	0280  XBox Device
+	0283  Xbox Communicator
 	0284  Xbox DVD Playback Kit
 	0285  Xbox Controller S
 	0288  Xbox Controller S Hub
@@ -1823,6 +1831,7 @@
 	028e  Xbox360 Controller
 	028f  Xbox360 Wireless Controller
 	0290  Xbox360 Performance Pipe (PIX)
+	0291  Xbox 360 Wireless Receiver for Windows
 	0292  Xbox360 Wireless Networking Adapter
 	029c  Xbox360 HD-DVD Drive
 	029d  Xbox360 HD-DVD Drive
@@ -1957,9 +1966,15 @@
 	04e8  Windows Powered Smartphone 2003
 	04e9  Windows Powered Smartphone 2003
 	04ea  Windows Powered Smartphone 2003
+	04ec  Windows Phone (Zune)
+	063e  Zune HD Media Player
+	0640  KIN Phone
+	0641  KIN Phone
+	0642  KIN Phone
 	0707  Wireless Laser Mouse 8000
 	0708  Transceiver v 3.0 for Bluetooth
 	070a  Charon Bluetooth Dongle (DFU)
+	0710  Zune Media Player
 	0713  Wireless Presenter Mouse 8000
 	0719  Xbox 360 Wireless Adapter
 	0721  LifeCam NX-3000 (UVC-compliant)
@@ -2027,7 +2042,7 @@
 	4d2b  Wireless Laser Mini Mouse (HID)
 	4d2c  PoPo Mini Pointer Mouse (HID)
 	4d2e  Optical Mobile Mouse (HID)
-	4d51  DELL Laser Mouse
+	4d51  0Y357C MOCZUL [Dell Laser Mouse Kit]
 0463  MGE UPS Systems
 	0001  UPS
 	ffff  UPS
@@ -2176,6 +2191,7 @@
 	0a0b  ClearChat Pro USB
 	0a0c  Clear Chat Comfort USB Headset
 	0a13  Z-5 Speakers
+	0a17  G330 Headset
 	0b02  BT Mini-Receiver (HID proxy mode)
 	8801  Video Camera
 	b305  BT Mini-Receiver
@@ -2216,7 +2232,7 @@
 	c038  Mouse
 	c03d  M-BT96a Pilot Optical Mouse
 	c03e  Premium Optical Wheel Mouse (M-BT58)
-	c03f  UltraX Optical Mouse
+	c03f  M-BT85 [UltraX Optical Mouse]
 	c040  Corded Tilt-Wheel Mouse
 	c041  G5 Laser Mouse
 	c042  G3 Laser Mouse
@@ -2235,7 +2251,8 @@
 	c061  RX1500 Laser Mouse
 	c068  G500 Laser Mouse
 	c101  UltraX Media Remote
-	c110  Harmony Remote 885
+	c110  Harmony 885 Remote
+	c11f  Harmony 900 Remote
 	c122  Harmony 700 Remote
 	c201  WingMan Extreme Joystick with Throttle
 	c202  WingMan Formula
@@ -2257,6 +2274,7 @@
 	c219  Cordless RumblePad 2
 	c21a  Precision Gamepad
 	c21c  G13 Advanced Gameboard
+	c21d  F310 Gamepad [XInput Mode]
 	c21f  F710 Wireless Gamepad [XInput Mode]
 	c221  G11/G15 Keyboard / Keyboard
 	c222  G15 Keyboard / LCD
@@ -2296,6 +2314,7 @@
 	c316  HID-Compliant Keyboard
 	c317  Wave Corded Keyboard
 	c318  Illuminated Keyboard
+	c31a  Comfort Wave 450
 	c31b  Compact Keyboard K300
 	c31c  Keyboard K120 for Business
 	c401  TrackMan Marble Wheel
@@ -2320,6 +2339,7 @@
 	c512  LX-700 Cordless Desktop Receiver
 	c513  MX3000 Cordless Desktop Receiver
 	c514  Cordless Mouse
+	c515  Cordless 2.4 GHz Presenter Presentation remote control
 	c517  LX710 Cordless Desktop Laser
 	c518  MX610 Laser Cordless Mouse
 	c51a  MX Revolution/G7 Cordless Mouse
@@ -2438,6 +2458,7 @@
 	0815  eHome Infrared Receiver
 	0844  SA2111/02 1GB Flash Audio Player
 	084a  GoGear SA3125
+	084e  GoGear SA60xx (mtp)
 	0888  Hantek DDS-3005 Arbitrary Waveform Generator
 	1103  Digital Speaker System
 	1120  Creative Rhomba MP3 player
@@ -2453,6 +2474,7 @@
 	1801  Diva MP3 player
 	200a  Wireless Network Adapter
 	200f  802.11n Wireless Adapter
+	2021  SDE3273FC/97 2.5" SATA HDD Enclosure [INIC-1608L]
 	2022  GoGear SA52XX
 	2034  Webcam SPC530NC
 	203f  TSU9200 Remote Control
@@ -2460,6 +2482,7 @@
 	204e  GoGear RaGa (SA1942/02)
 	205e  TSU9300 Remote Control
 	2070  GoGear Mix
+	2076  GoGear Aria
 	2079  GoGear Opus
 	2088  MCE IR Receiver with ALS- Spinel plus for ASUS
 	262c  SPC230NC Webcam
@@ -2633,8 +2656,11 @@
 0489  Foxconn / Hon Hai
 	0502  SmartMedia Card Reader Firmware Loader
 	0503  SmartMedia Card Reader
+	d00c  Rollei Compactline (Storage Mode)
+	d00e  Rollei Compactline (Video Mode)
 	e000  T-Com TC 300
 	e003  Pirelli DP-L10
+	e00f  Foxconn T77H114 BCM2070 [Single-Chip Bluetooth 2.1 + EDR Adapter]
 	e016  Foxconn / Hon Hai
 048a  S-MOS Systems, Inc.
 048c  Alps Electric Ireland, Ltd
@@ -3006,10 +3032,15 @@
 	1729  MX700 ser
 	172b  MP140 ser
 	173e  MP560
+	173f  Pixma MP640 Multifunction device
 	1900  CanoScan LiDE 90
 	1901  CanoScan 8800F
 	1904  CanoScan LiDE 100
 	1905  CanoScan LiDE 200
+	1906  CanoScan 5600F
+	1907  CanoScan LiDE 700F
+	1909  CanoScan LiDE 110
+	190a  CanoScan LiDE 210
 	2200  CanoScan LiDE 25
 	2201  CanoScan FB320U
 	2202  CanoScan FB620U
@@ -3037,6 +3068,7 @@
 	221e  CanoScan 8400F
 	221f  CanoScan LiDE 500F
 	2220  CanoScan LIDE 25
+	2224  CanoScan LiDE 600F
 	2225  CanoScan LiDE 70
 	2228  CanoScan 4400F
 	2602  MultiPASS C555
@@ -3437,7 +3469,7 @@
 	0129  Expression 10000XL (ES-10000G)
 	012a  Perfection 4990 Photo scanner
 	012b  GT-2500 (ES-H300)
-	012c  Perfection V350 (GT-F700)
+	012c  Perfection V700 Photo (GT-X900)
 	012d  Perfection V10/V100 (GT-S600/F650)
 	012f  Perfection V350 (GT-F700)
 	0130  Perfection V500 (GT-X770)
@@ -3723,6 +3755,7 @@
 	1520  USB 2.0 Hub (Avocent KVM)
 	1521  USB 2.0 Hub
 	1a62  GW Instek GSP-830 Spectrum Analyzer (HID)
+	2533  NFC device (PN533)
 	8116  Camera
 04cd  Tatung Co. Of America
 04ce  ScanLogic Corp.
@@ -3915,6 +3948,7 @@
 	5120  SCR331-DI SmartCard Reader
 	5121  SDI010 Smart Card Reader
 	5151  SCR338 Keyboard Smart Card Reader
+	5292  SCL011 RFID reader
 	5410  SCR35xx Smart Card Reader
 	e000  SCRx31 Reader
 	e001  SCR331 SmartCard Reader
@@ -4044,7 +4078,8 @@
 	508c  YP-S5
 	5090  YP-S3 (msc)
 	5091  YP-S3 (mtp)
-	5092  YP-U4
+	5092  YP-U4 (msc)
+	5093  YP-U4 (mtp)
 	5095  YP-S2
 	510f  YP-R1
 	5119  Yepp YP-P3
@@ -4068,6 +4103,7 @@
 	5f02  NEXiO Sync
 	5f03  NEXiO Sync
 	5f04  NEXiO Sync
+	6032  G2 Portable hard drive
 	6601  Mobile Phone
 	6602  Galaxy
 	6603  Galaxy
@@ -4503,6 +4539,7 @@
 	0240  F5U240 USB 2.0 CF Card Reader
 	0249  USB 2 Flash Media Device
 	0257  F5U257 Serial
+	0304  FSU304 USB 2.0 - 4 Ports Hub
 	0409  F5U409 Serial
 	0551  F6C550-AVR UPS
 	0802  Nostromo n40 Gamepad
@@ -4558,6 +4595,7 @@
 	0001  USB to PS2 Adaptor v1.09
 	0002  EZ-9900C Keyboard
 0519  Star Micronics Co., Ltd
+	0003  TSP100ECO/TSP100II
 	c002  Xlive Bluetooth XBM-100S MP3 Player
 051a  WYSE Technology
 	a005  Smart Display Version 9973
@@ -4878,6 +4916,7 @@
 	0317  WALKMAN
 	031a  Walkman NWD-B103F
 	031e  PRS-505 reader
+	033e  DSC-W120
 	0346  Handycam DCR-SR55E
 	0382  Memory Stick PRO-HG Duo Adaptor (MSAC-UAH1)
 	03bc  Webbie HD - MHS-CM1
@@ -5500,6 +5539,7 @@
 	6232  Hi-Speed 16-in-1 Flash Card Reader/Writer
 	6254  USB Hub
 	6331  SD/MMC/MS Card Reader
+	6332  Multi-Function Card Reader
 	6335  SD/MMC Card Reader
 	6360  Multimedia Card Reader
 	6361  Multimedia Card Reader
@@ -5533,7 +5573,7 @@
 0590  Omron Corp.
 	0004  Cable Modem
 	000b  MR56SVS
-	0028  HJ-720IT Pedometer
+	0028  HJ-720IT Pedometer / Blood Pressure Monitor HEM-7080IT-E
 0591  Questra Consulting
 0592  Powerware Corp.
 	0002  UPS (X-Slot)
@@ -5589,6 +5629,7 @@
 	027a  LPHD250-U [Portable Hard Drive Silver Series 250 Go]
 	0470  Prestige Portable Hard Drive
 	047a  Select Portable Hard Drive
+	0579  eGo Portable Hard Drive
 	1052  DVD+RW External Drive
 059c  A-Trend Technology Co., Ltd
 059d  Advanced Input Devices
@@ -5741,6 +5782,7 @@
 	1263  iPod Nano 4.Gen
 	1265  iPod Nano 5.Gen
 	1266  iPod Nano 6.Gen
+	1281  Apple Mobile Device [Recovery Mode]
 	1290  iPhone
 	1291  iPod Touch 1.Gen
 	1292  iPhone 3G
@@ -6169,7 +6211,7 @@
 	0660  USB 2.0 Hub
 	0700  SIIG US2256 CompactFlash Card Reader
 	0701  USB 2.0 IDE Adapter
-	0702  USB 2.0 IDE Adapter
+	0702  USB 2.0 IDE Adapter [GL811E]
 	0703  Card Reader
 	0704  Card Reader
 	0705  Card Reader
@@ -6412,6 +6454,7 @@
 	a103  Acer/HP Integrated Webcam [CN0314]
 	a110  HP Webcam
 	a136  Asus Integrated Webcam [CN031B]
+	a219  1.3M WebCam (notebook emachines E730, Acer sub-brand)
 	c107  HP webcam [dv6-1190en]
 	d101  Acer CrystalEye Webcam
 	e201  Lenovo Integrated Webcam
@@ -6594,7 +6637,7 @@
 0673  HCL
 	5000  Keyboard
 0674  Key Mouse Electronic Enterprise Co., Ltd
-0675  Draytech
+0675  DrayTek Corp.
 	0110  Vigor 128 ISDN TA
 	0530  Vigor530 IEEE 802.11G Adapter (ISL3880+NET2280)
 	0550  Vigor550
@@ -6821,6 +6864,7 @@
 	5509  P3000 Wireless Pad
 	8000  Gamers' Keyboard
 	801e  Cyborg 3D Digital Stick II
+	8020  Eclipse Keyboard
 	8021  Eclipse II Keyboard
 	802d  P750 Pad
 	803f  X36 Flight Controller
@@ -7158,6 +7202,7 @@
 	e020  HWGUSB2-54V2-AP
 	e031  Hercules HWNUm-300 Wireless N mini [Realtek RTL8191S]
 	e032  HWGUm-54 [Hercules Wireless G Ultra Mini Key]
+06f9  ASYST electronic d.o.o.
 06fa  HSD S.r.L
 06fc  Motorola Semiconductor Products Sector
 06fd  Boston Acoustics
@@ -7386,7 +7431,7 @@
 	201b  M-Audio RunTime DFU
 	201d  M-Audio Producer
 	2080  M-Audio RunTime DFU
-	2081  M-Audio RunTime DFU
+	2081  M-Audio RunTime DFU / Fast Track Ultra 8R
 	2803  M-Audio Audiophile DFU
 	2804  M-Audio MobilePre DFU
 	2806  M-Audio Transit DFU
@@ -7488,7 +7533,7 @@
 	5408  Cruzer Titanium U3
 	540e  Cruzer Contour Flash Drive
 	5530  Cruzer U3 4gb SDCZ36
-	5567  Cruszer Blade
+	5567  Cruzer Blade
 	6100  Ultra II SD Plus 2GB
 	7100  Cruzer Mini
 	7101  Pen Flash
@@ -7778,7 +7823,7 @@
 	b031  BCM92045DG-Flash with trace filter
 	b032  BCM92045DG-Flash with trace filter
 	b033  BCM92045DG-Flash with trace filter
-	b21a  802.11g Wireless Adapter
+	b21a  WUG2400 802.11g Wireless Adapter [Texas Instruments TNETW1450]
 	b21b  HWU54DM
 	b21c  RT2573
 	b21d  RT2573
@@ -8033,7 +8078,7 @@
 	0005  ScanLogic/Century Corporation uATA
 	011e  Century USB Disk Enclosure
 07f9  Dotop Technology, Inc.
-07fa  Draytek
+07fa  DrayTek Corp.
 	0778  miniVigor 128 ISDN TA
 	1012  BeWAN ADSL USB ST (grey)
 	1196  BWIFI-USB54AR 802.11bg
@@ -8164,6 +8209,7 @@
 	1009  Digimax V4
 	1012  6500 Document Camera
 	1058  S730 Camera
+	1064  Digimax D830 Camera
 	1542  Digimax 50 Duo
 	3000  Digimax 35 MP3
 083a  Accton Technology Corp.
@@ -8661,6 +8707,7 @@
 	3720  Silicon Motion Camera
 	37c0  Silicon Motion Camera
 	6000  SD/SDHC Card Reader (SG365 / FlexiDrive XC+)
+	6200  microSD card reader
 	837b  Silicon Motion Camera
 	937b  Silicon Motion Camera
 	b370  Silicon Motion SM370 Camera
@@ -8822,7 +8869,7 @@
 	653e  Flash Memory
 	6540  TransMemory Flash Memory
 	6544  Kingston DataTraveler 2.0 Stick (2GB)
-	6545  Kingston DataTraveler 102 flash drive
+	6545  Kingston DataTraveler 102 Flash Drive / HEMA Flash Drive 2 GB / PNY Attache 4GB Stick
 0931  Harmonic Data Systems, Ltd
 0932  Crescentec Corp.
 	0300  VideoAdvantage
@@ -8908,8 +8955,10 @@
 	1603  DataTraveler 1GB/2GB Pen Drive
 	1607  DataTraveler 100
 	1613  DataTraveler DT101C Flash Drive
+	1616  Kingston DataTraveler Locker (4GB)
 	1625  DataTraveler 101 II
 	162a  DataTraveler 112 4GB Pen Drive
+	1643  DataTraveler G3 4GB
 0954  RPM Systems Corp.
 0955  NVidia Corp.
 0956  BSquare Corp.
@@ -9026,6 +9075,7 @@
 	022b  Wireless Mouse (Battery Free)
 	024f  RF Receiver and G6-20D Wireless Optical Mouse
 	032b  Wireless Mouse (Battery Free)
+	9090  XL-750BK Laser Mouse
 09db  Measurement Computing Corp.
 	0075  MiniLab 1008
 	0076  PMD-1024
@@ -9044,6 +9094,8 @@
 09e8  AKAI  Professional M.I. Corp.
 	0062  MPD16 MIDI Pad Controller Unit
 	006d  EWI electronic wind instrument
+	0071  MPK25 MIDI Keyboard
+	0076  LPK25 MIDI Keyboard
 09e9  Chen-Source, Inc.
 09eb  IM Networks, Inc.
 	4331  iRhythm Tuner Remote
@@ -9271,6 +9323,7 @@
 0a5d  Diatrend Corp.
 0a5f  Zebra
 	0009  LP2844 Printer
+	0081  GK420t Label Printer
 	008b  HC100 wristbands Printer
 	930a  Printer
 0a62  MPMan
@@ -9419,6 +9472,7 @@
 	c002  Visual Communication Camera VGP-VCC1
 	c302  Vega USB 2.0 Camera
 	c303  Saturn USB 2.0 Camera
+	c326  Namuga 1.3M Webcam
 	c33f  Webcam
 0ac9  Micro Solutions, Inc.
 	0000  Backpack CD-ReWriter
@@ -9538,6 +9592,7 @@
 	1761  802.11n Network Adapter
 	1774  Gobi Wireless Modem (QDL mode)
 	1776  Gobi Wireless Modem
+	1779  My Cinema U3100 Mini Plus [AF9035A]
 	1784  USB-N13 802.11n Network Adapter [Ralink RT2870]
 	6101  Cable Modem
 	620a  Remote NDIS Device
@@ -9899,18 +9954,21 @@
 	0b04  Hermes / TyTN / T-Mobile MDA Vario II / O2 Xda Trion
 	0b06  Athena / Advantage x7500 / Dopod U1000 / T-Mobile AMEO
 	0b0c  Elf / Touch / P3450 / T-Mobile MDA Touch / O2 Xda Nova / Dopod S1
+	0b1f  Sony Ericsson XPERIA X1
 	0b2f  Rhodium
 	0b51  Qtek 8310 mobile phone [Tornado Noble]
 	0bce  Vario MDA
 	0c01  Dream / ADP1 / G1 / Magic / Tattoo
 	0c02  Dream / ADP1 / G1 / Magic / Tattoo (Debug)
 	0c13  Diamond
+	0c1f  Sony Ericsson XPERIA X1
 	0c5f  Snap
-	0c87  Desire (Debug)
+	0c87  Desire (debug)
+	0c8d  EVO 4G (debug)
 	0c91  Vision
 	0c94  Vision
 	0c97  Legend
-	0c99  Desire Phone (Debug)
+	0c99  Desire (debug)
 	0c9e  Incredible
 	0ff9  Desire / Hero
 	0fff  Android Fastboot Bootloader
@@ -9928,6 +9986,7 @@
 0bc2  Seagate RSS LLC
 	2000  Storage Adapter V3 (TPP)
 	2200  FreeAgent Go FW
+	5021  FreeAgent GoFlex 9ZFAD1-500 1.5 TB
 0bc3  IPWireless, Inc.
 	0001  UMTS-TDD (TD-CDMA) modem
 0bc4  Microcube Corp.
@@ -10122,6 +10181,7 @@
 	03a2  iDEN Smartphone
 	41d9  i1 phone
 0c45  Microdia
+	0011  EBUDDY
 	1020  Mass Storage Reader
 	1028  Mass Storage Reader
 	1030  Mass Storage Reader
@@ -10243,6 +10303,7 @@
 	63e0  Sonix Integrated Webcam
 	63f1  Integrated Webcam
 	63f8  Sonix Integrated Webcam
+	6409  Webcam
 	6417  Integrated Webcam
 	8000  DC31VC
 	8006  Dual Mode Camera (8006 VGA)
@@ -10251,6 +10312,7 @@
 0c4b  Reiner SCT Kartensysteme GmbH
 	0100  cyberJack e-com/pinpad
 	0300  cyberJack pinpad(a)
+	9102  cyberJack RFID basis contactless smartcard reader
 0c52  Sealevel Systems, Inc.
 	2101  Serial Converter
 0c53  ViewPLUS, Inc.
@@ -10395,6 +10457,7 @@
 	0086  Cinergy Hybrid XE
 	0097  Cinergy T RC MKII
 	00a5  Cinergy Hybrid Stick
+	00a9  RTL2838 DVB-T COFDM Demodulator [TerraTec Cinergy T Stick Black]
 0cd4  Bang Olufsen
 	0101  BeolinkPC2
 0cd5  LabJack Corporation
@@ -10422,7 +10485,7 @@
 	0018  NB 802.11a/b/g Wireless LAN Adapter(3887A)
 	001a  802.11bg
 	001c  802.11b/g Wireless Network Adapter
-	0020  Wi-Fi Wireless LAN Adapter
+	0020  AG-760A 802.11abg Wireless Adapter [ZyDAS ZD1211B]
 	0022  802.11b/g/n Wireless Network Adapter
 	0023  UB81 802.11bgn
 	0025  802.11b/g/n USB Wireless Network Adapter
@@ -10445,12 +10508,13 @@
 	0006  AR5523 (no firmware)
 	1001  Thomson TG121N [Atheros AR9001U-(2)NG]
 	1002  TP-Link TL-WN821N v2 [Atheros AR9001U-(2)NG]
-	1006  TP-Link TL-WN422G v2 802.11g [Atheros AR9271]
+	1006  TP-Link TL-WN322G v3 / TL-WN422G v2 802.11g [Atheros AR9271]
 	1010  3Com 3CRUSBN275 802.11abgn Wireless Adapter [Atheros AR9170]
 	3000  AR3011
 	9170  AR9170 802.11n
 	9271  AR9271 802.11n
-	b003  AR9271 802.11n
+	b002  Ubiquiti WiFiStation 802.11n [Atheros AR9271]
+	b003  Ubiquiti WiFiStationEXT 802.11n [Atheros AR9271]
 0cf4  Fomtex Corp.
 0cf5  Cellink Co., Ltd
 0cf6  Compucable Corp.
@@ -10710,7 +10774,13 @@
 0d9e  Avaya
 	0300  Wireless Card
 0d9f  Powercom Co., Ltd
-	0002  Uninterruptible power supply
+	0001  Uninterruptible Power Supply
+	0002  Black Knight PRO / WOW Uninterruptible Power Supply (Cypress HID->COM RS232)
+	00a2  Imperial Uninterruptible Power Supply (HID PDC)
+	00a3  Smart King PRO Uninterruptible Power Supply (HID PDC)
+	00a4  WOW Uninterruptible Power Supply (HID PDC)
+	00a5  Vanguard Uninterruptible Power Supply (HID PDC)
+	00a6  Black Knight PRO Uninterruptible Power Supply (HID PDC)
 0da0  Danger Research
 0da1  Suzhou Peter's Precise Industrial Co., Ltd
 0da2  Land Instruments International, Ltd
@@ -10726,6 +10796,7 @@
 0db0  Micro Star International
 	1020  PC2PC WLAN Card
 	1967  Bluetooth Dongle
+	3801  Motorola Bluetooth 2.1+EDR Device
 	4011  Medion Flash XL V2.0 Card Reader
 	4600  802.11b/g Turbo Wireless Adapter
 	5501  Mass Storage Device
@@ -10906,6 +10977,7 @@
 0e0c  Gesytec
 	0101  LonUSB LonTalk Network Adapter
 0e0f  VMware, Inc.
+	0001  Device
 	0002  Virtual USB Hub
 	0003  Virtual Mouse
 	0004  Virtual CCID
@@ -10931,6 +11003,7 @@
 	0800  Cowon D2 (UMS mode)
 	0801  Cowon D2 (MTP mode)
 	0910  iAUDIO 9
+	0920  J3
 0e22  Symbian Ltd.
 0e23  Liou Yuane Enterprise Co., Ltd
 0e25  VinChip Systems, Inc.
@@ -11289,8 +11362,10 @@
 	2105  W715 Phone
 	2137  Xperia X10 mini (USB debug)
 	2138  Xperia X10 mini pro (Debug)
+	2149  Xperia X8 (debug)
 	3137  Xperia X10 mini
 	3138  Xperia X10 mini pro
+	3149  Xperia X8
 	8004  9000 Phone [Mass Storage]
 	d008  V800-Vodafone 802SE Phone
 	d016  K750i Phone
@@ -11299,7 +11374,7 @@
 	d025  520 WMC Data Modem
 	d028  W800i
 	d038  W850i Phone
-	d039  K800i Phone
+	d039  K800i (phone mode)
 	d041  K510i Phone
 	d042  W810i Phone
 	d043  V630i Phone
@@ -11312,6 +11387,7 @@
 	d0d4  C902 Phone [Modem]
 	d0e1  MD400 Mobile Broadband Modem
 	d12e  Xperia X10
+	e039  K800i (msc mode)
 	e042  W810i Phone
 	e043  V630i Phone [Mass Storage]
 	e075  K850i
@@ -11359,6 +11435,9 @@
 	6000  KU330/KU990/VX4400/VX6000
 	6005  T5100
 	6018  GM360/GD510/GW520/KP501
+	618e  Ally/Optimus One/Vortex (debug mode)
+	618f  Ally/Optimus One
+	61c6  Vortex (msc)
 	6800  CDMA Modem
 	7000  LG LDP-7024D(LD)USB
 	a400  Renoir (KC910)
@@ -11463,6 +11542,7 @@
 	8901  Bluetooth Device
 	9967  W9967CF/W9968CF Webcam IC
 1048  Targus Group International
+104b  Mylex / Buslogic
 104c  AMCO TEC International, Inc.
 104d  Newport Corporation
 	1003  Model-52 LED Light Source Power Supply and Driver
@@ -11495,6 +11575,7 @@
 	0901  MyBook External HDD
 	0910  MyBook Essential External HDD
 	1001  External Hard Disk [Elements]
+	1021  Elements 2TB
 	1104  MyBook Mirror Edition External HDD
 1059  Giesecke & Devrient GmbH
 	000b  StarSign Bio Token 3.0
@@ -11606,7 +11687,8 @@
 10a0  Hirotech, Inc.
 10a3  Mitsubishi Materials Corp.
 10a9  SK Teletech Co., Ltd
-	1102  Sky IM-U460K
+	1102  Sky Love Actually IM-U460K
+	1104  Sky Vega IM-A650S
 10aa  Cables To Go
 10ab  USI Co., Ltd
 	1002  Bluetooth Device
@@ -11690,6 +11772,7 @@
 10f0  Nexio Co., Ltd
 	2002  iNexio Touchscreen controller
 10f1  Importek
+	1a08  Internal Webcam
 	1a1e  Laptop Integrated Webcam 1.3M
 10f5  Turtle Beach
 	0200  Audio Advantage Roadie
@@ -11778,6 +11861,7 @@
 1163  DeLorme Publishing, Inc.
 	0100  Earthmate GPS (orig)
 	0200  Earthmate GPS (LT-20, LT-40)
+	2020  Earthmate GPS (PN-40)
 1164  YUAN High-Tech Development Co., Ltd
 	0300  ELSAVISION 460D
 	0601  Analog TV Tuner
@@ -11901,6 +11985,8 @@
 	3403  Muzio JM250 Audio Player
 1223  SKYCABLE ENTERPRISE. CO., LTD.
 1230  Chipidea-Microelectronica, S.A.
+1233  Denver Electronics
+	5677  FUSB200 mp3 player
 1234  Unknown
 	ed02  Emotiv EPOC Developer Headset Wireless Dongle
 1235  Novation EMS
@@ -11926,6 +12012,7 @@
 125c  Apogee Inc.
 	0010  Alta series CCD
 125f  A-DATA Technology Co., Ltd.
+	c81a  Flash drive
 1260  Standard Microsystems Corp.
 	ee22  SMC2862W-G v3 EZ Connect 802.11g Adapter [Intersil ISL3887]
 1264  Covidien Energy-based Devices
@@ -11943,6 +12030,7 @@
 	1325  Mobile Disk
 	2168  Mobile Disk III
 	a006  G240 802.11bg
+1274  Ensoniq
 1275  Xaxero Marine Software Engineering, Ltd.
 	0002  WeatherFax 2000 Demodulator
 	0080  SkyEye Weather Satellite Receiver
@@ -11994,7 +12082,8 @@
 	1003  E220 HSDPA Modem / E230/E270 HSDPA/HSUPA Modem
 	1009  U120
 	1010  ETS2252+ CDMA Fixed Wireless Terminal
-	1038  Ideos
+	1037  Ideos
+	1038  Ideos (debug mode)
 	140b  EC1260 Wireless Data Modem HSD USB Card
 	1446  E1552 (HSPA modem)
 	1501  Pulse
@@ -12162,6 +12251,7 @@
 13be  Ricoh Printing Systems, Ltd.
 13ca  JyeTai Precision Industrial Co., Ltd.
 13cf  Wisair Ltd.
+	1200  Olidata Wireless Multimedia Adapter
 13d0  Techsan Electronics Co., Ltd.
 	2282  TechniSat DVB-PC TV Star 2
 13d1  A-Max Technology Macao Commercial Offshore Co. Ltd.
@@ -12201,12 +12291,14 @@
 	3243  DTV-DVB UDXTTM6010 - A/D Driver(Without HID)
 	3244  DTV-DVB UDTT 7047Z-USB 2.0 DVB-T Driver
 	3247  802.11 n/g/b Wireless LAN Adapter
+	3249  Internal Bluetooth
 	3262  802.11 n/g/b Wireless LAN USB Adapter
 	3273  802.11 n/g/b Wireless LAN USB Mini-Card
 	3274  DVB-T Dongle [RTL2832U]
 	3282  DVB-T + GPS Minicard [RTL2832U]
 	3284  Wireless LAN USB Mini-Card
 	3306  WLAN [RTL8191S]
+	5070  Webcam
 	5111  Integrated Webcam
 	5115  Integrated Webcam
 	5116  Integrated Webcam
@@ -12225,13 +12317,14 @@
 	1340  Hi-Speed USB to SATA Bridge
 	160f  RocketFish SATA Bridge [INIC-1611]
 	1640  ASUS SDRW-08D1S-U DVD-RW
+	1840  Shintaro SH23SDOCK Hard Drive Docker [INIC-1608L]
 13fe  Kingston Technology Company Inc.
 	1a00  512MB/1GB Flash Drive
 	1a23  512MB Flash Drive
 	1d00  DataTraveler 2.0 1GB/4GB Flash Drive / Patriot Xporter 4GB Flash Drive
 	1f00  DataTraveler 2.0 4GB Flash Drive / Patriot Xporter 32GB (PEF32GUSB) Flash Drive
 	2240  microSD card reader
-	3100  2 GB USB stick
+	3100  2GB/4GB USB stick
 1400  Axxion Group Corp.
 1402  Bowe Bell & Howell
 1403  Sitronix
@@ -12316,10 +12409,13 @@
 	e018  eHome Infrared Receiver
 	e03a  eHome Infrared Receiver
 	e03c  eHome Infrared Receiver
+	e03e  Infrared Receiver [IR605A/Q]
 147e  Upek
 	1000  Biometric Touchchip/Touchstrip Fingerprint Sensor
 	2016  Biometric Touchchip/Touchstrip Fingerprint Sensor
 147f  Hama GmbH & Co., KG
+1482  Vaillant
+	1005  VRD PC-Interface
 1484  Elsa AG [hex]
 	1746  Ecomo 19H99 Monitor
 	7616  Elsa Hub
@@ -12376,10 +12472,14 @@
 	0250  Storage Adapter V2
 	0350  Storage Adapter V2
 14cd  Super Top
+	121c  microSD card reader
+	123a  SD/MMC/RS-MMC Card Reader
+	127b  SDXC Reader
 	6600  USB 2.0 IDE DEVICE
 	6700  Card Reader
 	6900  Card Reader
 	8123  SD MMC Reader
+	8125  SD MMC Reader
 14d8  JAMER INDUSTRIES CO., LTD.
 14dd  Raritan Computer, Inc.
 14e1  Dialogue Technology Corp.
@@ -12421,7 +12521,7 @@
 1529  UBIQUAM Co., Ltd.
 	3100  CDMA 1xRTT USB Modem (U-100/105/200/300/520)
 152d  JMicron Technology Corp. / JMicron USA Technology Corp.
-	2329  transcend storejet 25P
+	2329  JM20329 SATA Bridge
 	2335  ATA/ATAPI Bridge
 	2336  Hard Disk Drive
 	2337  ATA/ATAPI Bridge
@@ -12488,6 +12588,7 @@
 	0010  802.11n USB Wireless Card
 	0012  WUBR-208N 802.11abgn Wireless Adapter [Ralink RT2870]
 15aa  Gearway Electronics (Dong Guan) Co., Ltd.
+15ad  VMware Inc.
 15ba  Olimex Ltd.
 	0003  OpenOCD JTAG
 	0004  OpenOCD JTAG TINY
@@ -12797,6 +12898,8 @@
 	03f1  free for internal lab use 1009
 	05dc  shared ID for use with libusb
 	05dd  BlackcatUSB2
+	05e1  CDC-ACM class devices (modems)
+	05e4  MIDI class devices
 	076b  OpenPCD 13.56MHz RFID Reader
 	076c  OpenPICC 13.56MHz RFID Simulator (native)
 	08ac  OpenBeacon USB stick
@@ -12804,6 +12907,11 @@
 	08cb  Alpermann+Velte Studio Clock
 	08cc  Alpermann+Velte SAM7S MT Boot Loader
 	08cd  Alpermann+Velte SAM7X MT Boot Loader
+	27da  Mouse
+	27db  Keyboard
+	27dc  Joystick
+	27dd  CDC-ACM class devices (modems)
+	27de  MIDI class devices
 16ca  Wireless Cables, Inc.
 	1502  Bluetooth Dongle
 16cc  silex technology, Inc.
@@ -12811,6 +12919,7 @@
 	054b  ReelBox OLED Display (external)
 16d3  Frontline Test Equipment, Inc.
 16d5  AnyDATA Corporation
+	6202  CDMA/UMTS/GPRS modem
 	6501  CDMA 2000 1xRTT/EV-DO Modem
 	6502  CDMA/UMTS/GPRS modem
 16d6  JABLOCOM s.r.o.
@@ -12832,12 +12941,15 @@
 	0001  CC
 	000b  VM
 16df  King Billion Electronics Co., Ltd.
+16f0  GN ReSound A/S
+	0003  Airlink Wireless Programming Interface
 16f5  Futurelogic Inc.
 1706  BlueView Technologies, Inc.
 1707  ARTIMI
 170b  Swissonic
 	0011  MIDI-USB 1x1
 170d  Avnera
+1725  Vitesse Semiconductor
 1726  Axesstel, Inc.
 	1000  wireless modem
 	2000  wireless modem
@@ -12922,6 +13034,7 @@
 	0007  eHome Infrared Transceiver
 	0008  eHome Infrared Transceiver
 	000a  eHome Infrared Transceiver
+1787  ATI AIB
 1788  ShenZhen Litkconn Technology Co., Ltd.
 1796  Printrex, Inc.
 1797  JALCO CO., LTD.
@@ -12969,6 +13082,7 @@
 17ef  Lenovo
 	1003  Integrated Smart Card Reader
 	1004  Integrated Webcam
+	100a  ThinkPad Mini Dock Plus Series 3
 	3815  ChipsBnk 2GB USB Stick
 	4802  Lenovo Vc0323+MI1310_SOC Camera
 	4807  UVC Camera
@@ -12997,6 +13111,7 @@
 183d  VIVOphone
 	0010  VoiceKey
 1843  Vaisala
+1849  ASRock Incorporation
 1852  GYROCOM C&C Co., LTD
 	7922  Audiotrak DR.DAC2 DX
 1854  Memory Devices Ltd.
@@ -13021,6 +13136,7 @@
 	0202  Nice
 	0300  Vega
 	0301  VeNice
+1892  Vast Technologies, Inc.
 1894  Topseed
 	5632  Atek Tote Remote
 	5641  TSAM-004 Presentation Remote
@@ -13046,9 +13162,11 @@
 18cd  Ecamm
 	cafe  Pico iMage
 18d1  Google Inc.
-	4e11  Nexus One Phone
-	4e12  Nexus One Phone (Debug)
-	4e13  Nexus One Phone (USB Tether)
+	4e11  Nexus One
+	4e12  Nexus One (debug)
+	4e13  Nexus One (tether)
+	4e21  Nexus S
+	4e22  Nexus S (debug)
 18d5  Starline International Group Limited
 18d9  Kaba
 	01a0  B-Net 91 07
@@ -13056,7 +13174,9 @@
 	1000  DocuPen RC800
 18e3  Fitipower Integrated Technology Inc
 	7102  Multi Card Reader (Internal)
+	9101  All-in-1 Card Reader
 	9102  Multi Card Reader
+	9512  Webcam
 18e8  Qcom
 	6196  RT2573
 	6229  RT2573
@@ -13174,9 +13294,10 @@
 19d2  ONDA Communication S.p.A.
 	0002  ET502HS/MT505UP ZTE MF632
 	0007  ZTE TU25 WiMAX Adapter [Beceem BCS200]
-	0031  ZTE MF636
+	0031  ZTE MF110/MF636
 	0063  ZTE K3565-Z HSDPA
 	0064  ZTE MF627 AU
+	0083  ZTE MF190
 	0103  ZTE MF112
 	2000  ZTE MF627/MF628/MF628+/MF636+ HSDPA/HSUPA
 	fff2  Gobi Wireless Modem (QDL mode)
@@ -13214,8 +13335,10 @@
 1a6f  Sagem Orga GmbH
 1a79  Bayer Health Care LLC
 1a7b  Lumberg Connect  GmbH & Co. KG
-1a7c  Kingsis Peripherals
-	0068  Evoluent VerticalMouse 3
+1a7c  Evoluent
+	0068  VerticalMouse 3
+	0168  VerticalMouse 3 Wireless
+	0191  VerticalMouse 4
 1a86  QinHeng Electronics
 	5523  CH341 in serial mode, usb to serial port converter
 	5584  CH341 in parallel mode, usb to printer port converter
@@ -13225,6 +13348,9 @@
 	e008  HID-based USB-serial converter, full-speed, similar to HE2325U
 1a89  Dynalith Systems Co., Ltd.
 1a8b  SGS Taiwan Ltd.
+1a8d  BandRich, Inc.
+	1002  BandLuxe 3.5G HSDPA Adapter
+	1009  BandLuxe 3.5G HSPA Adapter
 1a90  Corsair Voyager GT 16GB
 1a98  Leica Camera AG
 1aa4  Data Drive Thru, Inc.
@@ -13356,6 +13482,8 @@
 1b5a  Chao Zhou Kai Yuan Electric Co., Ltd.
 1b65  The Hong Kong Standards and Testing Centre Ltd.
 1b72  ATERGI TECHNOLOGY CO., LTD.
+1b73  Fresco Logic
+	1000  xHC1 Controller
 1b75  Ovislink Corp.
 	3072  AirLive WN-360USB adapter
 1b76  Legend Silicon Corp.
@@ -13371,6 +13499,7 @@
 	e386  DVB-T UB385-T [af9015]
 	e39a  DVB-T395U [af9015]
 	e39b  DVB-T395U [af9015]
+	e409  IT9137FN Dual DVB-T [KWorld UB499-2T]
 1b86  Dongguan Guanshang Electronics Co., Ltd.
 1b88  ShenMing Electron (Dong Guan) Co., Ltd.
 1b8c  Altium Limited
@@ -13485,6 +13614,8 @@
 	1101  DK DVB-T Dongle
 	1102  DK mini DVB-T Dongle
 	1103  DK 5217 DVB-T Dongle
+	6105  Video grabber
+	8202  DK DVBC/T DONGLE
 1d1f  Diostech Co., Ltd.
 1d20  SAMTACK INC.
 1d4d  PEGATRON CORPORATION
@@ -13513,7 +13644,19 @@
 1e1f  INVIA
 1e29  Festo AG & Co. KG
 	0101  CPX Adapter
-	0401  iL3-TP
+	0102  CPX Adapter >=HW10.09 [CP2102]
+	0401  iL3-TP [AT90USB646]
+	0402  FTDI232 [EasyPort]
+	0403  FTDI232 [EasyPort Mini]
+	0404  FTDI232 [Netzteil-GL]
+	0405  FTDI232 [MotorPrüfstand]
+	0406  STM32F103 [EasyKit]
+	0407  LPC2378 [Robotino]
+	0408  LPC2378 [Robotino-Arm]
+	0409  LPC2378 [Robotino-Arm Bootloader]
+	040a  LPC2378 [Robotino Bootloader]
+	0501  CP2102 [CMSP]
+	0601  CMMP-AS
 1e41  Cleverscope
 	0001  CS328A PC Oscilloscope
 1e54  TypeMatrix
@@ -13526,7 +13669,10 @@
 	6511  MP705-8G MP3 player
 	6512  MP705-4G
 1e7d  ROCCAT
+	2c24  Pyra Mouse (wired)
 	2ced  Kone Mouse
+	2d51  Kone+ Mouse
+	30d4  Arvo Keyboard
 1ebb  NuCORE Technology, Inc.
 1eda  AirTies Wireless Networks
 	2310  802.11n USB Wireless LAN Card
@@ -13543,6 +13689,7 @@
 	0002  Multi-touch HID Controller
 1fbd  Delphin Technology AG
 	0001  Expert Key - Data aquisition system
+1fc9  NXP Semiconductors
 1fe7  Vertex Wireless Co., Ltd.
 	1000  VW100 series CDMA EV-DO Rev.A modem
 2001  D-Link Corp.
@@ -13550,15 +13697,15 @@
 	0201  DHN-120 10Mb Home Phoneline Adapter
 	1a00  10/100 Ethernet
 	200c  10/100 Ethernet
-	3200  DWL-120 802.11b (Atmel RFMD503A) [usbvnetr]
+	3200  DWL-120 802.11b Wireless Adapter(rev.E1) [Atmel at76c503a]
 	3301  DWA-130 802.11n Wireless N Adapter(rev.C1) [Realtek RTL8192U]
 	3500  Elitegroup Computer Systems WLAN card WL-162
 	3700  DWL-122 802.11b [Intersil Prism 3]
 	3701  DWL-G120 Spinnaker 802.11g [Intersil ISL3886]
-	3702  DWL-120 rev F
+	3702  DWL-120 802.11b Wireless Adapter(rev.F) [Intersil ISL3871]
 	3703  AirPlus G DWL-G122 Wireless Adapter [Intersil ISL3886]
 	3704  AirPlus G DWL-G122 Wireless Adapter(rev.A2) [Intersil ISL3887]
-	3705  AirPlus G DWL-G120 Wireless Adapter(rev.C)
+	3705  AirPlus G DWL-G120 Wireless Adapter(rev.C) [Intersil ISL3887]
 	3761  IEEE 802.11g USB2.0 Wireless Network Adapter-PN
 	3a00  DWL-AG132 [Atheros AR5523]
 	3a01  DWL-AG132 (no firmware) [Atheros AR5523]
@@ -13570,7 +13717,7 @@
 	3a81  predator Bootloader Download
 	3a82  AirPremier AG DWL-AG132 Wireless Adapter
 	3a83  predator Bootloader Download
-	3b00  AirPlus DWL-120+ Wireless Adapter
+	3b00  AirPlus DWL-120+ Wireless Adapter [Texas Instruments ACX100USB]
 	3b01  WLAN Boot Device
 	3c00  AirPlus G DWL-G122 Wireless Adapter(rev.B1) [Ralink RT2500USB]
 	3c01  AirPlus AG DWL-AG122 Wireless Adapter
@@ -13672,6 +13819,8 @@
 20b1  XMOS Ltd
 	10ad  XUSB Loader
 	f7d1  XTAG2 - JTAG Adapter
+20b3  Hanvon
+	0a18  10.1 Touch screen overlay
 20b7  Qi Hardware
 	0713  Milkymist JTAG/serial
 	1540  ben-wpan, AT86RF230-based
@@ -13687,6 +13836,10 @@
 	2031  Network Blaster Wireless Adapter
 	500c  DE5771 Modem Blaster
 	8001  Broadxent BritePort DSL Bridge 8010U
+2184  GW Instek
+	0005  GDS-3000 Oscilloscope
+	0006  GDS-3000 Oscilloscope
+	0011  AFG Function Generator (CDC)
 21a1  Emotiv Systems Pty. Ltd.
 	0001  EPOC Consumer Headset Wireless Dongle
 21d6  Agecodagis SARL
@@ -13736,6 +13889,7 @@
 	2a83  MSM6025 chipset flash
 	2ac1  MSM6100 chipset
 	2ac3  MSM6100 chipset flash
+	2d78  XT300[SPICE]
 	3001  A835/E1000 GSM Phone (P2K)
 	3002  A835/E1000 GSM Phone (AT)
 	3801  C350L/C450 (P2K)
@@ -14124,6 +14278,9 @@
 	9394  Game Cube USB Memory Adaptor 64M
 4752  Miditech
 	0011  Midistart-2
+4757  GW Instek
+	2009  PEL-2000 Series Electronic Load (CDC)
+	2010  PEL-2000 Series Electronic Load (CDC)
 4766  Aceeca
 	0001  MEZ1000 RDA
 4855  Memorex
@@ -14205,6 +14362,9 @@
 	0284  802.11a/b/g/n USB Wireless LAN Card
 	0290  ZW-N290 802.11n [Realtek RTL8192SU]
 	5257  Metronic 495257 wifi 802.11ng
+6000  Beholder International Ltd.
+	dec0  TV Wander
+	dec1  TV Voyage
 601a  Ingenic Semiconductor Ltd.
 	4740  XBurst Jz4740 boot mode
 6189  Sitecom
@@ -14245,9 +14405,12 @@
 	7711  EW-7711UTn nLite Wireless Adapter [Ralink RT2870]
 	7717  EW-7717UN 802.11n Wireless Adapter [Ralink RT2870]
 	7718  EW-7718UN 802.11n Wireless Adapter [Ralink RT2870]
+	7722  EW-7722UTn 802.11n Wireless Adapter [Ralink RT307x]
 	7811  EW-7811Un 802.11n Wireless Adapter [Realtek RTL8188CUS]
 8086  Intel Corp.
 	0001  AnyPoint (TM) Home Network 1.6 Mbps Wireless Adapter
+	0044  CPU DRAM Controller
+	0046  HD Graphics
 	0100  Personal Audio Player 3000
 	0101  Personal Audio Player 3000
 	0110  Easy PC Camera
@@ -14275,6 +14438,7 @@
 	1403  WiMAX Connection 2400m
 	1405  WiMAX Connection 2400m
 	1406  WiMAX Connection 2400m
+	2448  82801 PCI Bridge
 	3100  PRO/DSL 3220 Modem - WAN
 	3101  PRO/DSL 3220 Modem
 	3240  AnyPoint® 3240 Modem - WAN
@@ -14312,8 +14476,10 @@
 	7715  MCS7715 Parallel and serial port adapter
 	7717  MCS7717 3-port hub with serial and parallel adapter
 	7720  MCS7720 Dual serial port adapter
+	7730  MCS7730 10/100 Mbps Ethernet adapter
 	7780  MCS7780 4Mbps Fast IrDA Adapter
 	7830  MCS7830 10/100 Mbps Ethernet adapter
+	7832  MCS7832 10/100 Mbps Ethernet adapter
 	7840  MCS7820/MCS7840 2/4 port serial adapter
 99fa  Grandtec
 	8988  V.cap Camera Device
@@ -14340,7 +14506,7 @@
 a600  Asix
 	e110  OK1ZIA Davac 4.x
 a727  3Com
-	6893  AR5523
+	6893  3CRUSB20075 OfficeConnect Wireless 108Mbps 11g Adapter [Atheros AR5523]
 	6895  AR5523
 	6897  AR5523
 abcd  Unknown
@@ -14378,6 +14544,7 @@
 	2776  Combined audio and video input device
 	2800  Terratec Cinergy 200
 	2801  GrabBeeX+ Video Encoder
+	2863  Video Grabber
 	2870  Pinnacle PCTV Stick
 	2881  EM2881 Video Controller
 	50a3  Gadmei UTV380 TV Box
--- usbutils-001.orig/usbhid-dump/Makefile.in
+++ usbutils-001/usbhid-dump/Makefile.in
@@ -159,9 +159,12 @@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBUSB_CFLAGS = @LIBUSB_CFLAGS@
+LIBUSB_LIBS = @LIBUSB_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
@@ -178,6 +181,9 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -245,7 +251,7 @@
 .SUFFIXES:
 am--refresh:
 	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -272,9 +278,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	$(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
 
@@ -287,7 +293,7 @@
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in:  $(am__configure_deps) 
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
 	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
 	rm -f stamp-h1
 	touch $@
--- usbutils-001.orig/usbhid-dump/configure
+++ usbutils-001/usbhid-dump/configure
@@ -1,11 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for usbhid-dump 1.0.
+# Generated by GNU Autoconf 2.67 for usbhid-dump 1.0.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -316,7 +316,7 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -356,19 +356,19 @@
 fi # as_fn_arith
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -679,7 +679,7 @@
 exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -743,6 +743,11 @@
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
+LIBUSB_LIBS
+LIBUSB_CFLAGS
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
+PKG_CONFIG
 CPP
 OTOOL64
 OTOOL
@@ -787,6 +792,9 @@
 LDFLAGS
 CFLAGS
 CC
+MAINT
+MAINTAINER_MODE_FALSE
+MAINTAINER_MODE_TRUE
 am__untar
 am__tar
 AMTAR
@@ -851,6 +859,7 @@
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+enable_maintainer_mode
 enable_dependency_tracking
 enable_shared
 enable_static
@@ -869,7 +878,12 @@
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP'
+CPP
+PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
+LIBUSB_CFLAGS
+LIBUSB_LIBS'
 
 
 # Initialize some variables set by options.
@@ -932,8 +946,9 @@
   fi
 
   case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -978,7 +993,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1004,7 +1019,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1208,7 +1223,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1224,7 +1239,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1254,8 +1269,8 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
     ;;
 
   *=*)
@@ -1263,7 +1278,7 @@
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
@@ -1281,13 +1296,13 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error "missing argument to $ac_option"
+  as_fn_error $? "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1310,7 +1325,7 @@
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1324,8 +1339,8 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1340,9 +1355,9 @@
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error "working directory cannot be determined"
+  as_fn_error $? "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error "pwd does not report name of working directory"
+  as_fn_error $? "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1381,11 +1396,11 @@
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1425,7 +1440,7 @@
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
+  -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1489,6 +1504,8 @@
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-maintainer-mode  enable make rules and dependencies not useful
+			  (and sometimes confusing) to the casual installer
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
   --enable-shared[=PKGS]  build shared libraries [default=yes]
@@ -1515,6 +1532,14 @@
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
+  PKG_CONFIG  path to pkg-config utility
+  PKG_CONFIG_PATH
+              directories to add to pkg-config's search path
+  PKG_CONFIG_LIBDIR
+              path overriding pkg-config's built-in search path
+  LIBUSB_CFLAGS
+              C compiler flags for LIBUSB, overriding pkg-config
+  LIBUSB_LIBS linker flags for LIBUSB, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1583,9 +1608,9 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 usbhid-dump configure 1.0
-generated by GNU Autoconf 2.65
+generated by GNU Autoconf 2.67
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1689,7 +1714,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1732,7 +1757,7 @@
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } >/dev/null && {
+  test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then :
@@ -1798,7 +1823,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1861,7 +1886,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by usbhid-dump $as_me 1.0, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
 
@@ -1971,11 +1996,9 @@
   {
     echo
 
-    cat <<\_ASBOX
-## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -2009,11 +2032,9 @@
 )
     echo
 
-    cat <<\_ASBOX
-## ----------------- ##
+    $as_echo "## ----------------- ##
 ## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
     echo
     for ac_var in $ac_subst_vars
     do
@@ -2026,11 +2047,9 @@
     echo
 
     if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
+      $as_echo "## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##
-_ASBOX
+## ------------------- ##"
       echo
       for ac_var in $ac_subst_files
       do
@@ -2044,11 +2063,9 @@
     fi
 
     if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
       echo
       cat confdefs.h
       echo
@@ -2103,7 +2120,12 @@
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
@@ -2118,7 +2140,11 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5 ; }
   fi
 done
 
@@ -2194,7 +2220,7 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -2209,16 +2235,22 @@
 
 ac_aux_dir=
 for ac_dir in auxdir "$srcdir"/auxdir; do
-  for ac_t in install-sh install.sh shtool; do
-    if test -f "$ac_dir/$ac_t"; then
-      ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
-      break 2
-    fi
-  done
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error "cannot find install-sh, install.sh, or shtool in auxdir \"$srcdir\"/auxdir" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in auxdir \"$srcdir\"/auxdir" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -2336,11 +2368,11 @@
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
 esac
 
 # Do `set' in a subshell so we don't clobber the current shell's
@@ -2362,7 +2394,7 @@
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
+      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" "$LINENO" 5
    fi
 
@@ -2372,7 +2404,7 @@
    # Ok.
    :
 else
-   as_fn_error "newly created file is older than distributed files!
+   as_fn_error $? "newly created file is older than distributed files!
 Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -2610,7 +2642,7 @@
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -2618,7 +2650,7 @@
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -2652,7 +2684,7 @@
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
-    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
   fi
 fi
 
@@ -2708,6 +2740,29 @@
 
 
 
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+    # Check whether --enable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then :
+  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+else
+  USE_MAINTAINER_MODE=no
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
+$as_echo "$USE_MAINTAINER_MODE" >&6; }
+   if test $USE_MAINTAINER_MODE = yes; then
+  MAINTAINER_MODE_TRUE=
+  MAINTAINER_MODE_FALSE='#'
+else
+  MAINTAINER_MODE_TRUE='#'
+  MAINTAINER_MODE_FALSE=
+fi
+
+  MAINT=$MAINTAINER_MODE_TRUE
+
+
 ac_config_headers="$ac_config_headers config.h"
 
 
@@ -3026,8 +3081,8 @@
 
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5 ; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3141,9 +3196,8 @@
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "C compiler cannot create executables
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -3185,8 +3239,8 @@
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3243,9 +3297,9 @@
     else
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
+as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
     fi
   fi
 fi
@@ -3296,8 +3350,8 @@
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -3734,7 +3788,7 @@
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
@@ -3745,16 +3799,16 @@
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -3779,7 +3833,7 @@
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
@@ -3787,7 +3841,7 @@
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -3860,7 +3914,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_SED"; then
-    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
   fi
 else
   ac_cv_path_SED=$SED
@@ -3936,7 +3990,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_GREP"; then
-    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_GREP=$GREP
@@ -4002,7 +4056,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_EGREP=$EGREP
@@ -4069,7 +4123,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_FGREP"; then
-    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_FGREP=$FGREP
@@ -4185,7 +4239,7 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if test "${lt_cv_prog_gnu_ld+set}" = set; then :
@@ -4387,13 +4441,13 @@
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4390: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4444: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4393: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4447: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4396: output\"" >&5)
+  (eval echo "\"\$as_me:4450: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5599,7 +5653,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5602 "configure"' > conftest.$ac_ext
+  echo '#line 5656 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -6388,7 +6442,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -6404,11 +6458,11 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
@@ -6447,7 +6501,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -6463,18 +6517,18 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 
 ac_ext=c
@@ -6603,8 +6657,7 @@
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
 "
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -7129,11 +7182,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7132: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7185: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7136: \$? = $ac_status" >&5
+   echo "$as_me:7189: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7468,11 +7521,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7471: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7524: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7475: \$? = $ac_status" >&5
+   echo "$as_me:7528: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7573,11 +7626,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7576: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7629: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7580: \$? = $ac_status" >&5
+   echo "$as_me:7633: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -7628,11 +7681,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7631: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7684: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7635: \$? = $ac_status" >&5
+   echo "$as_me:7688: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9995,7 +10048,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 9998 "configure"
+#line 10051 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10091,7 +10144,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10094 "configure"
+#line 10147 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10322,58 +10375,217 @@
 #
 # Checks for libraries.
 #
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb_init in -lusb-1.0" >&5
-$as_echo_n "checking for libusb_init in -lusb-1.0... " >&6; }
-if test "${ac_cv_lib_usb_1_0_libusb_init+set}" = set; then :
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lusb-1.0  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char libusb_init ();
-int
-main ()
-{
-return libusb_init ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_usb_1_0_libusb_init=yes
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  ac_cv_lib_usb_1_0_libusb_init=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+
+
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb_1_0_libusb_init" >&5
-$as_echo "$ac_cv_lib_usb_1_0_libusb_init" >&6; }
-if test "x$ac_cv_lib_usb_1_0_libusb_init" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBUSB_1_0 1
-_ACEOF
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
-  LIBS="-lusb-1.0 $LIBS"
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
 else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.9.0
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
+fi
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBUSB" >&5
+$as_echo_n "checking for LIBUSB... " >&6; }
+
+if test -n "$LIBUSB_CFLAGS"; then
+    pkg_cv_LIBUSB_CFLAGS="$LIBUSB_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb-1.0 >= 1.0.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libusb-1.0 >= 1.0.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBUSB_CFLAGS=`$PKG_CONFIG --cflags "libusb-1.0 >= 1.0.0" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$LIBUSB_LIBS"; then
+    pkg_cv_LIBUSB_LIBS="$LIBUSB_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb-1.0 >= 1.0.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libusb-1.0 >= 1.0.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBUSB_LIBS=`$PKG_CONFIG --libs "libusb-1.0 >= 1.0.0" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        LIBUSB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libusb-1.0 >= 1.0.0" 2>&1`
+        else
+	        LIBUSB_PKG_ERRORS=`$PKG_CONFIG --print-errors "libusb-1.0 >= 1.0.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$LIBUSB_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (libusb-1.0 >= 1.0.0) were not met:
+
+$LIBUSB_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables LIBUSB_CFLAGS
+and LIBUSB_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "libusb is required, but was not found, abort.
-                     Try installing libusb-1.0-0-dev package.
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables LIBUSB_CFLAGS
+and LIBUSB_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5 ; }
+else
+	LIBUSB_CFLAGS=$pkg_cv_LIBUSB_CFLAGS
+	LIBUSB_LIBS=$pkg_cv_LIBUSB_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
 fi
 
 
+
 #
 # Checks for features
 #
@@ -10503,6 +10715,7 @@
 
 ac_libobjs=
 ac_ltlibobjs=
+U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -10525,12 +10738,16 @@
   am__EXEEXT_FALSE=
 fi
 
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error "conditional \"AMDEP\" was never defined.
+  as_fn_error $? "conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepCC\" was never defined.
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
@@ -10680,19 +10897,19 @@
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -10888,7 +11105,7 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -10942,7 +11159,7 @@
 # values after options handling.
 ac_log="
 This file was extended by usbhid-dump $as_me 1.0, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -11008,10 +11225,10 @@
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 usbhid-dump config.status 1.0
-configured by $0, generated by GNU Autoconf 2.65,
+configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -11029,11 +11246,16 @@
 while test $# != 0
 do
   case $1 in
-  --*=*)
+  --*=?*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -11055,6 +11277,7 @@
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -11067,7 +11290,7 @@
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    as_fn_error "ambiguous option: \`$1'
+    as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
@@ -11076,7 +11299,7 @@
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error "unrecognized option: \`$1'
+  -*) as_fn_error $? "unrecognized option: \`$1'
 Try \`$0 --help' for more information." ;;
 
   *) as_fn_append ac_config_targets " $1"
@@ -11394,7 +11617,7 @@
     "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
 
-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
   esac
 done
 
@@ -11432,7 +11655,7 @@
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -11449,7 +11672,7 @@
 fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\r'
+  ac_cs_awk_cr='\\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
@@ -11463,18 +11686,18 @@
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -11563,20 +11786,28 @@
 else
   cat
 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
 s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
@@ -11604,7 +11835,7 @@
   if test -z "$ac_t"; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -11689,7 +11920,7 @@
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error "could not setup config headers machinery" "$LINENO" 5
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
 
@@ -11702,7 +11933,7 @@
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -11730,7 +11961,7 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -11757,7 +11988,7 @@
 
     case $ac_tag in
     *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
     esac
     ;;
   esac
@@ -11894,22 +12125,22 @@
 $ac_datarootdir_hack
 "
 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
+which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
+which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
   -) cat "$tmp/out" && rm -f "$tmp/out";;
   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
   esac \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
@@ -11920,19 +12151,19 @@
       $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
     } >"$tmp/config.h" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$tmp/config.h" "$ac_file" \
-	|| as_fn_error "could not create $ac_file" "$LINENO" 5
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error "could not create -" "$LINENO" 5
+      || as_fn_error $? "could not create -" "$LINENO" 5
   fi
 # Compute "$ac_file"'s index in $config_headers.
 _am_arg="$ac_file"
@@ -12716,7 +12947,7 @@
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -12737,7 +12968,7 @@
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit $?
+  $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
--- usbutils-001.orig/usbhid-dump/aclocal.m4
+++ usbutils-001/usbhid-dump/aclocal.m4
@@ -13,12 +13,170 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-[m4_warning([this file was generated for autoconf 2.65.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
+[m4_warning([this file was generated for autoconf 2.67.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
+# 
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_default([$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+   	AC_MSG_RESULT([no])
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT])[]dnl
+        ])
+elif test $pkg_failed = untried; then
+     	AC_MSG_RESULT([no])
+	m4_default([$4], [AC_MSG_FAILURE(
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+        ])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	$3
+fi[]dnl
+])# PKG_CHECK_MODULES
+
 # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -587,6 +745,46 @@
 rmdir .tst 2>/dev/null
 AC_SUBST([am__leading_dot])])
 
+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
+# From Jim Meyering
+
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 5
+
+# AM_MAINTAINER_MODE([DEFAULT-MODE])
+# ----------------------------------
+# Control maintainer-specific portions of Makefiles.
+# Default is to disable them, unless `enable' is passed literally.
+# For symmetry, `disable' may be passed as well.  Anyway, the user
+# can override the default with the --enable/--disable switch.
+AC_DEFUN([AM_MAINTAINER_MODE],
+[m4_case(m4_default([$1], [disable]),
+       [enable], [m4_define([am_maintainer_other], [disable])],
+       [disable], [m4_define([am_maintainer_other], [enable])],
+       [m4_define([am_maintainer_other], [enable])
+        m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
+AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
+  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
+  AC_ARG_ENABLE([maintainer-mode],
+[  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
+			  (and sometimes confusing) to the casual installer],
+      [USE_MAINTAINER_MODE=$enableval],
+      [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
+  MAINT=$MAINTAINER_MODE_TRUE
+  AC_SUBST([MAINT])dnl
+]
+)
+
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
 # Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
--- usbutils-001.orig/usbhid-dump/config.h.in
+++ usbutils-001/usbhid-dump/config.h.in
@@ -6,9 +6,6 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
-/* Define to 1 if you have the `usb-1.0' library (-lusb-1.0). */
-#undef HAVE_LIBUSB_1_0
-
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
--- usbutils-001.orig/usbhid-dump/configure.ac
+++ usbutils-001/usbhid-dump/configure.ac
@@ -23,6 +23,7 @@
 AC_INIT([usbhid-dump], [1.0])
 AC_CONFIG_AUX_DIR([auxdir])
 AM_INIT_AUTOMAKE([1.9 -Wall foreign])
+AM_MAINTAINER_MODE
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -47,10 +48,9 @@
 #
 # Checks for libraries.
 #
-AC_CHECK_LIB(
-    [usb-1.0], [libusb_init], [],
-    [AC_MSG_FAILURE([libusb is required, but was not found, abort.
-                     Try installing libusb-1.0-0-dev package.])])
+PKG_CHECK_MODULES(LIBUSB, libusb-1.0 >= 1.0.0)
+AC_SUBST(LIBUSB_CFLAGS)
+AC_SUBST(LIBUSB_LIBS)
 
 #
 # Checks for features
--- usbutils-001.orig/usbhid-dump/src/Makefile.in
+++ usbutils-001/usbhid-dump/src/Makefile.in
@@ -68,9 +68,11 @@
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
 PROGRAMS = $(bin_PROGRAMS)
-am_usbhid_dump_OBJECTS = usbhid-dump.$(OBJEXT)
+am_usbhid_dump_OBJECTS = usbhid_dump-usbhid-dump.$(OBJEXT)
 usbhid_dump_OBJECTS = $(am_usbhid_dump_OBJECTS)
-usbhid_dump_DEPENDENCIES = ../lib/libusbhid_dump.la
+am__DEPENDENCIES_1 =
+usbhid_dump_DEPENDENCIES = ../lib/libusbhid_dump.la \
+	$(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/auxdir/depcomp
 am__depfiles_maybe = depfiles
@@ -123,9 +125,12 @@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBUSB_CFLAGS = @LIBUSB_CFLAGS@
+LIBUSB_LIBS = @LIBUSB_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
@@ -142,6 +147,9 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -201,12 +209,13 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 usbhid_dump_SOURCES = usbhid-dump.c
-usbhid_dump_LDADD = ../lib/libusbhid_dump.la
+usbhid_dump_CPPFLAGS = $(LIBUSB_CFLAGS)
+usbhid_dump_LDADD = ../lib/libusbhid_dump.la $(LIBUSB_LIBS)
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -231,9 +240,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
@@ -289,7 +298,7 @@
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usbhid-dump.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usbhid_dump-usbhid-dump.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -312,6 +321,20 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+usbhid_dump-usbhid-dump.o: usbhid-dump.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(usbhid_dump_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT usbhid_dump-usbhid-dump.o -MD -MP -MF $(DEPDIR)/usbhid_dump-usbhid-dump.Tpo -c -o usbhid_dump-usbhid-dump.o `test -f 'usbhid-dump.c' || echo '$(srcdir)/'`usbhid-dump.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/usbhid_dump-usbhid-dump.Tpo $(DEPDIR)/usbhid_dump-usbhid-dump.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usbhid-dump.c' object='usbhid_dump-usbhid-dump.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(usbhid_dump_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o usbhid_dump-usbhid-dump.o `test -f 'usbhid-dump.c' || echo '$(srcdir)/'`usbhid-dump.c
+
+usbhid_dump-usbhid-dump.obj: usbhid-dump.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(usbhid_dump_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT usbhid_dump-usbhid-dump.obj -MD -MP -MF $(DEPDIR)/usbhid_dump-usbhid-dump.Tpo -c -o usbhid_dump-usbhid-dump.obj `if test -f 'usbhid-dump.c'; then $(CYGPATH_W) 'usbhid-dump.c'; else $(CYGPATH_W) '$(srcdir)/usbhid-dump.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/usbhid_dump-usbhid-dump.Tpo $(DEPDIR)/usbhid_dump-usbhid-dump.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='usbhid-dump.c' object='usbhid_dump-usbhid-dump.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(usbhid_dump_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o usbhid_dump-usbhid-dump.obj `if test -f 'usbhid-dump.c'; then $(CYGPATH_W) 'usbhid-dump.c'; else $(CYGPATH_W) '$(srcdir)/usbhid-dump.c'; fi`
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
--- usbutils-001.orig/usbhid-dump/src/Makefile.am
+++ usbutils-001/usbhid-dump/src/Makefile.am
@@ -19,4 +19,5 @@
 bin_PROGRAMS = usbhid-dump
 
 usbhid_dump_SOURCES = usbhid-dump.c
-usbhid_dump_LDADD = ../lib/libusbhid_dump.la
+usbhid_dump_CPPFLAGS = $(LIBUSB_CFLAGS)
+usbhid_dump_LDADD = ../lib/libusbhid_dump.la $(LIBUSB_LIBS)
--- usbutils-001.orig/usbhid-dump/src/usbhid-dump.c
+++ usbutils-001/usbhid-dump/src/usbhid-dump.c
@@ -38,7 +38,7 @@
 #include <unistd.h>
 #include <getopt.h>
 #include <stdio.h>
-#include <libusb-1.0/libusb.h>
+#include <libusb.h>
 
 /**
  * Maximum descriptor size.
--- usbutils-001.orig/usbhid-dump/lib/Makefile.in
+++ usbutils-001/usbhid-dump/lib/Makefile.in
@@ -67,7 +67,8 @@
 CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libusbhid_dump_la_LIBADD =
-am_libusbhid_dump_la_OBJECTS = iface.lo libusb.lo str.lo
+am_libusbhid_dump_la_OBJECTS = libusbhid_dump_la-iface.lo \
+	libusbhid_dump_la-libusb.lo libusbhid_dump_la-str.lo
 libusbhid_dump_la_OBJECTS = $(am_libusbhid_dump_la_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/auxdir/depcomp
@@ -121,9 +122,12 @@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBUSB_CFLAGS = @LIBUSB_CFLAGS@
+LIBUSB_LIBS = @LIBUSB_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
@@ -140,6 +144,9 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -204,11 +211,12 @@
     libusb.c                \
     str.c
 
+libusbhid_dump_la_CPPFLAGS = $(LIBUSB_CFLAGS)
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -233,9 +241,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
@@ -256,9 +264,9 @@
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iface.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libusb.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libusbhid_dump_la-iface.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libusbhid_dump_la-libusb.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libusbhid_dump_la-str.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -281,6 +289,27 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+libusbhid_dump_la-iface.lo: iface.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libusbhid_dump_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libusbhid_dump_la-iface.lo -MD -MP -MF $(DEPDIR)/libusbhid_dump_la-iface.Tpo -c -o libusbhid_dump_la-iface.lo `test -f 'iface.c' || echo '$(srcdir)/'`iface.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libusbhid_dump_la-iface.Tpo $(DEPDIR)/libusbhid_dump_la-iface.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iface.c' object='libusbhid_dump_la-iface.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libusbhid_dump_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libusbhid_dump_la-iface.lo `test -f 'iface.c' || echo '$(srcdir)/'`iface.c
+
+libusbhid_dump_la-libusb.lo: libusb.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libusbhid_dump_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libusbhid_dump_la-libusb.lo -MD -MP -MF $(DEPDIR)/libusbhid_dump_la-libusb.Tpo -c -o libusbhid_dump_la-libusb.lo `test -f 'libusb.c' || echo '$(srcdir)/'`libusb.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libusbhid_dump_la-libusb.Tpo $(DEPDIR)/libusbhid_dump_la-libusb.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='libusb.c' object='libusbhid_dump_la-libusb.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libusbhid_dump_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libusbhid_dump_la-libusb.lo `test -f 'libusb.c' || echo '$(srcdir)/'`libusb.c
+
+libusbhid_dump_la-str.lo: str.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libusbhid_dump_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libusbhid_dump_la-str.lo -MD -MP -MF $(DEPDIR)/libusbhid_dump_la-str.Tpo -c -o libusbhid_dump_la-str.lo `test -f 'str.c' || echo '$(srcdir)/'`str.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libusbhid_dump_la-str.Tpo $(DEPDIR)/libusbhid_dump_la-str.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='str.c' object='libusbhid_dump_la-str.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libusbhid_dump_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libusbhid_dump_la-str.lo `test -f 'str.c' || echo '$(srcdir)/'`str.c
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
--- usbutils-001.orig/usbhid-dump/lib/Makefile.am
+++ usbutils-001/usbhid-dump/lib/Makefile.am
@@ -22,3 +22,5 @@
     iface.c                 \
     libusb.c                \
     str.c
+
+libusbhid_dump_la_CPPFLAGS = $(LIBUSB_CFLAGS)
--- usbutils-001.orig/usbhid-dump/include/Makefile.in
+++ usbutils-001/usbhid-dump/include/Makefile.in
@@ -141,9 +141,12 @@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBUSB_CFLAGS = @LIBUSB_CFLAGS@
+LIBUSB_LIBS = @LIBUSB_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
@@ -160,6 +163,9 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -222,7 +228,7 @@
 all: all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -247,9 +253,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
--- usbutils-001.orig/usbhid-dump/include/usbhid_dump/Makefile.in
+++ usbutils-001/usbhid-dump/include/usbhid_dump/Makefile.in
@@ -106,9 +106,12 @@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBUSB_CFLAGS = @LIBUSB_CFLAGS@
+LIBUSB_LIBS = @LIBUSB_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
@@ -125,6 +128,9 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -191,7 +197,7 @@
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -216,9 +222,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
--- usbutils-001.orig/usbhid-dump/include/usbhid_dump/libusb.h
+++ usbutils-001/usbhid-dump/include/usbhid_dump/libusb.h
@@ -27,7 +27,7 @@
 #ifndef __USBHID_DUMP_LIBUSB_H__
 #define __USBHID_DUMP_LIBUSB_H__
 
-#include <libusb-1.0/libusb.h>
+#include <libusb.h>
 
 #ifdef __cplusplus
 extern "C" {
--- usbutils-001.orig/usbhid-dump/include/usbhid_dump/iface.h
+++ usbutils-001/usbhid-dump/include/usbhid_dump/iface.h
@@ -28,7 +28,7 @@
 #define __USBHID_DUMP_IFACE_H__
 
 #include <stdbool.h>
-#include <libusb-1.0/libusb.h>
+#include <libusb.h>
 
 #ifdef __cplusplus
 extern "C" {
--- usbutils-001.orig/debian/usbutils.manpages
+++ usbutils-001/debian/usbutils.manpages
@@ -0,0 +1 @@
+debian/update-usbids.8
--- usbutils-001.orig/debian/copyright
+++ usbutils-001/debian/copyright
@@ -0,0 +1,34 @@
+This package was debianized by Christopher L Cheney <ccheney@debian.org> on
+Wed, 13 Jun 2001 11:20:06 -0500.
+
+It was downloaded from http://www.linux-usb.org/
+
+Upstream Authors:
+  Thomas Sailer <sailer@ife.ee.ethz.ch>
+  Johannes Erdfelt <johannes@sventech.com>
+
+Copyright:
+  Copyright (C) 1999-2001, 2003 Thomas Sailer (t.sailer@alumni.ethz.ch)
+  Copyright (C) 2003-2005 David Brownell
+  Copyright (C) 2003 Aurelien Jarno (aurelien@aurel32.net)
+
+License:
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+ 
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+  MA 02110-1301 USA.
+
+On Debian systems, the complete text of the GNU General Public
+License, version 2, can be found in /usr/share/common-licenses/GPL-2.
+
--- usbutils-001.orig/debian/README.Debian
+++ usbutils-001/debian/README.Debian
@@ -0,0 +1,9 @@
+README.Debian for usbutils
+--------------------------
+
+The USB ID's database (/var/lib/usbutils/usb.ids) comes from
+http://www.linux-usb.org/usb.ids.  In case one of your USB devices
+does not appear in the database you can submit the USB ID's and the 
+corresponding description via http://www.linux-usb.org/usb-ids.html
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sun, 25 Apr 2010 11:55:31 +0200
--- usbutils-001.orig/debian/control
+++ usbutils-001/debian/control
@@ -0,0 +1,38 @@
+Source: usbutils
+Section: utils
+Priority: optional
+Maintainer: Aurelien Jarno <aurel32@debian.org>
+Build-Depends: debhelper (>> 5.0.22), autotools-dev, libusb-1.0-0-dev, pkg-config, zlib1g-dev
+Standards-Version: 3.9.1
+
+Package: usbutils
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: wget (>= 1.8.1-6) | lynx (>= 2.8.4.1b-3)
+Description: Linux USB utilities 
+ This package contains the lsusb utility for inspecting the devices 
+ connected to the USB bus. It shows a graphical representation of the
+ devices that are currently plugged in, showing the topology of the 
+ USB bus. It also displays information on each individual device on
+ the bus.
+ .
+ More information can be found at the Linux USB web site
+ http://www.linux-usb.org/ .
+
+Package: usbutils-udeb
+XC-Package-Type: udeb
+Section: debian-installer
+Priority: optional
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Linux USB utilities 
+ This package contains the lsusb utility for inspecting the devices 
+ connected to the USB bus. It shows a graphical representation of the
+ devices that are currently plugged in, showing the topology of the 
+ USB bus. It also displays information on each individual device on
+ the bus.
+ .
+ More information can be found at the Linux USB web site
+ http://www.linux-usb.org/ .
+ .
+ This is a minimal package for use in debian-installer.
--- usbutils-001.orig/debian/usbutils.dirs
+++ usbutils-001/debian/usbutils.dirs
@@ -0,0 +1,2 @@
+usr/sbin
+usr/share/man/man8
--- usbutils-001.orig/debian/usbutils-udeb.dirs
+++ usbutils-001/debian/usbutils-udeb.dirs
@@ -0,0 +1,2 @@
+usr/bin
+usr/share/misc
--- usbutils-001.orig/debian/changelog
+++ usbutils-001/debian/changelog
@@ -0,0 +1,566 @@
+usbutils (1:001-1) unstable; urgency=low
+
+  * New upstream version, with new version numbering system.
+  * Switch build-dependencies from libusb-dev to libusb-1.0-0-dev.
+  * Update usb.ids.
+  * Fix 13fe:3100 entry, 4GB versions of the device also exists.  
+    Closes: bug#599817.
+  * Bumped Standards-Version to 3.9.1 (no changes).
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sun, 06 Feb 2011 13:32:44 +0100
+
+usbutils (0.87-5) unstable; urgency=low
+
+  * Update usb.ids.  Closes: bug#587379.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Mon, 28 Jun 2010 06:13:12 +0200
+
+usbutils (0.87-4) unstable; urgency=low
+
+  * Update usb.ids.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Thu, 17 Jun 2010 09:00:46 +0200
+
+usbutils (0.87-3) unstable; urgency=low
+
+  * Fix DFU version endianness.  Closes: bug#582954. 
+
+ -- Aurelien Jarno <aurel32@debian.org>  Tue, 25 May 2010 00:05:31 +0200
+
+usbutils (0.87-2) unstable; urgency=low
+
+  * Update usb.ids. 
+  * Fix 16c0:05dc entry.  Closes: bug#582460.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Mon, 24 May 2010 22:07:37 +0200
+
+usbutils (0.87-1) unstable; urgency=low
+
+  * New upstream version.
+  * Update usb.ids.  Closes: bug#573734.
+  * Update README.Debian to reflect the new way to submit new usb.ids
+    entries.
+  * Backport a patch from upstream to decode USB 3 endpoint companion 
+    descriptors.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sun, 25 Apr 2010 12:00:59 +0200
+
+usbutils (0.86-4) unstable; urgency=low
+
+  * Correctly dump CCID info now that it is an official USB class and 
+    that devices start to use it with non-tagged descriptors.  Closes:
+    bug#569783.
+  * Update usb.ids.
+  * Bumped Standards-Version to 3.8.4 (no changes).
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sun, 14 Feb 2010 15:51:01 +0100
+
+usbutils (0.86-3) unstable; urgency=low
+
+  * Update usb.ids:
+    - Add Logitech Webcam C200 (046d:0802).  Closes: bug#564035.
+    - Add Verbatim External Hard Drive (18a5:0216).  Closes: bug#563085.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sun, 17 Jan 2010 21:18:36 +0100
+
+usbutils (0.86-2) unstable; urgency=low
+
+  * Install the usbutils.pc in the correct directory. 
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sun, 23 Aug 2009 23:42:04 +0200
+
+usbutils (0.86-1) unstable; urgency=low
+
+  * New upstream version:
+    - usb-devices has been to /usr/bin (closes: bug#539582).
+  * Update usb.ids from upstream.
+  * Bumped Standards-Version to 3.8.3 (no changes).
+
+ -- Aurelien Jarno <aurel32@debian.org>  Tue, 18 Aug 2009 06:55:29 +0200
+
+usbutils (0.84-1) unstable; urgency=low
+
+  * New upstream version (closes: bug#539484).
+  * Bumped Standards-Version to 3.8.2 (no changes).
+  * Add 147a:e017 and 14b2:3c05 entries to usb.ids (closes: bug#531274).
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sat, 01 Aug 2009 16:40:48 +0200
+
+usbutils (0.82-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Wed, 13 May 2009 08:59:51 +0000
+
+usbutils (0.81-1) unstable; urgency=low
+
+  * New upstream version. 
+    - Device tree option works with usbfs not mounted (closes: bug#498723).
+  * Improve manpage (closes: bug#506800).
+  * usb.ids:
+    - Fix entry about Netgear WG111 (0846:4240) (closes: bug#500706).
+    - Add Hewlett-Packard LaserJet P1005 (03f0:3d17) (closes: bug#525629).
+    - Add Benq X120 Internet Keyboard Pro (0d62:001c) (closes: bug#525628).
+    - Add Dexon Mouse (15d9:0a33) (closes: bug#525582).
+  * Bumped Standards-Version to 3.8.1 (no changes).
+
+ -- Aurelien Jarno <aurel32@debian.org>  Tue, 28 Apr 2009 23:24:30 +0200
+
+usbutils (0.73-10) unstable; urgency=low
+
+  * Fix a typo in README.Debian. 
+
+ -- Aurelien Jarno <aurel32@debian.org>  Wed, 13 Aug 2008 01:03:10 +0200
+
+usbutils (0.73-9) unstable; urgency=low
+
+  * Update usb.ids. 
+  * Add a README.Debian explaining how to submit new USB ID's.
+  * Bumped Standards-Version to 3.8.0 (no changes).
+
+ -- Aurelien Jarno <aurel32@debian.org>  Wed, 06 Aug 2008 22:47:04 +0200
+
+usbutils (0.73-8) unstable; urgency=low
+
+  * Update usb.ids. 
+  * Add CCU-550 USB modem to usb.ids (closes: bug#480484).
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sat, 10 May 2008 14:24:32 +0200
+
+usbutils (0.73-7) unstable; urgency=low
+
+  * Fix the last changelog entry, no code change. 
+
+ -- Aurelien Jarno <aurel32@debian.org>  Mon, 03 Mar 2008 14:42:52 +0100
+
+usbutils (0.73-6) unstable; urgency=low
+
+  * Bumped Standards-Version to 3.7.3 (no changes).
+  * Relax build-dependency on libusb-dev.
+  * Rework debian/copyright.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sun, 02 Mar 2008 19:06:45 +0100
+
+usbutils (0.73-5) unstable; urgency=low
+
+  * Fix broken link in /usr/share/misc/ (closes: bug#453363). 
+
+ -- Aurelien Jarno <aurel32@debian.org>  Thu, 29 Nov 2007 10:11:17 +0100
+
+usbutils (0.73-4) unstable; urgency=low
+
+  * Don't gzip usb.ids for the .deb package, as hal will use this file
+    and relies on it being non-gzipped (closes: bug#448803).
+  * usb.ids is still gzipped in the .udeb package.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Thu, 08 Nov 2007 14:33:14 +0100
+
+usbutils (0.73-3) unstable; urgency=low
+
+  * Use endian.h instead of asm/byteorder.h. Fix build on non-linux 
+    systems.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Wed, 24 Oct 2007 15:01:21 +0200
+
+usbutils (0.73-2) unstable; urgency=low
+
+  * Reupload the correct version (closes: bug#447851). 
+
+ -- Aurelien Jarno <aurel32@debian.org>  Wed, 24 Oct 2007 11:51:20 +0200
+
+usbutils (0.73-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Wed, 24 Oct 2007 00:44:38 +0200
+
+usbutils (0.72-9) unstable; urgency=low
+
+  * Update usb.ids. 
+  * Add Bison Acer Orbicam to usb.ids (closes: bug#425717).
+
+ -- Aurelien Jarno <aurel32@debian.org>  Wed, 12 Sep 2007 11:53:14 +0200
+
+usbutils (0.72-8) unstable; urgency=low
+
+  * Remove support for 2.4 kernels.
+  * Update the description (closes: bug#415411).
+
+ -- Aurelien Jarno <aurel32@debian.org>  Fri, 13 Apr 2007 16:18:51 +0200
+
+usbutils (0.72-7) unstable; urgency=medium
+
+  * Fix a typo in usb.ids.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Tue, 10 Oct 2006 11:30:48 +0200
+
+usbutils (0.72-6) unstable; urgency=low
+
+  * Added "HP DeskJet 6840" to usb.ids (closes: bug#382487).
+  * Added "Topro USB Mouse" and "Creative Labs Optical Mouse"
+    to usb.ids (closes: bug#387120).
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sun,  8 Oct 2006 18:01:44 +0200
+
+usbutils (0.72-5) unstable; urgency=low
+
+  * Added support for gzipped usb.ids files. This reduces the udeb unpacked
+    size by 100 kB.
+  * Updated usb.ids. 
+
+ -- Aurelien Jarno <aurel32@debian.org>  Wed,  2 Aug 2006 11:52:27 +0200
+
+usbutils (0.72-4) unstable; urgency=low
+
+  * Fix the parsing of bus number >= 08 in tree mode (closes: bug#373764). 
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sat, 17 Jun 2006 16:15:32 +0200
+
+usbutils (0.72-3) unstable; urgency=low
+
+  * This time, don't ship an empty deb package (closes: bug#368014).
+
+ -- Aurelien Jarno <aurel32@debian.org>  Fri, 19 May 2006 17:08:30 +0000
+
+usbutils (0.72-2) unstable; urgency=high
+
+  * Don't ship an empty udeb package. 
+  * Bumped Standards-Version to 3.7.2 (no changes).
+
+ -- Aurelien Jarno <aurel32@debian.org>  Wed, 17 May 2006 00:23:07 +0000
+
+usbutils (0.72-1) unstable; urgency=low
+
+  * New upstream version:
+    - usbmodules has been removed from upstream tarball. Continue to
+      maintain it in Debian, to support Sarge -> Etch upgrades.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sun, 23 Apr 2006 11:36:11 +0200
+
+usbutils (0.71+cvs20051029-5) unstable; urgency=low
+
+  * Use the new debhelper features to set dependencies for udeb. Thanks
+    to Frans Pop for the patch (closes: bug#360350).
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sat,  1 Apr 2006 23:48:35 +0200
+
+usbutils (0.71+cvs20051029-4) unstable; urgency=low
+
+  * Updated usb.ids.
+  * Added "HL-1430 Laser Printer".
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sat,  3 Dec 2005 00:15:41 +0100
+
+usbutils (0.71+cvs20051029-3) unstable; urgency=low
+
+  * Added a note that usbmodules is not useful on 2.4 kernels (closes:
+    bug#340548).
+
+ -- Aurelien Jarno <aurel32@debian.org>  Thu, 24 Nov 2005 20:07:13 +0100
+
+usbutils (0.71+cvs20051029-2) unstable; urgency=low
+
+  * Fix usb.ids location in lsusb man page (closes: bug#338854).
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sun, 13 Nov 2005 15:52:08 +0100
+
+usbutils (0.71+cvs20051029-1) unstable; urgency=low
+
+  * CVS snapshot:
+    - Support for video terminal tag added (closes: bug#336296).
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sat, 29 Oct 2005 12:36:07 +0200
+
+usbutils (0.71-7) unstable; urgency=low
+
+  * Fixed URL in debian/copyright (closes: bug#336039).
+
+ -- Aurelien Jarno <aurel32@debian.org>  Fri, 28 Oct 2005 01:20:54 +0200
+
+usbutils (0.71-6) unstable; urgency=low
+
+  * README.Debian is not really useful, remove it (closes: bug#329261).
+
+ -- Aurelien Jarno <aurel32@debian.org>  Tue, 20 Sep 2005 23:12:47 +0200
+
+usbutils (0.71-5) unstable; urgency=low
+
+  * Fixed parsing of bVoltageSupport. Thanks to Ludovic Rousseau for the patch
+    (closes: bug#314478).
+
+ -- Aurelien Jarno <aurel32@debian.org>  Mon, 20 Jun 2005 07:44:33 +0200
+
+usbutils (0.71-4) unstable; urgency=low
+
+  * Added KOBIL to usb.ids (closes: bug#314454).
+
+ -- Aurelien Jarno <aurel32@debian.org>  Fri, 17 Jun 2005 15:04:43 +0200
+
+usbutils (0.71-3) unstable; urgency=low
+
+  * Makes udeb depending on libusb-0.1-udeb instead of libusb-0.1-udeb 
+    instead of libusb-0.1-4.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sun,  5 Jun 2005 22:55:54 +0200
+
+usbutils (0.71-2) unstable; urgency=low
+
+  * Also produce an udeb package. Patch by Colin Watson (closes: 
+    bug#311653). 
+  * Added fix for dpkg-dev >= 1.13.2 (closes: bug#311655).
+  * Added HP OfficeJet 5510 to usb.ids (closes: bug#311656).
+
+ -- Aurelien Jarno <aurel32@debian.org>  Thu,  2 Jun 2005 17:15:02 +0200
+
+usbutils (0.71-1) unstable; urgency=low
+
+  * New upstream version. 
+
+ -- Aurelien Jarno <aurel32@debian.org>  Thu, 19 May 2005 00:28:37 +0200
+
+usbutils (0.70-8) unstable; urgency=low
+
+  * Added some webcams to usb.ids (closes: bug#305022). 
+
+ -- Aurelien Jarno <aurel32@debian.org>  Fri, 22 Apr 2005 19:14:16 +0200
+
+usbutils (0.70-7) unstable; urgency=low
+
+  * Fixed USB IDs for Zaurus C-860 (closes: bug#304818). 
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sat, 16 Apr 2005 00:24:19 +0200
+
+usbutils (0.70-6) unstable; urgency=low
+
+  * Added Labtec Wireless Optical Mouse to usb.ids.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Fri, 15 Apr 2005 12:15:59 +0200
+
+usbutils (0.70-5) unstable; urgency=low
+
+  * Only suggests wget or lynx instead of depending on it 
+    (closes: bug#30492).
+
+ -- Aurelien Jarno <aurel32@debian.org>  Fri,  1 Apr 2005 08:04:08 +0200
+
+usbutils (0.70-4) unstable; urgency=low
+
+  * Fixed manpage (closes: bug#302144). 
+
+ -- Aurelien Jarno <aurel32@debian.org>  Wed, 30 Mar 2005 12:19:08 +0200
+
+usbutils (0.70-3) unstable; urgency=low
+
+  * Updated usb.ids
+  * Read USB IDs as hexa instead of autodetecting.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Mon, 28 Mar 2005 19:58:24 +0200
+
+usbutils (0.70-2) unstable; urgency=low
+
+  * Only build usbmodules on systems using a Linux kernel. 
+
+ -- Aurelien Jarno <aurel32@debian.org>  Thu, 17 Mar 2005 18:13:49 +0100
+
+usbutils (0.70-1) unstable; urgency=medium
+
+  * New upstream version. This is basically the same as the CVS version 
+    used before, with some autoconf/automake update as well as gcc 4.0 
+    fixes. It only makes official changes that were already in the Debian
+    package.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sun, 23 Jan 2005 14:54:53 +0100
+
+usbutils (0.11+cvs20041108-1) unstable; urgency=medium
+
+  * New CVS version.
+  * Set umask before downloading a new usb.ids (closes: bug#280232).
+
+ -- Aurelien Jarno <aurel32@debian.org>  Mon,  8 Nov 2004 16:33:32 +0000
+
+usbutils (0.11+cvs20041016-5) unstable; urgency=high
+
+  * Fixed postinst so no error message is output (closes: bug#279217).
+
+ -- Aurelien Jarno <aurel32@debian.org>  Mon,  1 Nov 2004 14:36:20 +0000
+
+usbutils (0.11+cvs20041016-4) unstable; urgency=high
+
+  * Fixed update-usbids (closes: bug#278935).
+  * Move /usr/share/misc/usb.ids.old to /var/lib/usbutils during postinst
+    (closes: bug#278936).
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sat, 30 Oct 2004 19:45:29 +0000
+
+usbutils (0.11+cvs20041016-3) unstable; urgency=high
+
+  * Moved usb.ids to /var/lib/usbutils to be FHS compliant (closes:
+    bug#278480). 
+
+ -- Aurelien Jarno <aurel32@debian.org>  Wed, 27 Oct 2004 09:54:27 +0000
+
+usbutils (0.11+cvs20041016-2) unstable; urgency=high
+
+  * Moved usb.ids to /var/share/misc (closes: bug#278480).
+  * Added a symlink in /usr/share/misc for backward compatibility.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Wed, 27 Oct 2004 07:55:06 +0000
+
+usbutils (0.11+cvs20041016-1) unstable; urgency=low
+
+  * New CVS version:
+    - USB 2.0 updates for dual-speed and OTG devices, hubs.
+    - Display all descriptors in the right sequence, and dump ones
+      we don't (yet) recognize.  
+    - Minor cleanups.
+    - usb.ids updated.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sat, 16 Oct 2004 14:28:18 +0200
+
+usbutils (0.11+cvs20040318-3) unstable; urgency=low
+
+  * Read the HID descriptors table using USB_RECIP_INTERFACE instead of
+    USB_RECIP_DEVICE (closes: bug#247726).
+  * Claim an interface before reading data from it.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Fri, 11 Jun 2004 23:27:39 +0200
+
+usbutils (0.11+cvs20040318-2) unstable; urgency=low
+
+  * Added symlinks for manpages: 
+    - lsusb(1) -> lsusb(8) 
+    - usbmodules(1) -> usbmodules(8)
+
+ -- Aurelien Jarno <aurel32@debian.org>  Wed,  5 May 2004 08:59:01 +0200
+
+usbutils (0.11+cvs20040318-1) unstable; urgency=medium
+
+  * New CVS version including the previous changes.
+  * Allow empty line in map files (closes: bug#247264).
+
+ -- Aurelien Jarno <aurel32@debian.org>  Tue,  4 May 2004 11:32:53 +0200
+
+usbutils (0.11+cvs20040313-2) unstable; urgency=low
+
+  * Fixed a typo in the help message (closes: bug#245414).
+
+ -- Aurelien Jarno <aurel32@debian.org>  Fri, 23 Apr 2004 09:25:03 +0200
+
+usbutils (0.11+cvs20040313-1) unstable; urgency=low
+
+  * New version from CVS.
+  * Applied patch from Lee Maguire to support reporting of keyboard 
+    country type (closes: bug#237015).
+  * Updated usb.ids.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sun, 14 Mar 2004 00:32:59 +0100
+
+usbutils (0.11-8) unstable; urgency=low
+
+  * Applied patch from David Brownell to dump more information on HUB 
+    devices.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sun, 15 Feb 2004 12:05:39 +0100
+
+usbutils (0.11-7) unstable; urgency=low
+
+  * Added a dependency on wget (>= 1.8.1-6) | lynx (>= 2.8.4.1b-3) as
+    update-usbids needs to download files (closes: bug#224679).
+  * Updated usb.ids.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Mon, 29 Dec 2003 14:36:37 +0100
+
+usbutils (0.11-6) unstable; urgency=low
+
+  * Added a patch to access the USB devices through libusb instead of
+    directly through the kernel (closes: bug#135288). The patch has
+    also been integrated by the upstream in his repository.
+  * Updated manpages consequently (closes: bug#222237).
+  * Added symlinks to /usr/bin, as usbmodules and lsusb can now be run
+    by an unprivileged user, even the verbosity is higher in root mode.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sat,  6 Dec 2003 19:54:44 +0100
+
+usbutils (0.11-5) unstable; urgency=low
+
+  * Fixed a bug which could occurs when getting descriptors from HID 
+    devices.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sun, 16 Nov 2003 20:18:14 +0100
+
+usbutils (0.11-4) unstable; urgency=low
+
+  * Don't query language IDs descriptors if the device doesn't contains
+    any string.
+  * Fixed some typos in manpages.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sun, 16 Nov 2003 18:56:28 +0100
+
+usbutils (0.11-3) unstable; urgency=low
+
+  * Moved usb.ids to /usr/share/misc so that other packages could use it.
+    (closes: bug#184894).
+  * Added a script to update usb.ids (closes: bug#204879).
+  * Don't build libusb. This is better than building it and removing the 
+    corresponding files later. That remove the call of an old configure 
+    file (closes: bug#201934).
+
+ -- Aurelien Jarno <aurel32@debian.org>  Fri, 24 Oct 2003 23:24:14 +0200
+
+usbutils (0.11-2) unstable; urgency=low
+
+  * New maintainer (closes: bug#217119).
+  * Fixed a bug causing a "cannot get report descriptor" error on hid
+    devices. Thanks to Loïc Dachary for the patch (closes: #215907).
+  * Updated usb.ids.
+  * debian/control
+    + Depends on ${misc:Depends}
+  * Uses autotools-dev to update config.{guess,sub}.
+  * Uses debian/compat instead of DH_COMPAT.
+  * Upgraded policy compliance to 3.6.1.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Thu, 23 Oct 2003 20:36:01 +0200
+
+usbutils (0.11-1) unstable; urgency=low
+
+  * Special Thanks to Andreas Metzler <ametzler@downhill.at.eu.org> for
+    this update.
+  * New upstream 0.11: (Closes: #62182) - "lsusb don't work under ordinary
+    user"
+  * update usb.ids from master file http://linux-usb.sourceforge.net/usb.ids
+    (Closes: #147851) - "usb.ids very very old" and (Closes: #79574) "MOTU
+    FastLane not included in usb.ids file".
+  * patch manpage to list correct location of usb.ids-file on Debian.
+    (Closes: #130682)
+
+ -- Christopher L Cheney <ccheney@debian.org>  Thu, 13 Mar 2003 20:00:00 -0600
+
+usbutils (0.9-1) unstable; urgency=high
+
+  * New Upstream.
+  * Bug was in users usb.usermap file (Closes: #102881)
+  * Fixed config.guess config.sub (Closes: #111469)
+
+ -- Christopher L Cheney <ccheney@debian.org>  Fri, 23 Nov 2001 21:59:19 -0600
+
+usbutils (0.8-1) unstable; urgency=low
+
+  * New Maintainer.
+
+ -- Christopher L Cheney <ccheney@debian.org>  Wed, 13 Jun 2001 11:20:06 -0500
+
+usbutils (0.6-2) unstable; urgency=low
+
+  * Added #!/bin/sh to postinst of libusb0. (closes: #58588)
+
+ -- Raphael Bossek <bossekr@debian.org>  Tue,  7 Mar 2000 16:10:14 +0100
+
+usbutils (0.6-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Raphael Bossek <bossekr@debian.org>  Sun,  9 Jan 2000 13:13:30 +0100
+
+Local variables:
+mode: debian-changelog
+End:
--- usbutils-001.orig/debian/compat
+++ usbutils-001/debian/compat
@@ -0,0 +1 @@
+5
--- usbutils-001.orig/debian/update-usbids.8
+++ usbutils-001/debian/update-usbids.8
@@ -0,0 +1,27 @@
+.TH update-usbids 8 "13 May 2009" "usbutils-0.82" "Linux USB Utilities"
+.IX update-usbids
+
+.SH NAME
+update-usbids \- download new version of the USB ID list
+
+.SH SYNOPSIS
+.B update-usbids
+
+.SH DESCRIPTION
+.B update-usbids
+fetches the current version of the usb.ids file from the primary distribution
+site and installs it.
+
+This utility requires either wget or lynx to be installed. If gzip or bzip2
+are available, it automatically downloads the compressed version of the list.
+
+.SH FILES
+.TP
+.B /var/lib/usbutils/usb.ids.gz
+Here we install the new list.
+
+.SH SEE ALSO
+.BR lsusb(8).
+
+.SH AUTHOR
+Thomas Sailer, <sailer@ife.ee.ethz.ch>.
--- usbutils-001.orig/debian/rules
+++ usbutils-001/debian/rules
@@ -0,0 +1,126 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH_OS    ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -g
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+CFLAGS_UDEB = $(CFLAGS)
+CFLAGS_UDEB += -Os
+
+clean: 
+	dh_testdir
+	dh_testroot
+	-rm -f *-stamp
+	-rm -rf build-deb build-udeb
+	-rm -f config.guess config.sub
+	dh_clean
+
+update-config: update-config-stamp
+update-config-stamp:
+	-test -r /usr/share/misc/config.sub && \
+	cp -f /usr/share/misc/config.sub config.sub
+	-test -r /usr/share/misc/config.guess && \
+	cp -f /usr/share/misc/config.guess config.guess
+	
+	touch $@
+
+build-deb/config.status: update-config-stamp
+	dh_testdir
+
+	mkdir -p build-deb
+
+	cd build-deb && CFLAGS="$(CFLAGS)" ../configure \
+		--host=$(DEB_HOST_GNU_TYPE) \
+		--build=$(DEB_BUILD_GNU_TYPE) \
+		--prefix=/usr \
+		--datadir=/var/lib/usbutils \
+		--mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info
+
+build-udeb/config.status: update-config-stamp
+	dh_testdir
+
+	mkdir -p build-udeb
+
+	cd build-udeb && CFLAGS="$(CFLAGS_UDEB)" ../configure \
+		--host=$(DEB_HOST_GNU_TYPE) \
+		--build=$(DEB_BUILD_GNU_TYPE) \
+		--prefix=/usr \
+		--datadir=/usr/share/misc \
+		--mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info
+
+build: build-deb-stamp build-udeb-stamp 
+build-deb-stamp: build-deb/config.status
+	dh_testdir
+
+	$(MAKE) -C build-deb
+	touch $@
+
+build-udeb-stamp: build-udeb/config.status
+	dh_testdir
+
+	$(MAKE) -C build-udeb
+	touch $@
+
+install: install-deb-stamp install-udeb-stamp
+install-deb-stamp: build-deb-stamp
+	dh_testdir
+	dh_testroot
+	dh_installdirs -a
+
+	$(MAKE) -C build-deb install DESTDIR=$(CURDIR)/debian/usbutils pkgconfigdir=/usr/share/pkgconfig
+	mv $(CURDIR)/debian/usbutils/usr/sbin/update-usbids.sh $(CURDIR)/debian/usbutils/usr/sbin/update-usbids
+	rm $(CURDIR)/debian/usbutils/var/lib/usbutils/usb.ids.gz
+	touch $@
+
+install-udeb-stamp: build-udeb-stamp
+	dh_testdir
+	dh_testroot
+	dh_installdirs -a
+
+	install -m 755 -o root -g root build-udeb/lsusb $(CURDIR)/debian/usbutils-udeb/usr/bin/
+	gzip -9 -n -c usb.ids > $(CURDIR)/debian/usbutils-udeb/usr/share/misc/usb.ids.gz
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+#	dh_installdebconf	
+	dh_installdocs
+	dh_installexamples
+	dh_installman
+	dh_installinfo
+	dh_installchangelogs ChangeLog
+	dh_link
+	dh_strip 
+	dh_compress 
+	dh_fixperms
+#	dh_makeshlibs
+	dh_installdeb
+#	dh_perl
+	dh_shlibdeps 
+	dh_gencontrol
+	dh_md5sums 
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
--- usbutils-001.orig/debian/usbutils.links
+++ usbutils-001/debian/usbutils.links
@@ -0,0 +1 @@
+var/lib/usbutils/usb.ids usr/share/misc/usb.ids
--- usbutils-001.orig/debian/source/format
+++ usbutils-001/debian/source/format
@@ -0,0 +1 @@
+1.0