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 2.x development tree".

The branch, next has been updated via fd073ae24070bb7ca5b9e2d70e7bcf8650b6c67c (commit) from 5d73f5158c1903ac9bbd697e956083ae5c986238 (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 fd073ae24070bb7ca5b9e2d70e7bcf8650b6c67c Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Mar 24 22:48:33 2013 +0100

Add /usr/bin/locale to the distribution.

This is needed by vdradmin.

Conflicts: config/rootfiles/core/68/filelists/files

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/common/armv5tel/glibc | 2 +- config/rootfiles/common/i586/glibc | 2 +- config/rootfiles/core/68/filelists/files | 1 + 3 files changed, 3 insertions(+), 2 deletions(-)

Difference in files: diff --git a/config/rootfiles/common/armv5tel/glibc b/config/rootfiles/common/armv5tel/glibc index 42ae490..2810389 100644 --- a/config/rootfiles/common/armv5tel/glibc +++ b/config/rootfiles/common/armv5tel/glibc @@ -52,7 +52,7 @@ sbin/ldconfig #usr/bin/getent #usr/bin/iconv usr/bin/ldd -#usr/bin/locale +usr/bin/locale #usr/bin/localedef #usr/bin/mtrace #usr/bin/pcprofiledump diff --git a/config/rootfiles/common/i586/glibc b/config/rootfiles/common/i586/glibc index ca62948..d17d7da 100644 --- a/config/rootfiles/common/i586/glibc +++ b/config/rootfiles/common/i586/glibc @@ -53,7 +53,7 @@ sbin/ldconfig #usr/bin/iconv usr/bin/ldd #usr/bin/lddlibc4 -#usr/bin/locale +usr/bin/locale #usr/bin/localedef #usr/bin/mtrace #usr/bin/pcprofiledump diff --git a/config/rootfiles/core/68/filelists/files b/config/rootfiles/core/68/filelists/files index 46ea0b8..65e46ae 100644 --- a/config/rootfiles/core/68/filelists/files +++ b/config/rootfiles/core/68/filelists/files @@ -38,6 +38,7 @@ srv/web/ipfire/html/themes/maniac/include/style.css srv/web/ipfire/html/themes/maniac/include/upxlr.css srv/web/ipfire/html/themes/maniac/images/updxl-icons.gif srv/web/ipfire/html/include/jquery-1.9.1.min.js +usr/bin/locale usr/local/bin/consort.sh var/ipfire/backup/include var/ipfire/header.pl

hooks/post-receive -- IPFire 2.x development tree