From 9d52b7d178a99b32b34fabe1d0f3c2aff8ac67c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Tue, 27 Oct 2015 00:23:20 +0100
Subject: [PATCH] debian: install locales-all instead of custom locales
 generation

The custom way proved to be unreliable - for example does not survive
`locales` package upgrade. So settle on much more reliable way.

Fixes QubesOS/qubes-issues#1195
---
 debian/control                   | 1 +
 debian/qubes-core-agent.postinst | 9 ---------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/debian/control b/debian/control
index 1a3c4b2..44741c5 100644
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,7 @@ Depends:
     librsvg2-bin,
     libvchan-xen,
     locales,
+    locales-all,
     ncurses-term,
     net-tools,
     psmisc,
diff --git a/debian/qubes-core-agent.postinst b/debian/qubes-core-agent.postinst
index 64fee47..d7b0acb 100755
--- a/debian/qubes-core-agent.postinst
+++ b/debian/qubes-core-agent.postinst
@@ -115,15 +115,6 @@ case "${1}" in
         done
         dpkg-divert --divert /etc/init/serial.conf.qubes-orig --package qubes-core-agent --rename --add /etc/init/serial.conf
 
-        # make sure locale is really generated
-        current_locale=`grep 'LANG\|LC_ALL' /etc/default/locale|head -n 1|cut -f 2 -d =`
-        if [ -n "$current_locale" ] && ! locale -a | grep -q "$current_locale"; then
-            base=`echo "$current_locale" | cut -f 1 -d .`
-            charmap=`echo "$current_locale.UTF-8" | cut -f 2 -d .`
-            [ -n "$charmap" ] && charmap="-f $charmap"
-            localedef -i $base $charmap $current_locale
-        fi
-
         # Remove old firmware updates link
         if [ -L /lib/firmware/updates ]; then
             rm -f /lib/firmware/updates