diff options
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/lang.pm | 54 |
3 files changed, 4 insertions, 54 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index f01c4c215..45653e6d9 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -3,6 +3,8 @@ - fix detecting some UPS devices (mga#13424) - drakbug: o fix some package names after the mdv->mga fork +- localedrake: + o stop configuring HAL Version 16.28 - 28 April 2014 diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index f4e72aaae..f4435ac1f 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,6 +1,8 @@ - add some POD documentation - do not unavailable kernel-xbox - drop (broken) support for Alpha, PPC, Sparc & IA64 +- locale setting + o stop configuring HAL Version 16.29 - 3 May 2014 diff --git a/perl-install/lang.pm b/perl-install/lang.pm index 6429df1b1..28baa1cd9 100644 --- a/perl-install/lang.pm +++ b/perl-install/lang.pm @@ -1157,8 +1157,6 @@ sub write { log::explanations(qq(Setting l10n configuration in "$file")); setVarsInShMode($::prefix . $file, 0644, $h); - configure_hal($locale) if !$b_user_only; - run_program::rooted($::prefix, 'grub-gfxmenu', '--quiet', '--lang', $locale->{lang}) if !$b_user_only; my $charset = l2charset($locale->{lang}); @@ -1216,58 +1214,6 @@ sub write { } } -sub configure_hal { - my ($locale) = @_; - my $option = sub { - my ($cat, $val) = @_; - qq(\t\t<merge key="$cat.policy.mount_option.$val" type="bool">true</merge>); - }; - my %options = (fs_options($locale), utf8 => 1); - my %known_options = ( - auto => [ 'iocharset', 'codepage' ], - vfat => [ 'iocharset', 'codepage' ], - msdos => [ 'iocharset', 'codepage' ], - ntfs => [ 'iocharset', 'utf8' ], - cdrom => [ 'iocharset', 'codepage', 'utf8' ], - ); - my $options = sub { - my ($cat, $name) = @_; - join("\n", map { - $option->($cat, $_ eq 'utf8' ? $_ : "$_=$options{$_}"); - } grep { $options{$_} } @{$known_options{$name}}); - }; - my $options_per_fs = join('', map { - my $s = $options->('volume', $_); - $s && sprintf(<<'EOF', $_, $s); - <match key="volume.fstype" string="%s"> -%s - </match> -EOF - } 'auto', 'vfat', 'msdos', 'ntfs'); - - output_p("$::prefix/usr/share/hal/fdi/30osvendor/locale-policy.fdi", - sprintf(<<'EOF', $options_per_fs, $options->('storage', 'cdrom'))); -<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> - -<deviceinfo version="0.2"> - - <device> - <match key="block.is_volume" bool="true"> - <match key="volume.fsusage" string="filesystem"> - -%s - </match> - </match> - - <match key="storage.drive_type" string="cdrom"> -%s - </match> - </device> - -</deviceinfo> -EOF -} - sub configure_kdeglobals { my ($locale, $confdir) = @_; my $kdeglobals = "$confdir/kdeglobals"; |