Filippo Giunchedi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/372125 )
Change subject: mediawiki: fix ttf-ubuntu-font-family handling
......................................................................
mediawiki: fix ttf-ubuntu-font-family handling
The package is now uploaded internally to stretch-wikimedia, this
partially reverts Ie67173f4fcf2b9
Bug: T170817
Change-Id: I46f30f3428ce121de5de8bb2133cd00bb16fb2a1
---
M modules/mediawiki/manifests/packages/fonts.pp
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Muehlenhoff: Looks good to me, but someone else must approve
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 0218bcc..06b4b46 100644
--- a/modules/mediawiki/manifests/packages/fonts.pp
+++ b/modules/mediawiki/manifests/packages/fonts.pp
@@ -27,6 +27,7 @@
'fonts-unfonts-extra',
'texlive-fonts-recommended',
'ttf-alee',
+ 'ttf-ubuntu-font-family', # Not in Debian. T32288, T103325
'ttf-wqy-zenhei',
'xfonts-100dpi',
'xfonts-75dpi',
@@ -51,7 +52,7 @@
}
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', 'ttf-kochi-gothic',
'ttf-kochi-mincho', 'fonts-mgopen', 'ttf-ubuntu-font-family')
+ 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')
}
if os_version('debian >= jessie') {
--
To view, visit https://gerrit.wikimedia.org/r/372125
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I46f30f3428ce121de5de8bb2133cd00bb16fb2a1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Alex Monk <[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
