From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 24 Mar 2013 21:48:33 +0000 (+0100)
Subject: Add /usr/bin/locale to the distribution.
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=fd073ae24070bb7ca5b9e2d70e7bcf8650b6c67c

Add /usr/bin/locale to the distribution.

This is needed by vdradmin.

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

diff --git a/config/rootfiles/common/armv5tel/glibc b/config/rootfiles/common/armv5tel/glibc
index 42ae490ce..28103897c 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 ca62948a3..d17d7dadd 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 46ea0b839..65e46aecd 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