Merge lp:~xnox/ubiquity/voodoo into lp:ubiquity

[Dimitri John Ledkov]

Not sure if some other fontconfigury should be called instead....

[lp:~xnox/ubiquity/voodoo]

5763. By Dimitri John Ledkov on 2012-10-19

Fonconfig-voodoo is gone, not sure if some other "fontconfig"ury
should be called instead. (LP: #1043031)

=== modified file 'bin/oem-config-firstboot'
--- bin/oem-config-firstboot	2012-03-21 20:39:21 +0000
+++ bin/oem-config-firstboot	2012-10-19 17:07:24 +0000
@@ -35,14 +35,6 @@
 # Remove the oem-config-prepare menu item.
 rm -f /usr/share/applications/oem-config-prepare-gtk.desktop \
       /usr/share/applications/kde4/oem-config-prepare-kde.desktop
-# Adjust fontconfig configuration, if possible.
-if type fontconfig-voodoo >/dev/null 2>&1; then
-	RET="$(echo GET debian-installer/locale | debconf-communicate)"
-	if [ "${RET%% *}" = 0 ]; then
-		LC_ALL="${RET#* }" fontconfig-voodoo --auto --force --quiet \
-			|| true
-	fi
-fi
 # Run a command just before starting oem-config.
 RET="$(echo GET oem-config/early_command | debconf-communicate)" || true
 if [ "${RET%% *}" = 0 ]; then
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-10-19 17:07:24 +0000
+++ debian/changelog	2012-10-19 17:07:24 +0000
@@ -11,6 +11,8 @@
   * When auto-partitioning is not possible, allow to manually partition
     the same drive installation medium is on. (LP: #1053030)
   * Fix the question_dialog height-for-width (LP: #862270)
+  * Fonconfig-voodoo is gone, not sure if some other "fontconfig"ury
+    should be called instead. (LP: #1043031)
 
  -- Colin Watson <[e-mail]>  Fri, 19 Oct 2012 15:26:28 +0100
 
 
=== modified file 'ubiquity/i18n.py'
--- ubiquity/i18n.py	2012-09-25 20:59:09 +0000
+++ ubiquity/i18n.py	2012-10-19 17:07:24 +0000
@@ -30,8 +30,7 @@
 from ubiquity import misc, im_switch
 
 
-# if 'just_country' is True, only the country is changing
-def reset_locale(frontend, just_country=False):
+def reset_locale(frontend):
     frontend.start_debconf()
     di_locale = frontend.db.get('debian-installer/locale')
     if not di_locale:
@@ -47,9 +46,6 @@
         except locale.Error as e:
             print('locale.setlocale failed: %s (LANG=%s)' % (e, di_locale),
                   file=sys.stderr)
-        if not just_country:
-            misc.execute_root('fontconfig-voodoo',
-                                '--auto', '--force', '--quiet')
         im_switch.start_im()
     return di_locale
 
 
=== modified file 'ubiquity/plugins/ubi-language.py'
--- ubiquity/plugins/ubi-language.py	2012-10-19 17:07:24 +0000
+++ ubiquity/plugins/ubi-language.py	2012-10-19 17:07:24 +0000
@@ -748,10 +748,4 @@
                     locale.setlocale(locale.LC_ALL, '')
                 except locale.Error:
                     pass
-            # fontconfig configuration needs to be adjusted based on the
-            # selected locale (from language-selector-common.postinst). Ignore
-            # errors.
-            misc.execute(
-                'chroot', target, 'fontconfig-voodoo',
-                '--auto', '--force', '--quiet')
         return rv
 
=== modified file 'ubiquity/plugins/ubi-timezone.py'
--- ubiquity/plugins/ubi-timezone.py	2012-09-25 20:59:09 +0000
+++ ubiquity/plugins/ubi-timezone.py	2012-10-19 17:07:24 +0000
@@ -704,8 +704,7 @@
 
     def cleanup(self):
         plugin.Plugin.cleanup(self)
-        self.ui.controller.set_locale(
-                i18n.reset_locale(self.frontend, just_country=True))
+        self.ui.controller.set_locale(i18n.reset_locale(self.frontend))
 
 
 class Install(plugin.InstallPlugin):