From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 8 Jun 2012 11:15:38 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40fc4221d8e65e2d59eebded7de70f19a13aecbc;p=ipfire-3.x.git

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

Conflicts:
	usbutils/usbutils.nm
---

40fc4221d8e65e2d59eebded7de70f19a13aecbc
diff --cc usbutils/usbutils.nm
index 393b7d133,bdfbad785..6c3b98d1e
--- a/usbutils/usbutils.nm
+++ b/usbutils/usbutils.nm
@@@ -5,8 -5,8 +5,8 @@@
  
  name       = usbutils
  epoch      = 1
- version    = 003
+ version    = 005
 -release    = 2
 +release    = 3
  
  groups     = System/Tools
  url        = http://www.linux-usb.org/
@@@ -21,7 -21,11 +21,10 @@@ source_dl  = http://www.kernel.org/pub/
  
  build
  	requires
+ 		autoconf
+ 		automake
+ 		hwdata
 -		libusb-devel
 -		pkg-config
 +		libusbx-devel
  		zlib-devel
  	end