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

Conflicts:
	usbutils/usbutils.nm

diff --git a/bash/bash.nm b/bash/bash.nm
index c71e528774d7daf325c3fe1b2e990266d50a4b6f..d78fb71c62bd6a6ceaf2d48fbd3e68c689269428 100644 (file)
--- a/bash/bash.nm
+++ b/bash/bash.nm
@@ -5,7 +5,7 @@
 
 name       = bash
 version    = 4.2
-release    = 9
+release    = 10
 
 groups     = System/Tools
 url        = http://www.gnu.org/software/bash/
@@ -29,6 +29,7 @@ build
                filesystem >= 002
                ncurses-devel
                readline-devel
+               texinfo
        end
 
        prepare_cmds

diff --git a/usbutils/usbutils.nm b/usbutils/usbutils.nm
index bdfbad785216ea69ddc23b7ef6d205c5ee7e0e0e..6c3b98d1e482604a6b941cacc87003bd768c754a 100644 (file)
--- a/usbutils/usbutils.nm
+++ b/usbutils/usbutils.nm
@@ -6,7 +6,7 @@
 name       = usbutils
 epoch      = 1
 version    = 005
-release    = 2
+release    = 3
 
 groups     = System/Tools
 url        = http://www.linux-usb.org/
@@ -24,8 +24,7 @@ build
                autoconf
                automake
                hwdata
-               libusb-devel
-               pkg-config
+               libusbx-devel
                zlib-devel
        end
 
@@ -41,6 +40,8 @@ end
 
 packages
        package %{name}
+               group += Base
+
                requires
                        /usr/share/hwdata/usb.ids
                end