Filippo Giunchedi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/370969 )

Change subject: mediawiki: clean up deprecated fonts packages
......................................................................


mediawiki: clean up deprecated fonts packages

These packages have been either removed or renamed in stretch.

Bug: T170817
Change-Id: Ie67173f4fcf2b92d89a3c7fd02aa0cc94b8bcfbe
---
M modules/mediawiki/manifests/packages/fonts.pp
1 file changed, 2 insertions(+), 6 deletions(-)

Approvals:
  jenkins-bot: Verified
  Filippo Giunchedi: Looks good to me, approved



diff --git a/modules/mediawiki/manifests/packages/fonts.pp 
b/modules/mediawiki/manifests/packages/fonts.pp
index 8c7cef6..0218bcc 100644
--- a/modules/mediawiki/manifests/packages/fonts.pp
+++ b/modules/mediawiki/manifests/packages/fonts.pp
@@ -14,7 +14,6 @@
         'fonts-liberation',
         'fonts-linuxlibertine',
         'fonts-manchufont',
-        'fonts-mgopen',
         'fonts-nafees',
         'fonts-sil-abyssinica',
         'fonts-sil-ezra',
@@ -28,7 +27,6 @@
         'fonts-unfonts-extra',
         'texlive-fonts-recommended',
         'ttf-alee',
-        'ttf-ubuntu-font-family',    # T32288, T103325
         'ttf-wqy-zenhei',
         'xfonts-100dpi',
         'xfonts-75dpi',
@@ -42,8 +40,6 @@
         'fonts-vlgothic',            # T66002
         'fonts-dejavu-core',         # T65206
         'fonts-dejavu-extra',        # T65206
-        'ttf-kochi-gothic',          # T66002
-        'ttf-kochi-mincho',          # T66002
         'fonts-lyx',                 # T40299
         'fonts-crosextra-carlito',   # T84842
         'fonts-crosextra-caladea',   # T84842
@@ -55,11 +51,11 @@
     }
 
     if os_version('ubuntu >= trusty') {
-        require_package('ttf-bengali-fonts', 'ttf-devanagari-fonts', 
'ttf-gujarati-fonts', 'ttf-kannada-fonts', 'ttf-oriya-fonts', 
'ttf-punjabi-fonts', 'ttf-tamil-fonts', 'ttf-telugu-fonts')
+        require_package('ttf-bengali-fonts', 'ttf-devanagari-fonts', 
'ttf-gujarati-fonts', 'ttf-kannada-fonts', 'ttf-oriya-fonts', 
'ttf-punjabi-fonts', 'ttf-tamil-fonts', 'ttf-telugu-fonts', 'ttf-kochi-gothic', 
'ttf-kochi-mincho', 'fonts-mgopen', 'ttf-ubuntu-font-family')
     }
 
     if os_version('debian >= jessie') {
-        require_package('fonts-beng', 'fonts-deva', 'fonts-gujr', 
'fonts-knda', 'fonts-mlym', 'fonts-orya', 'fonts-guru', 'fonts-taml', 
'fonts-telu', 'fonts-gujr-extra', 'fonts-noto-cjk', 'fonts-sil-lateef')
+        require_package('fonts-beng', 'fonts-deva', 'fonts-gujr', 
'fonts-knda', 'fonts-mlym', 'fonts-orya', 'fonts-guru', 'fonts-taml', 
'fonts-telu', 'fonts-gujr-extra', 'fonts-noto-cjk', 'fonts-sil-lateef', 
'fonts-ipafont-gothic', 'fonts-ipafont-mincho')
     }
 
     # In older releases (up to the version present in trusty), 
fontconfig-config provided

-- 
To view, visit https://gerrit.wikimedia.org/r/370969
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie67173f4fcf2b92d89a3c7fd02aa0cc94b8bcfbe
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Elukey <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to