Merge "Replace transitional package names for Xenial"

manifests/image_scaler.pp

@@ -17,6 +17,7 @@ class mediawiki::image_scaler {
       'fonts-sil-abyssinica',
       'fonts-sil-ezra',
       'fonts-sil-padauk',
+      'fonts-sil-nuosusil',
       'fonts-takao-gothic',
       'fonts-takao-mincho',
       'fonts-thai-tlwg',
@@ -28,7 +29,6 @@ class mediawiki::image_scaler {
       'librsvg2-bin',
       'libtheora0',
       'libvips-tools',
-      'libvips37',
       'libvorbisenc2',
       'netpbm',
       'oggvideotools',
@@ -46,7 +46,6 @@ class mediawiki::image_scaler {
       'ttf-oriya-fonts',
       'ttf-punjabi-fonts',
       'ttf-sil-scheherazade',
-      'ttf-sil-yi',
       'ttf-tamil-fonts',
       'ttf-ubuntu-font-family',
       'ttf-unfonts-extra',

manifests/init.pp

@@ -31,7 +31,7 @@ class mediawiki(
   if ($role == 'app' or $role == 'all') {
     # This is equivalent to apache::dev which is not puppet3
     # compatible with puppetlabs-apache 0.0.4:
-    package { ['libaprutil1-dev', 'libapr1-dev', 'apache2-prefork-dev']:
+    package { 'apache2-dev':
       ensure => present,
     }
 

manifests/php.pp

@@ -1,13 +1,13 @@
 # Class: mediawiki::php
 #
 class mediawiki::php {
-  package { ['php5',
-    'php5-cli',
-    'php5-mysql',
+  package { ['php',
+    'php-cli',
+    'php-mysql',
     'php-apc',
-    'php5-intl',
+    'php-intl',
     'php-openid',
-    'php5-memcached']:
+    'php-memcached']:
     ensure => present,
   }
   # TODO: apc configuration