Update the SPDX license list to v3.5

1 files changed, 44 insertions, 25 deletions

diff --git a/libappstream-glib/as-license-ids.txt b/libappstream-glib/as-license-ids.txt
index aac4b08..f27a9f0 100644
--- a/libappstream-glib/as-license-ids.txt
+++ b/libappstream-glib/as-license-ids.txt
@@ -1,4 +1,4 @@
-# the list of licenses from http://spdx.org/licenses/ version: 3.0
+# the list of licenses from http://spdx.org/licenses/ version: 3.5
 0BSD
 AAL
 Abstyles
@@ -11,7 +11,8 @@ AFL-2.0
 AFL-2.1
 AFL-3.0
 Afmparse
-AGPL-1.0
+AGPL-1.0-only
+AGPL-1.0-or-later
 AGPL-3.0-only
 AGPL-3.0-or-later
 Aladdin
@@ -28,9 +29,9 @@ APSL-1.0
 APSL-1.1
 APSL-1.2
 APSL-2.0
+Artistic-1.0
 Artistic-1.0-cl8
 Artistic-1.0-Perl
-Artistic-1.0
 Artistic-2.0
 Bahyph
 Barr
@@ -39,19 +40,19 @@ BitTorrent-1.0
 BitTorrent-1.1
 Borceux
 BSD-1-Clause
+BSD-2-Clause
 BSD-2-Clause-FreeBSD
 BSD-2-Clause-NetBSD
 BSD-2-Clause-Patent
-BSD-2-Clause
+BSD-3-Clause
 BSD-3-Clause-Attribution
 BSD-3-Clause-Clear
 BSD-3-Clause-LBNL
-BSD-3-Clause-No-Nuclear-License-2014
 BSD-3-Clause-No-Nuclear-License
+BSD-3-Clause-No-Nuclear-License-2014
 BSD-3-Clause-No-Nuclear-Warranty
-BSD-3-Clause
-BSD-4-Clause-UC
 BSD-4-Clause
+BSD-4-Clause-UC
 BSD-Protection
 BSD-Source-Code
 BSL-1.0
@@ -59,6 +60,7 @@ bzip2-1.0.5
 bzip2-1.0.6
 Caldera
 CATOSL-1.1
+CC0-1.0
 CC-BY-1.0
 CC-BY-2.0
 CC-BY-2.5
@@ -89,7 +91,6 @@ CC-BY-SA-2.0
 CC-BY-SA-2.5
 CC-BY-SA-3.0
 CC-BY-SA-4.0
-CC0-1.0
 CDDL-1.0
 CDDL-1.1
 CDLA-Permissive-1.0
@@ -100,11 +101,15 @@ CECILL-2.0
 CECILL-2.1
 CECILL-B
 CECILL-C
+CERN-OHL-1.1
+CERN-OHL-1.2
 ClArtistic
 CNRI-Jython
-CNRI-Python-GPL-Compatible
 CNRI-Python
+CNRI-Python-GPL-Compatible
 Condor-1.1
+copyleft-next-0.3.0
+copyleft-next-0.3.1
 CPAL-1.0
 CPL-1.0
 CPOL-1.02
@@ -160,6 +165,7 @@ GPL-3.0-or-later
 gSOAP-1.3b
 HaskellReport
 HPND
+HPND-sell-variant
 IBM-pibs
 ICU
 IJG
@@ -167,13 +173,14 @@ ImageMagick
 iMatix
 Imlib2
 Info-ZIP
-Intel-ACPI
 Intel
+Intel-ACPI
 Interbase-1.0
 IPA
 IPL-1.0
 ISC
 JasPer-2.0
+JPNIC
 JSON
 LAL-1.2
 LAL-1.3
@@ -187,10 +194,12 @@ LGPL-3.0-only
 LGPL-3.0-or-later
 LGPLLR
 Libpng
+libpng-2.0
 libtiff
 LiLiQ-P-1.1
 LiLiQ-R-1.1
 LiLiQ-Rplus-1.1
