From 3821055e0da4c01a10c261283a46b3630f5965b3 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Tue, 28 May 2019 21:18:36 +0000
Subject: [PATCH] More transitional Xenial package name replacements

Some additional packages specified in the manifest have slightly
different names on Xenial than their Trusty era counterparts. Update
them accordingly.

Change-Id: I9af30b01ee1cd9c28a408de14d6130a201cc6385
---
 manifests/image_scaler.pp | 18 +++++++++---------
 manifests/php.pp          |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/manifests/image_scaler.pp b/manifests/image_scaler.pp
index e315c01..4dc4f93 100644
--- a/manifests/image_scaler.pp
+++ b/manifests/image_scaler.pp
@@ -11,13 +11,21 @@ class mediawiki::image_scaler {
       'fonts-farsiweb',
       'fonts-khmeros',
       'fonts-lao',
+      'fonts-lohit-beng-bengali',
+      'fonts-lohit-deva',
+      'fonts-lohit-gujr',
+      'fonts-lohit-guru',
+      'fonts-lohit-knda',
+      'fonts-lohit-mlym',
+      'fonts-lohit-orya',
+      'fonts-lohit-taml',
       'fonts-manchufont',
       'fonts-mgopen',
       'fonts-nafees',
       'fonts-sil-abyssinica',
       'fonts-sil-ezra',
-      'fonts-sil-padauk',
       'fonts-sil-nuosusil',
+      'fonts-sil-padauk',
       'fonts-takao-gothic',
       'fonts-takao-mincho',
       'fonts-thai-tlwg',
@@ -35,18 +43,10 @@ class mediawiki::image_scaler {
       'texlive-fonts-recommended',
       'ttf-alee',
       'ttf-arabeyes',
-      'ttf-bengali-fonts',
-      'ttf-devanagari-fonts',
-      'ttf-gujarati-fonts',
       'ttf-kacst',
-      'ttf-kannada-fonts',
       'ttf-liberation',
       'ttf-linux-libertine',
-      'ttf-malayalam-fonts',
-      'ttf-oriya-fonts',
-      'ttf-punjabi-fonts',
       'ttf-sil-scheherazade',
-      'ttf-tamil-fonts',
       'ttf-ubuntu-font-family',
       'ttf-unfonts-extra',
       'ttf-wqy-zenhei',
diff --git a/manifests/php.pp b/manifests/php.pp
index 6df57f5..d08d032 100644
--- a/manifests/php.pp
+++ b/manifests/php.pp
@@ -4,7 +4,7 @@ class mediawiki::php {
   package { ['php',
     'php-cli',
     'php-mysql',
-    'php-apc',
+    'php-apcu',
     'php-intl',
     'php-openid',
     'php-memcached']: