Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (<https://spdx.org/licenses/>),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: Id75a37eab27282ca7797fa3e6ceb92750c59477f

composer.json

@@ -10,7 +10,7 @@
 	],
 	"homepage": "https://www.mediawiki.org/wiki/Extension:UniversalLanguageSelector",
 	"license": [
-		"GPL-2.0+",
+		"GPL-2.0-or-later",
 		"MIT"
 	],
 	"support": {

data/fontrepo/fonts/Artaxerxes/font.ini

@@ -1,7 +1,7 @@
 [Artaxerxes]
 languages=peo*
 version=1.400
-license=GPL-2.0-with-font-exception
+license=GPL-2.0-or-later WITH Font-exception-2.0
 licensefile=gpl-2.0.txt
 request-url=https://gerrit.wikimedia.org/r/#/c/110534
 url=https://github.com/PersianWikipedia/artaxerxes

data/fontrepo/fonts/FreeFontThana/font.ini

@@ -1,7 +1,7 @@
 [FreeFont-Thaana]
 languages=dv*
 version=1.0
-license=GPL-3.0
+license=GPL-3.0-only
 licensefile=gpl-3.0.txt
 url=www.gnu.org/software/freefont
 request-url=https://phabricator.wikimedia.org/T44812

data/fontrepo/fonts/KhmerOS/font.ini

@@ -1,6 +1,6 @@
 [KhmerOS]
 languages=km
 version=1.10
-license=LGPL-2.0.1+
+license=LGPL-2.1-or-later
 licensefile=lgpl-2.1.txt
 url=http://www.khmeros.info/drupal612/en/fonts

data/fontrepo/fonts/KhmerOSbattambang/font.ini

@@ -1,7 +1,7 @@
 [KhmerOSbattambang]
 languages=km*
 version=1.10
-license=LGPL-2.1+
+license=LGPL-2.1-or-later
 licensefile=lgpl-2.1.txt
 request-url=https://www.mediawiki.org/wiki/Special:Code/MediaWiki/87161
 url=http://www.khmeros.info/drupal612/en/fonts

data/fontrepo/fonts/MiriamCLM/font.ini

@@ -1,6 +1,6 @@
 [Miriam CLM]
 languages=he
 version=0.130
-license=GPL-2.0+
+license=GPL-2.0-or-later
 licensefile=gpl-2.0.txt
 url=http://culmus.sourceforge.net/

data/fontrepo/fonts/Myanmar3/font.ini

@@ -1,6 +1,6 @@
 [Myanmar3]
 languages=my
 version=3.0
-license=LGPL-2.1+
+license=LGPL-2.1-or-later
 licensefile=lgpl-2.1.txt
 url=http://code.google.com/p/myanmar3source/

data/fontrepo/fonts/NafeesWeb/font.ini

@@ -1,7 +1,7 @@
 [NafeesWeb]
 languages=ur
 version=1.2
-license=GPL-2.0
+license=GPL-2.0-only
 licensefile=gpl-2.0.txt
 request-url=https://phabricator.wikimedia.org/T48693
 ;URL seems broken but, Debian has this font confirming its license validity.

data/fontrepo/fonts/Nazli/font.ini

@@ -1,7 +1,7 @@
 [Nazli]
 languages=fa
 version=0.4
-license=GPL-2.0
+license=GPL-2.0-only
 licensefile=gpl-2.0.txt
 request-url=https://gerrit.wikimedia.org/r/#/c/76349/
 url=http://persian-computing.org/

data/fontrepo/fonts/OskiEast/font.ini

@@ -1,7 +1,7 @@
 [OskiEast]
 languages=cr*, iu
 version=2.200
-license=GPL-3.0
+license=GPL-3.0-only
 licensefile=gpl-3.0.txt
 request-url=https://gerrit.wikimedia.org/r/#/c/80548/
 url=http://www.languagegeek.com/font/fontdownload.html#AlgonAndInu

data/fontrepo/fonts/Pagul/font.ini

@@ -1,7 +1,7 @@
 [Pagul]
 languages=saz*
 version=1.0
-license=GPL-3.0.0-with-font-exception
+license=GPL-3.0-only WITH Font-exception-2.0
 licensefile=gpl-3.0.txt
 request-url=https://www.mediawiki.org/wiki/Special:Code/MediaWiki/87738
 url=http://sourceforge.net/projects/pagul/

data/fontrepo/fonts/Shapour/font.ini

@@ -1,7 +1,7 @@
 [Shapour]
 languages=pal*
 version=001.000
-license=GPL-3.0+
+license=GPL-3.0-or-later
 licensefile=gpl-3.0.txt
 request-url=https://phabricator.wikimedia.org/T46076
 url=https://github.com/behaafarid/shapour_font

data/fontrepo/fonts/SiyamRupali/font.ini

@@ -1,7 +1,7 @@
 [Siyam Rupali]
 languages=bn*, bpy*
 version=1.070
-license=GPL-3.0
+license=GPL-3.0-only
 licensefile=gpl-3.0.txt
 request-url=https://phabricator.wikimedia.org/T35599, https://phabricator.wikimedia.org/T39863
 url=https://github.com/potasiyam/Siyam-Rupali

data/fontrepo/fonts/TaameyFrankCLM/font.ini

@@ -1,7 +1,7 @@
 [Taamey Frank CLM]
 languages=hbo*, he
 version=0.110
-license=GPL-2.0+
+license=GPL-2.0-or-later
 licensefile=gpl-2.0.txt
 request-url=https://he.wikisource.org/wiki/%D7%95%D7%99%D7%A7%D7%99%D7%98%D7%A7%D7%A1%D7%98:%D7%9E%D7%96%D7%A0%D7%95%D7%9F/%D7%90%D7%A8%D7%9B%D7%99%D7%95%D7%9F_%D7%99%D7%95%D7%9C%D7%99_2013#.D7.92.D7.95.D7.A4.D7.A0.D7.99.D7.9D.21
 url=http://culmus.sourceforge.net/

data/fontrepo/fonts/lklug/font.ini

@@ -1,7 +1,7 @@
 [lklug]
 languages=si
 version=0.6
-license=GPL-2.0
+license=GPL-2.0-only
 licensefile=gpl-2.0.txt
 ; URL is 404 at present. Current version is derived from Debian.
 url=http://www.lug.lk/fonts/lklug

data/fontrepo/fonts/saweri/font.ini

@@ -1,7 +1,7 @@
 [Saweri]
 languages=bug*, mak*
 version=2
-license=GPL-3.0
+license=GPL-3.0-only
 licensefile=gpl-3.0.txt
 request-url=http://www.mediawiki.org/wiki/Special:Code/MediaWiki/111928
 url=https://sites.google.com/site/niariot87/

data/fontrepo/licenses/README

@@ -5,14 +5,13 @@ Common Licenses
 ---------------
 Apache-2.0
 CC-BY-3.0
-GPL-2.0
+GPL-2.0-only
-GPL-2.0+
+GPL-2.0-or-later
-GPL-2.0-with-font-exception
+GPL-2.0-or-later WITH Font-exception-2.0
-GPL-3.0
+GPL-3.0-only
-GPL-3.0+
+GPL-3.0-or-later
-GPL-3.0-with-font-exception
+GPL-3.0-only WITH Font-exception-2.0
-LGPL-2.0.1+
+LGPL-2.1-or-later
-LGPL-2.1+
 OFL-1.1
 
 Other

maintenance/ULSCompactLinksDisablePref.php

@@ -4,7 +4,7 @@
  * preference for appropriate users
  *
  * @copyright 2017 Wikimedia Language team and others; see AUTHORS.txt
- * @license GPL-2.0+
+ * @license GPL-2.0-or-later
  * @author Niklas Laxström
  * @author Amir E. Aharoni
  * Based on autodisablePref.php from the VisualEditor repository by Alex Monk

resources/js/ext.uls.compactlinks.js

@@ -13,7 +13,7 @@
  *
  * @file
  * @ingroup Extensions
- * @licence GNU GPL-2.0+
+ * @licence GNU GPL-2.0-or-later
  * @licence MIT License
  */
 

scripts/compile-font-repo.php

@@ -2,7 +2,7 @@
 /**
  *
  * @author Niklas Laxström
- * @license GPL-2.0+
+ * @license GPL-2.0-or-later
  * @file
  */
 

scripts/generate-font-test-page.php

@@ -2,7 +2,7 @@
 /**
  *
  * @author Niklas Laxström
- * @license GPL-2.0+
+ * @license GPL-2.0-or-later
  * @file
  */