+Linux-OpenIB
 LPL-1.0
 LPL-1.02
 LPPL-1.0
@@ -200,18 +209,19 @@ LPPL-1.3a
 LPPL-1.3c
 MakeIndex
 MirOS
+MIT
+MIT-0
 MIT-advertising
 MIT-CMU
 MIT-enna
 MIT-feh
-MIT
 MITNFA
 Motosoto
 mpich2
 MPL-1.0
 MPL-1.1
-MPL-2.0-no-copyleft-exception
 MPL-2.0
+MPL-2.0-no-copyleft-exception
 MS-PL
 MS-RL
 MTLL
@@ -221,8 +231,8 @@ NASA-1.3
 Naumen
 NBPL-1.0
 NCSA
-Net-SNMP
 NetCDF
+Net-SNMP
 Newsletr
 NGPL
 NLOD-1.0
@@ -238,19 +248,23 @@ NTP
 OCCT-PL
 OCLC-2.0
 ODbL-1.0
+ODC-By-1.0
 OFL-1.0
 OFL-1.1
+OGL-UK-1.0
+OGL-UK-2.0
+OGL-UK-3.0
 OGTSL
 OLDAP-1.1
 OLDAP-1.2
 OLDAP-1.3
 OLDAP-1.4
-OLDAP-2.0.1
 OLDAP-2.0
+OLDAP-2.0.1
 OLDAP-2.1
+OLDAP-2.2
 OLDAP-2.2.1
 OLDAP-2.2.2
-OLDAP-2.2
 OLDAP-2.3
 OLDAP-2.4
 OLDAP-2.5
@@ -284,16 +298,17 @@ RPSL-1.0
 RSA-MD
 RSCPL
 Ruby
-SAX-PD
 Saxpath
+SAX-PD
 SCEA
 Sendmail
+Sendmail-8.23
 SGI-B-1.0
 SGI-B-1.1
 SGI-B-2.0
 SimPL-2.0
-SISSL-1.2
 SISSL
+SISSL-1.2
 Sleepycat
 SMLNJ
 SMPPL
@@ -304,11 +319,14 @@ Spencer-99
 SPL-1.0
 SugarCRM-1.1.3
 SWL
+TAPR-OHL-1.0
 TCL
 TCP-wrappers
 TMate
 TORQUE-1.1
 TOSL
+TU-Berlin-1.0
+TU-Berlin-2.0
 Unicode-DFS-2015
 Unicode-DFS-2016
 Unicode-TOU
@@ -317,9 +335,9 @@ UPL-1.0
 Vim
 VOSTROM
 VSL-1.0
+W3C
 W3C-19980720
 W3C-20150513
-W3C
 Watcom-1.0
 Wsuipa
 WTFPL
@@ -336,35 +354,36 @@ Zed
 Zend-2.0
 Zimbra-1.3
 Zimbra-1.4
-zlib-acknowledgement
 Zlib
+zlib-acknowledgement
 ZPL-1.1
 ZPL-2.0
 ZPL-2.1
+AGPL-1.0
 AGPL-3.0
 eCos-2.0
 GFDL-1.1
 GFDL-1.2
 GFDL-1.3
-GPL-1.0+
 GPL-1.0
+GPL-1.0+
+GPL-2.0
 GPL-2.0+
 GPL-2.0-with-autoconf-exception
 GPL-2.0-with-bison-exception
 GPL-2.0-with-classpath-exception
 GPL-2.0-with-font-exception
 GPL-2.0-with-GCC-exception
-GPL-2.0
+GPL-3.0
 GPL-3.0+
 GPL-3.0-with-autoconf-exception
 GPL-3.0-with-GCC-exception
-GPL-3.0
-LGPL-2.0+
 LGPL-2.0
-LGPL-2.1+
+LGPL-2.0+
 LGPL-2.1
-LGPL-3.0+
+LGPL-2.1+
 LGPL-3.0
+LGPL-3.0+
 Nunit
 StandardML-NJ
 wxWindows