KartikMistry has uploaded a new change for review. https://gerrit.wikimedia.org/r/93026
Change subject: Unify font license abbreviations. ...................................................................... Unify font license abbreviations. 1. Updated license abbreviations in font.ini 2. Removed duplicate license file in Suwannaphum 3. Corrected license for some fonts 4. Added licenses/LICENSES file to note license related issues and abbreviations Bug: 53281 Change-Id: Ia3aa6396cf5197c6baaff716d27682dd23b7674e --- M data/fontrepo/fonts/AbyssinicaSIL/font.ini M data/fontrepo/fonts/Alef/font.ini M data/fontrepo/fonts/AnjaliOldLipi/font.ini M data/fontrepo/fonts/CharisSIL/font.ini M data/fontrepo/fonts/DoulosSIL/font.ini M data/fontrepo/fonts/FreeFontThana/font.ini M data/fontrepo/fonts/GentiumPlus/font.ini M data/fontrepo/fonts/Gubbi/font.ini M data/fontrepo/fonts/Hanuman/font.ini M data/fontrepo/fonts/Jomolhari/font.ini M data/fontrepo/fonts/Junicode/font.ini M data/fontrepo/fonts/KhmerOS/font.ini M data/fontrepo/fonts/KhmerOSbattambang/font.ini M data/fontrepo/fonts/LinuxLibertine/font.ini M data/fontrepo/fonts/LohitAssamese/font.ini M data/fontrepo/fonts/LohitBengali/font.ini M data/fontrepo/fonts/LohitDevanagari/font.ini M data/fontrepo/fonts/LohitGujarati/font.ini M data/fontrepo/fonts/LohitKannada/font.ini M data/fontrepo/fonts/LohitMarathi/font.ini M data/fontrepo/fonts/LohitNepali/font.ini M data/fontrepo/fonts/LohitOriya/font.ini M data/fontrepo/fonts/LohitPunjabi/font.ini M data/fontrepo/fonts/LohitTamil/font.ini M data/fontrepo/fonts/LohitTamilClassical/font.ini M data/fontrepo/fonts/LohitTelugu/font.ini M data/fontrepo/fonts/Meera/font.ini M data/fontrepo/fonts/MiriamCLM/font.ini M data/fontrepo/fonts/Myanmar3/font.ini M data/fontrepo/fonts/NafeesWeb/font.ini M data/fontrepo/fonts/Nazli/font.ini M data/fontrepo/fonts/Nokora/font.ini M data/fontrepo/fonts/NuosuSIL/font.ini M data/fontrepo/fonts/OpenDyslexic/font.ini M data/fontrepo/fonts/OskiEast/font.ini M data/fontrepo/fonts/Padauk/font.ini M data/fontrepo/fonts/Pagul/font.ini M data/fontrepo/fonts/Pangururan/font.ini M data/fontrepo/fonts/Phetsarath/font.ini M data/fontrepo/fonts/Saab/font.ini M data/fontrepo/fonts/Shapour/font.ini M data/fontrepo/fonts/SiyamRupali/font.ini D data/fontrepo/fonts/Suwannaphum/OFL.txt M data/fontrepo/fonts/Suwannaphum/font.ini M data/fontrepo/fonts/TaameyFrankCLM/font.ini M data/fontrepo/fonts/TharLon/font.ini M data/fontrepo/fonts/Thendral/font.ini M data/fontrepo/fonts/Thenee/font.ini M data/fontrepo/fonts/TuladhaJejeg/font.ini M data/fontrepo/fonts/UnifrakturMaguntia/font.ini M data/fontrepo/fonts/amiri/font.ini M data/fontrepo/fonts/lklug/font.ini M data/fontrepo/fonts/madan/font.ini M data/fontrepo/fonts/saweri/font.ini M data/fontrepo/fonts/utkal/font.ini A data/fontrepo/licenses/LICENSES 56 files changed, 85 insertions(+), 149 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector refs/changes/26/93026/1 diff --git a/data/fontrepo/fonts/AbyssinicaSIL/font.ini b/data/fontrepo/fonts/AbyssinicaSIL/font.ini index bf04cfd..11f9024 100644 --- a/data/fontrepo/fonts/AbyssinicaSIL/font.ini +++ b/data/fontrepo/fonts/AbyssinicaSIL/font.ini @@ -1,6 +1,6 @@ [AbyssinicaSIL] languages=am*, ti*, gez*, tig* version=1.200 -license=OFL 1.1 +license=OFL-1.1 licensefile=OFL.txt url=http://scripts.sil.org/AbyssinicaSIL diff --git a/data/fontrepo/fonts/Alef/font.ini b/data/fontrepo/fonts/Alef/font.ini index d1b92bf..61ca325 100644 --- a/data/fontrepo/fonts/Alef/font.ini +++ b/data/fontrepo/fonts/Alef/font.ini @@ -1,7 +1,7 @@ [Alef] languages=he, yi, hbo version=1.0 -license=OFL 1.1 +license=OFL-1.1 licensefile=OFL.txt url=http://alef.hagilda.com/ ttf=Alef-Regular.ttf diff --git a/data/fontrepo/fonts/AnjaliOldLipi/font.ini b/data/fontrepo/fonts/AnjaliOldLipi/font.ini index 26f6591..b3852fa 100644 --- a/data/fontrepo/fonts/AnjaliOldLipi/font.ini +++ b/data/fontrepo/fonts/AnjaliOldLipi/font.ini @@ -1,6 +1,6 @@ [AnjaliOldLipi] languages=ml version=.0.730 -license=OFL 1.1 +license=OFL-1.1 licensefile=OFL.txt url=https://sites.google.com/site/cibu/anjalioldlipi-font diff --git a/data/fontrepo/fonts/CharisSIL/font.ini b/data/fontrepo/fonts/CharisSIL/font.ini index 374ecec..6f30138 100644 --- a/data/fontrepo/fonts/CharisSIL/font.ini +++ b/data/fontrepo/fonts/CharisSIL/font.ini @@ -1,6 +1,6 @@ [CharisSIL] languages=cdo*,nan version=4.011 -license=OFL 1.1 +license=OFL-1.1 licensefile=OFL.txt url=http://scripts.sil.org/CharisSIL diff --git a/data/fontrepo/fonts/DoulosSIL/font.ini b/data/fontrepo/fonts/DoulosSIL/font.ini index 689bd77..53ad703 100644 --- a/data/fontrepo/fonts/DoulosSIL/font.ini +++ b/data/fontrepo/fonts/DoulosSIL/font.ini @@ -1,6 +1,6 @@ [Doulos SIL] languages=nan* version=4.112 -license=OFL 1.1 +license=OFL-1.1 licensefile=OFL.txt url=http://scripts.sil.org/DoulosSIL diff --git a/data/fontrepo/fonts/FreeFontThana/font.ini b/data/fontrepo/fonts/FreeFontThana/font.ini index 7e2fda8..c2bd58a 100644 --- a/data/fontrepo/fonts/FreeFontThana/font.ini +++ b/data/fontrepo/fonts/FreeFontThana/font.ini @@ -1,7 +1,7 @@ [FreeFont-Thaana] languages=dv* version=1.0 -license=GPL 3 +license=GPL-3.0 licensefile=gpl-3.0.txt url=www.gnu.org/software/freefont ttf=FreeFont-Thaana.ttf @@ -14,4 +14,3 @@ eot=FreeFont-Thaana-Bold.eot woff=FreeFont-Thaana-Bold.woff fontweight=bold - diff --git a/data/fontrepo/fonts/GentiumPlus/font.ini b/data/fontrepo/fonts/GentiumPlus/font.ini index c7b9705..913ee8b 100644 --- a/data/fontrepo/fonts/GentiumPlus/font.ini +++ b/data/fontrepo/fonts/GentiumPlus/font.ini @@ -1,7 +1,7 @@ [GentiumPlus] languages=grc version=1.510 -license=OFL +license=OFL-1.1 licensefile=OFL.txt url=http://scripts.sil.org/gentium ttf=GentiumPlus-R.ttf diff --git a/data/fontrepo/fonts/Gubbi/font.ini b/data/fontrepo/fonts/Gubbi/font.ini index bed8c3b..525d843 100644 --- a/data/fontrepo/fonts/Gubbi/font.ini +++ b/data/fontrepo/fonts/Gubbi/font.ini @@ -1,6 +1,6 @@ [Gubbi] languages=kn, tcy version=1.3 -license=GPLv3+ +license=GPL-3.0+ licensefile=gpl-3.0.txt url=https://github.com/aravindavk/Gubbi/ diff --git a/data/fontrepo/fonts/Hanuman/font.ini b/data/fontrepo/fonts/Hanuman/font.ini index 6214081..187e70b 100644 --- a/data/fontrepo/fonts/Hanuman/font.ini +++ b/data/fontrepo/fonts/Hanuman/font.ini @@ -1,7 +1,7 @@ [Hanuman] languages=km version=1.0 -license=OFL 1.1 +license=OFL-1.1 licensefile=OFL.txt url=http://www.google.com/fonts/specimen/Hanuman ttf=Hanuman.ttf diff --git a/data/fontrepo/fonts/Jomolhari/font.ini b/data/fontrepo/fonts/Jomolhari/font.ini index bbc39af..d80b668 100644 --- a/data/fontrepo/fonts/Jomolhari/font.ini +++ b/data/fontrepo/fonts/Jomolhari/font.ini @@ -1,6 +1,6 @@ [Jomolhari] languages=bo*, dz*, adx*, bod*, dre*, hut*, lhm*, muk*, kte*, tsk*, ola*, loy*, tcn*, thw*, xct*, goe*, khg*, kbg*, lbj*, zau*, lya*, luk*, otb* version=0.003 -license=OFL 1.1 +license=OFL-1.1 licensefile=OFL.txt url=https://sites.google.com/site/chrisfynn2/home/fonts/jomolhari diff --git a/data/fontrepo/fonts/Junicode/font.ini b/data/fontrepo/fonts/Junicode/font.ini index 8ce8a4f..a206475 100644 --- a/data/fontrepo/fonts/Junicode/font.ini +++ b/data/fontrepo/fonts/Junicode/font.ini @@ -1,7 +1,7 @@ [Junicode] languages=ang version=2013-01-17 -license=OFL +license=OFL-1.1 licensefile=OFL.txt url=http://junicode.sourceforge.net/ ttf=Junicode.ttf diff --git a/data/fontrepo/fonts/KhmerOS/font.ini b/data/fontrepo/fonts/KhmerOS/font.ini index 8694fc6..152ad1a 100644 --- a/data/fontrepo/fonts/KhmerOS/font.ini +++ b/data/fontrepo/fonts/KhmerOS/font.ini @@ -1,6 +1,6 @@ [KhmerOS] languages=km version=1.10 -license=LGPL 2.1+ +license=LGPL-2.0.1+ licensefile=lgpl-2.1.txt url=http://www.khmeros.info/drupal612/en/fonts diff --git a/data/fontrepo/fonts/KhmerOSbattambang/font.ini b/data/fontrepo/fonts/KhmerOSbattambang/font.ini index 52946da..af128d3 100644 --- a/data/fontrepo/fonts/KhmerOSbattambang/font.ini +++ b/data/fontrepo/fonts/KhmerOSbattambang/font.ini @@ -1,6 +1,6 @@ [KhmerOSbattambang] languages=km* version=1.10 -license=LGPL 2.1+ +license=LGPL-2.0.1+ licensefile=lgpl-2.1.txt url=http://www.khmeros.info/drupal612/en/fonts diff --git a/data/fontrepo/fonts/LinuxLibertine/font.ini b/data/fontrepo/fonts/LinuxLibertine/font.ini index e92388d..81cb9ca 100644 --- a/data/fontrepo/fonts/LinuxLibertine/font.ini +++ b/data/fontrepo/fonts/LinuxLibertine/font.ini @@ -1,6 +1,6 @@ [Linux Libertine] version=5.3.0 -license=OFL 1.1 +license=OFL-1.1 licensefile=OFL.txt url=http://linuxlibertine.org ttf=LinLibertine_Rah.ttf diff --git a/data/fontrepo/fonts/LohitAssamese/font.ini b/data/fontrepo/fonts/LohitAssamese/font.ini index 7cb8be5..3470e87 100644 --- a/data/fontrepo/fonts/LohitAssamese/font.ini +++ b/data/fontrepo/fonts/LohitAssamese/font.ini @@ -1,6 +1,6 @@ [Lohit Assamese] languages=as version=2.5.3 -license=OFL 1.1 +license=OFL-1.1 licensefile=OFL.txt url=https://fedorahosted.org/lohit/ diff --git a/data/fontrepo/fonts/LohitBengali/font.ini b/data/fontrepo/fonts/LohitBengali/font.ini index b81a0a1..7eec006 100644 --- a/data/fontrepo/fonts/LohitBengali/font.ini +++ b/data/fontrepo/fonts/LohitBengali/font.ini @@ -1,6 +1,6 @@ [Lohit Bengali] languages=bn, bpy version=2.5.3 -license=OFL 1.1 +license=OFL-1.1 licensefile=OFL.txt url=https://fedorahosted.org/lohit/ diff --git a/data/fontrepo/fonts/LohitDevanagari/font.ini b/data/fontrepo/fonts/LohitDevanagari/font.ini index ba9aba2..39bac3c 100644 --- a/data/fontrepo/fonts/LohitDevanagari/font.ini +++ b/data/fontrepo/fonts/LohitDevanagari/font.ini @@ -1,6 +1,6 @@ [Lohit Devanagari] languages=bh*, bho*, hi*, kok*, gom*, mai*, sa* version=2.5.3 -license=OFL 1.1 +license=OFL-1.1 licensefile=OFL.txt url=https://fedorahosted.org/lohit/ diff --git a/data/fontrepo/fonts/LohitGujarati/font.ini b/data/fontrepo/fonts/LohitGujarati/font.ini index 30f6613..6cbfa91 100644 --- a/data/fontrepo/fonts/LohitGujarati/font.ini +++ b/data/fontrepo/fonts/LohitGujarati/font.ini @@ -1,6 +1,6 @@ [Lohit Gujarati] languages=gu* version=2.5.3 -license=OFL 1.1 +license=OFL-1.1 licensefile=OFL.txt url=https://fedorahosted.org/lohit/ diff --git a/data/fontrepo/fonts/LohitKannada/font.ini b/data/fontrepo/fonts/LohitKannada/font.ini index 088c496..313e955 100644 --- a/data/fontrepo/fonts/LohitKannada/font.ini +++ b/data/fontrepo/fonts/LohitKannada/font.ini @@ -1,6 +1,6 @@ [Lohit Kannada] languages=kn*, tcy* version=2.5.3 -license=OFL 1.1 +license=OFL-1.1 licensefile=OFL.txt url=https://fedorahosted.org/lohit/ diff --git a/data/fontrepo/fonts/LohitMarathi/font.ini b/data/fontrepo/fonts/LohitMarathi/font.ini index 5a925e8..70ce8bc 100644 --- a/data/fontrepo/fonts/LohitMarathi/font.ini +++ b/data/fontrepo/fonts/LohitMarathi/font.ini @@ -1,6 +1,6 @@ [Lohit Marathi] languages=ahr*, mr* version=2.5.3 -license=OFL 1.1 +license=OFL-1.1 licensefile=OFL.txt url=https://fedorahosted.org/lohit/ diff --git a/data/fontrepo/fonts/LohitNepali/font.ini b/data/fontrepo/fonts/LohitNepali/font.ini index d3c4cba..b62bcd8 100644 --- a/data/fontrepo/fonts/LohitNepali/font.ini +++ b/data/fontrepo/fonts/LohitNepali/font.ini @@ -1,6 +1,6 @@ [Lohit Nepali] languages=ne* version=2.5.3 -license=OFL 1.1 +license=OFL-1.1 licensefile=OFL.txt url=https://fedorahosted.org/lohit/ diff --git a/data/fontrepo/fonts/LohitOriya/font.ini b/data/fontrepo/fonts/LohitOriya/font.ini index e9c8cae..aa8d4b8 100644 --- a/data/fontrepo/fonts/LohitOriya/font.ini +++ b/data/fontrepo/fonts/LohitOriya/font.ini @@ -1,6 +1,6 @@ [Lohit Oriya] languages=or* version=2.5.3 -license=OFL 1.1 +license=OFL-1.1 licensefile=OFL.txt url=https://fedorahosted.org/lohit/ diff --git a/data/fontrepo/fonts/LohitPunjabi/font.ini b/data/fontrepo/fonts/LohitPunjabi/font.ini index b5f2f2d..d024243 100644 --- a/data/fontrepo/fonts/LohitPunjabi/font.ini +++ b/data/fontrepo/fonts/LohitPunjabi/font.ini @@ -1,6 +1,6 @@ [Lohit Punjabi] languages=pa* version=2.5.3 -license=OFL 1.1 +license=OFL-1.1 licensefile=OFL.txt url=https://fedorahosted.org/lohit/ diff --git a/data/fontrepo/fonts/LohitTamil/font.ini b/data/fontrepo/fonts/LohitTamil/font.ini index 592cd8a..d7d3da8 100644 --- a/data/fontrepo/fonts/LohitTamil/font.ini +++ b/data/fontrepo/fonts/LohitTamil/font.ini @@ -1,6 +1,6 @@ [Lohit Tamil] languages=ta version=2.5.3 -license=OFL 1.1 +license=OFL-1.1 licensefile=OFL.txt url=https://fedorahosted.org/lohit/ diff --git a/data/fontrepo/fonts/LohitTamilClassical/font.ini b/data/fontrepo/fonts/LohitTamilClassical/font.ini index 2e81031..3e9ba72 100644 --- a/data/fontrepo/fonts/LohitTamilClassical/font.ini +++ b/data/fontrepo/fonts/LohitTamilClassical/font.ini @@ -1,6 +1,6 @@ [Lohit Tamil Classical] languages=ta version=2.5.3 -license=OFL 1.1 +license=OFL-1.1 licensefile=OFL.txt url=https://fedorahosted.org/lohit/ diff --git a/data/fontrepo/fonts/LohitTelugu/font.ini b/data/fontrepo/fonts/LohitTelugu/font.ini index e8ca72a..db335fd 100644 --- a/data/fontrepo/fonts/LohitTelugu/font.ini +++ b/data/fontrepo/fonts/LohitTelugu/font.ini @@ -1,6 +1,6 @@ [Lohit Telugu] languages=te* version=2.5.3 -license=OFL 1.1 +license=OFL-1.1 licensefile=OFL.txt url=https://fedorahosted.org/lohit/ diff --git a/data/fontrepo/fonts/Meera/font.ini b/data/fontrepo/fonts/Meera/font.ini index 59086e0..1b56134 100644 --- a/data/fontrepo/fonts/Meera/font.ini +++ b/data/fontrepo/fonts/Meera/font.ini @@ -1,6 +1,6 @@ [Meera] languages=ml version=6.0 -license=GPL 3+ with exceptions +license=GPL-3.0.0+-with-font-exception licensefile=gpl-3.0.txt url=https://savannah.nongnu.org/projects/smc diff --git a/data/fontrepo/fonts/MiriamCLM/font.ini b/data/fontrepo/fonts/MiriamCLM/font.ini index 3ff7168..f4fa7b3 100644 --- a/data/fontrepo/fonts/MiriamCLM/font.ini +++ b/data/fontrepo/fonts/MiriamCLM/font.ini @@ -1,6 +1,6 @@ [Miriam CLM] languages=he version=0.130 -license=GPL2+ +license=GPL-2.0+ licensefile=gpl-2.0.txt url=http://culmus.sourceforge.net/ diff --git a/data/fontrepo/fonts/Myanmar3/font.ini b/data/fontrepo/fonts/Myanmar3/font.ini index 0d6fcbc..ee2dec4 100644 --- a/data/fontrepo/fonts/Myanmar3/font.ini +++ b/data/fontrepo/fonts/Myanmar3/font.ini @@ -1,6 +1,6 @@ [Myanmar3] languages=my version=3.0 -license=LGPL 2.1+ +license=LGPL-2.0.1+ licensefile=lgpl-2.1.txt url=http://code.google.com/p/myanmar3source/ diff --git a/data/fontrepo/fonts/NafeesWeb/font.ini b/data/fontrepo/fonts/NafeesWeb/font.ini index 0145fd3..89594c8 100644 --- a/data/fontrepo/fonts/NafeesWeb/font.ini +++ b/data/fontrepo/fonts/NafeesWeb/font.ini @@ -1,7 +1,7 @@ [NafeesWeb] languages=ur version=1.2 -license=GPL-2 +license=GPL-2.0 licensefile=gpl-2.0.txt #URL seems broken but, Debian has this font confirming its license validity. #Also see: http://groups.yahoo.com/group/urdu_computing/message/1081 diff --git a/data/fontrepo/fonts/Nazli/font.ini b/data/fontrepo/fonts/Nazli/font.ini index 21a2d17..ba27de7 100644 --- a/data/fontrepo/fonts/Nazli/font.ini +++ b/data/fontrepo/fonts/Nazli/font.ini @@ -1,6 +1,6 @@ [Nazli] languages=fa version=0.4 -license=GPL-2 +license=GPL-2.0 licensefile=gpl-2.0.txt url=http://persian-computing.org/ diff --git a/data/fontrepo/fonts/Nokora/font.ini b/data/fontrepo/fonts/Nokora/font.ini index ecfc7fe..da2e856 100644 --- a/data/fontrepo/fonts/Nokora/font.ini +++ b/data/fontrepo/fonts/Nokora/font.ini @@ -1,7 +1,7 @@ [Nokora Regular] languages=km version=1.10 -license=Apache 2.0 +license=Apache-2.0 licensefile=apache-2.0.txt url=http://www.google.com/fonts/specimen/Nokora ttf=Nokora-Regular.ttf diff --git a/data/fontrepo/fonts/NuosuSIL/font.ini b/data/fontrepo/fonts/NuosuSIL/font.ini index 3f4eb36..172c2c5 100644 --- a/data/fontrepo/fonts/NuosuSIL/font.ini +++ b/data/fontrepo/fonts/NuosuSIL/font.ini @@ -1,7 +1,7 @@ [Nuosu SIL] languages=ii* version=2.1.1 -license=OFL +license=OFL-1.1 licensefile=OFL.txt url=http://scripts.sil.org/SILYI_home ttf=NuosuSIL.ttf diff --git a/data/fontrepo/fonts/OpenDyslexic/font.ini b/data/fontrepo/fonts/OpenDyslexic/font.ini index 578ab0e..7d8145b 100644 --- a/data/fontrepo/fonts/OpenDyslexic/font.ini +++ b/data/fontrepo/fonts/OpenDyslexic/font.ini @@ -1,7 +1,7 @@ [OpenDyslexic] languages=af,bk,ca,cy,da,de,en,es,et,fi,fo,fr,fy,ga,gd,gl,hu,id,is,it,lb,li,mi,ms,nb,nl,oc,pt,sq,sv,sw,tl,tr,wa version=2.1.0+git060dc841 -license=Creative Commons Attribution 3.0 Unported License +license=CC-BY-3.0 licensefile=http://dyslexicfonts.com/license.php url=https://github.com/antijingoist/open-dyslexic ttf=OpenDyslexic-Regular.ttf diff --git a/data/fontrepo/fonts/OskiEast/font.ini b/data/fontrepo/fonts/OskiEast/font.ini index 36b7f06..f19b819 100644 --- a/data/fontrepo/fonts/OskiEast/font.ini +++ b/data/fontrepo/fonts/OskiEast/font.ini @@ -1,7 +1,7 @@ [OskiEast] languages=cr*, iu version=2.200 -license=GPL-3 +license=GPL-3.0 licensefile=gpl-3.0.txt url=http://www.languagegeek.com/font/fontdownload.html#AlgonAndInu ttf=oskie.ttf diff --git a/data/fontrepo/fonts/Padauk/font.ini b/data/fontrepo/fonts/Padauk/font.ini index 5256ef2..ea63dc0 100644 --- a/data/fontrepo/fonts/Padauk/font.ini +++ b/data/fontrepo/fonts/Padauk/font.ini @@ -1,6 +1,6 @@ [Padauk] languages=my version=2.8 -license=OFL 1.1 +license=OFL-1.1 licensefile=OFL.txt url=http://scripts.sil.org/Padauk diff --git a/data/fontrepo/fonts/Pagul/font.ini b/data/fontrepo/fonts/Pagul/font.ini index d198eaf..c89ff3b 100644 --- a/data/fontrepo/fonts/Pagul/font.ini +++ b/data/fontrepo/fonts/Pagul/font.ini @@ -1,6 +1,6 @@ [Pagul] languages=saz* version=1.0 -license=GPL 3 with exceptions +license=GPL-3.0.0-with-font-exception licensefile=gpl-3.0.txt url=http://sourceforge.net/projects/pagul/ diff --git a/data/fontrepo/fonts/Pangururan/font.ini b/data/fontrepo/fonts/Pangururan/font.ini index cd356d4..880bff8 100644 --- a/data/fontrepo/fonts/Pangururan/font.ini +++ b/data/fontrepo/fonts/Pangururan/font.ini @@ -1,7 +1,7 @@ [Pangururan] languages=bbc, btk version=1.0.5 -license=OFL +license=OFL-1.1 licensefile=OFL.txt url=http://evertype.com/fonts/batak/ ttf=Pangururan.ttf diff --git a/data/fontrepo/fonts/Phetsarath/font.ini b/data/fontrepo/fonts/Phetsarath/font.ini index 910797c..2a7b6ac 100644 --- a/data/fontrepo/fonts/Phetsarath/font.ini +++ b/data/fontrepo/fonts/Phetsarath/font.ini @@ -1,7 +1,7 @@ [Phetsarath] languages=lo* version=1.01 -license=OFL +license=OFL-1.1 licensefile=OFL.txt url=http://phetsarath.gov.la ttf=Phetsarath-Regular.ttf diff --git a/data/fontrepo/fonts/Saab/font.ini b/data/fontrepo/fonts/Saab/font.ini index 27ae80b..1e00c54 100644 --- a/data/fontrepo/fonts/Saab/font.ini +++ b/data/fontrepo/fonts/Saab/font.ini @@ -1,6 +1,6 @@ [Saab] languages=pa version=0.91 -license=GPLv2+ with exceptions +license=GPL-2.0-with-font-exception licensefile=gpl-2.0.txt url=http://guca.sourceforge.net/typography/fonts/saab/ diff --git a/data/fontrepo/fonts/Shapour/font.ini b/data/fontrepo/fonts/Shapour/font.ini index f605c74..25bcbfd 100644 --- a/data/fontrepo/fonts/Shapour/font.ini +++ b/data/fontrepo/fonts/Shapour/font.ini @@ -1,7 +1,6 @@ [Shapour] languages=pal* version=001.000 -license=GNU GPL +license=GPL-3.0+ licensefile=gpl-3.0.txt url=https://github.com/behaafarid/shapour_font - diff --git a/data/fontrepo/fonts/SiyamRupali/font.ini b/data/fontrepo/fonts/SiyamRupali/font.ini index c23ba19..2562670 100644 --- a/data/fontrepo/fonts/SiyamRupali/font.ini +++ b/data/fontrepo/fonts/SiyamRupali/font.ini @@ -1,6 +1,6 @@ [Siyam Rupali] languages=bn*, bpy* version=1.070 -license=GPL3 +license=GPL-3.0 licensefile=gpl-3.0.txt url=https://github.com/potasiyam/Siyam-Rupali diff --git a/data/fontrepo/fonts/Suwannaphum/OFL.txt b/data/fontrepo/fonts/Suwannaphum/OFL.txt deleted file mode 100644 index e6dd4ef..0000000 --- a/data/fontrepo/fonts/Suwannaphum/OFL.txt +++ /dev/null @@ -1,93 +0,0 @@ -Copyright (c) 2010, Danh Hong (khmertype.blogspot.com), -with Reserved Font Name Suwannaphum. -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/data/fontrepo/fonts/Suwannaphum/font.ini b/data/fontrepo/fonts/Suwannaphum/font.ini index b280bff..7f17614 100644 --- a/data/fontrepo/fonts/Suwannaphum/font.ini +++ b/data/fontrepo/fonts/Suwannaphum/font.ini @@ -1,7 +1,7 @@ [Suwannaphum] languages=km version=2.00 -license=OFL +license=OFL-1.1 licensefile=OFL.txt url=http://www.google.com/fonts/specimen/Suwannaphum ttf=Suwannaphum.ttf diff --git a/data/fontrepo/fonts/TaameyFrankCLM/font.ini b/data/fontrepo/fonts/TaameyFrankCLM/font.ini index fa813ae..d511bf3 100644 --- a/data/fontrepo/fonts/TaameyFrankCLM/font.ini +++ b/data/fontrepo/fonts/TaameyFrankCLM/font.ini @@ -1,6 +1,6 @@ [Taamey Frank CLM] languages=hbo*, he version=0.110 -license=GPL2+ +license=GPL-2.0+ licensefile=gpl-2.0.txt url=http://culmus.sourceforge.net/ diff --git a/data/fontrepo/fonts/TharLon/font.ini b/data/fontrepo/fonts/TharLon/font.ini index 13a075b..27c765e 100644 --- a/data/fontrepo/fonts/TharLon/font.ini +++ b/data/fontrepo/fonts/TharLon/font.ini @@ -1,6 +1,6 @@ [TharLon] languages=my* version=1.0 -license=OFL 1.1 +license=OFL-1.1 licensefile=OFL.txt url=http://code.google.com/p/tharlon-font/ diff --git a/data/fontrepo/fonts/Thendral/font.ini b/data/fontrepo/fonts/Thendral/font.ini index 950d34e..792b528 100644 --- a/data/fontrepo/fonts/Thendral/font.ini +++ b/data/fontrepo/fonts/Thendral/font.ini @@ -1,6 +1,6 @@ [Thendral] languages=ta version=1.0 -license=GPL 2 +license=GPL-2.0 licensefile=gpl-2.0.txt url=https://github.com/thamizha/tamil-fonts diff --git a/data/fontrepo/fonts/Thenee/font.ini b/data/fontrepo/fonts/Thenee/font.ini index dffbcdc..b196f41 100644 --- a/data/fontrepo/fonts/Thenee/font.ini +++ b/data/fontrepo/fonts/Thenee/font.ini @@ -1,6 +1,6 @@ [Thenee] languages=ta version=1.0 -license=GPL 2 +license=GPL-2.0 licensefile=gpl-2.0.txt url=https://github.com/thamizha/tamil-fonts diff --git a/data/fontrepo/fonts/TuladhaJejeg/font.ini b/data/fontrepo/fonts/TuladhaJejeg/font.ini index 94876fa..d5af4bb 100644 --- a/data/fontrepo/fonts/TuladhaJejeg/font.ini +++ b/data/fontrepo/fonts/TuladhaJejeg/font.ini @@ -1,6 +1,6 @@ [Tuladha Jejeg] languages=jv,jv-java* version=2.0.1 -license=OFL 1.1 +license=OFL-1.1 licensefile=OFL.txt url=https://sites.google.com/site/jawaunicode/ diff --git a/data/fontrepo/fonts/UnifrakturMaguntia/font.ini b/data/fontrepo/fonts/UnifrakturMaguntia/font.ini index 35ffba5..1e691ed 100644 --- a/data/fontrepo/fonts/UnifrakturMaguntia/font.ini +++ b/data/fontrepo/fonts/UnifrakturMaguntia/font.ini @@ -1,6 +1,6 @@ [UnifrakturMaguntia] version=2012-10-19 -license=OFL 1.1 +license=OFL-1.1 licensefile=OFL.txt url=http://unifraktur.sourceforge.net/maguntia.html ttf=UnifrakturMaguntia.ttf diff --git a/data/fontrepo/fonts/amiri/font.ini b/data/fontrepo/fonts/amiri/font.ini index 3c4c6f8..50c866e 100644 --- a/data/fontrepo/fonts/amiri/font.ini +++ b/data/fontrepo/fonts/amiri/font.ini @@ -1,7 +1,7 @@ [Amiri] languages=ar*, arb*, fa version=1.0.2 -license=OFL 1.1 +license=OFL-1.1 licensefile=OFL.txt url=http://amirifont.org ttf=amiri-regular.ttf diff --git a/data/fontrepo/fonts/lklug/font.ini b/data/fontrepo/fonts/lklug/font.ini index 8458a8d..6101f00 100644 --- a/data/fontrepo/fonts/lklug/font.ini +++ b/data/fontrepo/fonts/lklug/font.ini @@ -1,7 +1,7 @@ [lklug] languages=si version=0.6 -license=GPL-2 +license=GPL-2.0 licensefile=gpl-2.0.txt //URL is 404 at present. Current version is derived from Debian. url=http://www.lug.lk/fonts/lklug diff --git a/data/fontrepo/fonts/madan/font.ini b/data/fontrepo/fonts/madan/font.ini index 4a184f8..c3f6b23 100644 --- a/data/fontrepo/fonts/madan/font.ini +++ b/data/fontrepo/fonts/madan/font.ini @@ -1,6 +1,6 @@ [Madan] languages=ne version=2 -license=GPL +license=GPL-2.0 licensefile=gpl-2.0.txt url=http://www.mpp.org.np diff --git a/data/fontrepo/fonts/saweri/font.ini b/data/fontrepo/fonts/saweri/font.ini index 05ba4d3..8b8b0aa 100644 --- a/data/fontrepo/fonts/saweri/font.ini +++ b/data/fontrepo/fonts/saweri/font.ini @@ -1,6 +1,6 @@ [Saweri] languages=bug*, mak* version=2 -license=GPL3 +license=GPL-3.0 licensefile=gpl-3.0.txt url=https://sites.google.com/site/niariot87/ diff --git a/data/fontrepo/fonts/utkal/font.ini b/data/fontrepo/fonts/utkal/font.ini index e4e1dd7..486df0c 100644 --- a/data/fontrepo/fonts/utkal/font.ini +++ b/data/fontrepo/fonts/utkal/font.ini @@ -1,6 +1,6 @@ [Utkal] languages=or version=0.13 -license=GPL +license=GPL-2.0 licensefile=gpl-2.0.txt url=http://oriya.sarovar.org/user_download.html diff --git a/data/fontrepo/licenses/LICENSES b/data/fontrepo/licenses/LICENSES new file mode 100644 index 0000000..d3538b8 --- /dev/null +++ b/data/fontrepo/licenses/LICENSES @@ -0,0 +1,31 @@ +Common Licenses +--------------- + +Use following as identifier in fonts.ini for license field. License texts are +available under licenses/ directory. + +Apache-2.0 +CC-BY-3.0 +GPL-2.0 +GPL-2.0+ +GPL-2.0-with-font-exception +GPL-3.0 +GPL-3.0+ +GPL-3.0-with-font-exception +LGPL-2.0.1+ +LGPL-2.1+ +OFL-1.1 + +Other +----- +East Syriac Adiabene License +IranianSans +George-Douros +Xerxes + +See: https://spdx.org/licenses/ + +TODO +---- +* Cleanup: Estrangelo Edessa License +* Cleanup: SertoUrhoy License -- To view, visit https://gerrit.wikimedia.org/r/93026 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia3aa6396cf5197c6baaff716d27682dd23b7674e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: KartikMistry <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
