Add and re-qualify license rules

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

Author: AyanSinhaMahapatra

src/licensedcode/data/licenses/docbook-schema.LICENSE

@@ -2,13 +2,18 @@
 key: docbook-schema
 short_name: DocBook Schema License
 name: DocBook Schema License
-spdx_license_key: DocBook-Schema
 category: Permissive
 owner: OASIS
+spdx_license_key: DocBook-Schema
 other_urls:
     - https://github.com/docbook/xslt10-stylesheets/blob/efd62655c11cc8773708df7a843613fa1e932bf8/xsl/assembly/schema/docbook51b7.rnc
+ignorable_urls:
+    - http://docbook.org/tdg5/en/html/ch05.html#s-notdocbook
+    - http://www.oasis-open.org/docbook
+ignorable_emails:
+    - docbook@lists.oasis-open.org
 ---
- 
+
 Permission to use, copy, modify and distribute the DocBook schema
 and its accompanying documentation for any purpose and without fee
 is hereby granted in perpetuity, provided that the above copyright

src/licensedcode/data/licenses/erlang-otp-linking-exception.LICENSE

@@ -10,6 +10,9 @@ other_urls:
     - https://www.gnu.org/licenses/gpl-faq.en.html#GPLIncompatibleLibs
     - https://erlang.org/pipermail/erlang-questions/2012-May/066355.html
     - https://gitea.osmocom.org/erlang/osmo_ss7/src/commit/2286c1b8738d715950026650bf53f19a69d6ed0e/src/ss7_links.erl#L20
+ignorable_urls:
+    - https://www.erlang.org/
+    - https://www.erlang.org/EPLICENSE
 ---
 
 If you modify this Program, or any covered work, by linking or

src/licensedcode/data/rules/agpl-3.0-plus_298.RULE

@@ -0,0 +1,18 @@
+---
+license_expression: agpl-3.0-plus
+is_license_notice: yes
+ignorable_urls:
+    - https://www.gnu.org/licenses/
+---
+
+This program is free software: you can redistribute it and/or modify it under
+the terms of the GNU Affero General Public License as published by the Free
+Software Foundation, either version 3 of the License, or (at your option) any
+later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License along
+with this program. If not, see <https://www.gnu.org/licenses/>.

src/licensedcode/data/rules/agpl-3.0-plus_299.RULE

@@ -0,0 +1,18 @@
+---
+license_expression: agpl-3.0-plus
+is_license_notice: yes
+ignorable_urls:
+    - http://www.gnu.org/licenses/
+---
+
+This program is free software: you can redistribute it and/or modify it under
+the terms of the GNU Affero General Public License as published by the Free
+Software Foundation, either version 3 of the License, or (at your option) any
+later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License along
+with this program. If not, see <http://www.gnu.org/licenses/>.

src/licensedcode/data/rules/agpl-3.0-plus_or_commercial-license_3.RULE

@@ -4,6 +4,7 @@ is_license_notice: yes
 relevance: 100
 ignorable_urls:
     - https://www.gnu.org/licenses/
+is_deprecated: yes
 ---
 
 This program is free software: you can redistribute it and/or modify it under

src/licensedcode/data/rules/agpl-3.0-plus_or_commercial-license_4.RULE

@@ -4,6 +4,7 @@ is_license_notice: yes
 relevance: 100
 ignorable_urls:
     - http://www.gnu.org/licenses/
+is_deprecated: yes
 ---
 
 This program is free software: you can redistribute it and/or modify it under

src/licensedcode/data/rules/agpl-3.0-plus_with_erlang-otp-linking-exception_1.RULE

@@ -0,0 +1,36 @@
+---
+license_expression: agpl-3.0-plus WITH erlang-otp-linking-exception
+is_license_text: yes
+minimum_coverage: 90
+ignorable_urls:
+    - http://www.erlang.org/
+    - http://www.erlang.org/EPLICENSE
+    - http://www.gnu.org/licenses/
+---
+
+%% This program is free software; you can redistribute it and/or modify
+%% it under the terms of the GNU Affero General Public License as
+%% published by the Free Software Foundation; either version 3 of the
+%% License, or (at your option) any later version.
+%%
+%% This program is distributed in the hope that it will be useful,
+%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%% GNU General Public License for more details.
+%%
+%% You should have received a copy of the GNU Affero General Public License
+%% along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%%
+%% Additional Permission under GNU AGPL version 3 section 7:
+%%
+%% If you modify this Program, or any covered work, by linking or
+%% combining it with runtime libraries of Erlang/OTP as released by
+%% Ericsson on http://www.erlang.org (or a modified version of these
+%% libraries), containing parts covered by the terms of the Erlang Public
+%% License (http://www.erlang.org/EPLICENSE), the licensors of this
+%% Program grant you additional permission to convey the resulting work
+%% without the need to license the runtime libraries of Erlang/OTP under
+%% the GNU Affero General Public License. Corresponding Source for a
+%% non-source form of such a combination shall include the source code
+%% for the parts of the runtime libraries of Erlang/OTP used as well as
+%% that of the covered work.

tests/licensedcode/data/datadriven/external/glc/MIT-NoAd.t1.yml

@@ -1,5 +1,5 @@
 license_expressions:
-  - x11-xconsortium
+  - x11-swapped
 notes: |
   License test derived from a file of the BSD-licensed repository at:
   https://raw.githubusercontent.com/google/licensecheck/v0.3.1/testdata/MIT-NoAd.t1