This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via 40fc4221d8e65e2d59eebded7de70f19a13aecbc (commit) via daf84637b91cf64fae36c79975db9fdc22128459 (commit) via e894bb54e9da6d77b907ade1cd26d4ccdf54aa60 (commit) from 9eca7db9e15a738a310feabb55f72bc26adc0fe4 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 40fc4221d8e65e2d59eebded7de70f19a13aecbc Merge: daf8463 9eca7db Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Jun 8 13:15:38 2012 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
Conflicts: usbutils/usbutils.nm
commit daf84637b91cf64fae36c79975db9fdc22128459 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Jun 8 13:13:25 2012 +0200
bash: Fix creation of man pages.
Bash needs texinfo to generate the man pages. Fixes #10147.
commit e894bb54e9da6d77b907ade1cd26d4ccdf54aa60 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Jun 8 13:09:38 2012 +0200
usbutils: Install this package on every system.
-----------------------------------------------------------------------
Summary of changes: bash/bash.nm | 3 ++- usbutils/usbutils.nm | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-)
Difference in files: diff --git a/bash/bash.nm b/bash/bash.nm index c71e528..d78fb71 100644 --- 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 bdfbad7..6c3b98d 100644 --- 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
hooks/post-receive -- IPFire 3.x development tree