diff options
| author | Richard Hughes <richard@hughsie.com> | 2015-06-22 09:58:01 +0100 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2015-06-22 09:58:01 +0100 |
| commit | 1dcd2610041a62290aa07be8e45f428fb9f1a159 (patch) | |
| tree | 925685b350ea68e773623d0dd879c2308b439ea7 | |
| parent | 7e06f58d094c2ede5b9c4622ce3897a810a842af (diff) | |
| download | appstream-glib-1dcd2610041a62290aa07be8e45f428fb9f1a159.tar.gz | |
Update the SPDX licence list to v2.0
| -rw-r--r-- | libappstream-builder/asb-package-rpm.c | 2 | ||||
| -rw-r--r-- | libappstream-glib/as-license-ids.txt | 40 |
2 files changed, 24 insertions, 18 deletions
diff --git a/libappstream-builder/asb-package-rpm.c b/libappstream-builder/asb-package-rpm.c index ad2a372..bd34f83 100644 --- a/libappstream-builder/asb-package-rpm.c +++ b/libappstream-builder/asb-package-rpm.c @@ -105,6 +105,8 @@ asb_package_rpm_set_license (AsbPackage *pkg, const gchar *license) { "CDDL", "CDDL-1.0" }, { "CeCILL-C", "CECILL-C" }, { "CeCILL", "CECILL-2.0" }, + { "CPAL", "CPAL-1.0" }, + { "CPL", "CPL-1.0" }, { "EPL", "EPL-1.0" }, { "Free Art", "ClArtistic" }, { "GFDL", "GFDL-1.3" }, diff --git a/libappstream-glib/as-license-ids.txt b/libappstream-glib/as-license-ids.txt index 44cabf1..ff49053 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: 1.20 +# the list of licenses from http://spdx.org/licenses/ version: 2.0 Glide Abstyles AFL-1.1 @@ -107,7 +107,6 @@ Dotseqn DSDP dvipdfm EPL-1.0 -eCos-2.0 ECL-1.0 ECL-2.0 eGenix @@ -124,6 +123,7 @@ Eurosym Fair MIT-feh Frameworx-1.0 +FreeImage FTL FSFUL FSFULLR @@ -135,24 +135,11 @@ GFDL-1.1 GFDL-1.2 GFDL-1.3 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-3.0 -GPL-3.0+ -GPL-3.0-with-autoconf-exception -GPL-3.0-with-GCC-exception LGPL-2.1 -LGPL-2.1+ LGPL-3.0 -LGPL-3.0+ LGPL-2.0 -LGPL-2.0+ gnuplot gSOAP-1.3b HaskellReport @@ -231,6 +218,7 @@ OLDAP-2.4 OLDAP-2.5 OLDAP-2.6 OLDAP-2.7 +OLDAP-2.8 OML OPL-1.0 OSL-1.0 @@ -238,7 +226,6 @@ OSL-1.1 OSL-2.0 OSL-2.1 OSL-3.0 -OLDAP-2.8 OpenSSL PHP-3.0 PHP-3.01 @@ -269,7 +256,6 @@ SimPL-2.0 Sleepycat SNIA SMLNJ -StandardML-NJ SugarCRM-1.1.3 SISSL SISSL-1.2 @@ -286,8 +272,8 @@ Vim VOSTROM VSL-1.0 W3C +W3C-19980720 Wsuipa -WXwindows Xnet X11 Xerox @@ -300,8 +286,26 @@ YPL-1.1 Zed Zend-2.0 Zimbra-1.3 +Zimbra-1.4 Zlib zlib-acknowledgement ZPL-1.1 ZPL-2.0 ZPL-2.1 +ICU +eCos-2.0 +GPL-1.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-3.0+ +GPL-3.0-with-autoconf-exception +GPL-3.0-with-GCC-exception +LGPL-2.1+ +LGPL-3.0+ +LGPL-2.0+ +StandardML-NJ +WXwindows |