Adjust licenses and rules post-merge

Use correct function names
Remove duplicated license
Remove duplicated rules
Update failed merges
Adjust and rename rules as needed

Signed-off-by: Philippe Ombredanne <[email protected]>

Author: pombredanne

src/licensedcode/data/licenses/samba-dco-1.0.LICENSE

@@ -1,6 +1,5 @@
 ---
 license_expression: apache-2.0
-<<<<<<< HEAD
 is_license_tag: yes
 ignorable_urls:
     - http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -10,10 +9,4 @@ ignorable_urls:
     <license>
         <name>{{Apache License, version 2.0}}</name>
         <url>{{ http://www.apache.org/licenses/LICENSE-2.0.txt }}</url>
-=======
-is_license_notice: yes
-relevance: 100
----
 
-library under The Apache Licence, version 2.0
->>>>>>> refs/remotes/upstream/develop

src/licensedcode/data/rules/apache-2.0_1366.RULE

@@ -1,17 +1,10 @@
 ---
 license_expression: apache-2.0
-<<<<<<< HEAD
 is_license_tag: yes
 ignorable_urls:
     - http://www.apache.org/licenses/LICENSE-2.0.txt
 ---
 
 <name>{{Apache License, version 2.0}}</name>
     <url>{{ http://www.apache.org/licenses/LICENSE-2.0.txt }}</url>
-=======
-is_license_notice: yes
-relevance: 100
----
 
-under the terms of the Apache Licence, Version 2.0
->>>>>>> refs/remotes/upstream/develop

src/licensedcode/data/rules/apache-2.0_1367.RULE

@@ -1,14 +1,11 @@
 ---
 license_expression: gpl-2.0
 is_license_reference: yes
-<<<<<<< HEAD
 is_deprecated: yes
-=======
 is_required_phrase: yes
->>>>>>> refs/remotes/upstream/develop
 relevance: 100
 replaced_by:
     - gpl-2.0
 ---
 
-GNU General Public License v2
+GNU General Public License v2

src/licensedcode/data/rules/gpl-2.0_767.RULE

@@ -1,14 +1,11 @@
 ---
 license_expression: lgpl-3.0
 is_license_reference: yes
-<<<<<<< HEAD
 is_deprecated: yes
-=======
 is_required_phrase: yes
->>>>>>> refs/remotes/upstream/develop
 relevance: 100
 replaced_by:
     - lgpl-3.0
 ---
 
-licenses.nuget.org/LGPL-3.0-only
+licenses.nuget.org/LGPL-3.0-only

src/licensedcode/data/rules/lgpl-3.0_297.RULE

@@ -1,27 +1,9 @@
 ---
 license_expression: lgpl-3.0
-<<<<<<< HEAD
 is_license_tag: yes
 is_continuous: yes
 relevance: 100
 ---
 
 {{ SPDX-LicenseIdentifier: LGPL-3.0-only }}
-=======
-is_license_notice: yes
----
 
-This library is free software; you can redistribute it and/or
-modify it under the terms of the {{GNU Lesser General Public
-License as published by the Free Software Foundation version
-3.0 of the License.}}
-                                                                                
-This library 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
-Lesser General Public License for more details.
-                                                                                
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
->>>>>>> refs/remotes/upstream/develop

src/licensedcode/data/rules/lgpl-3.0_322.RULE

@@ -0,0 +1,7 @@
+---
+license_expression: samba-dc-1.0
+is_license_reference: yes
+relevance: 100
+---
+
+"Samba Developer's Declaration, Version 1.0"

src/licensedcode/data/rules/samba-dc-1.0_1.RULE

@@ -1,5 +1,5 @@
 ---
-license_expression: samba-dco-1.0 AND dco-1.1 AND cc-by-sa-4.0
+license_expression: samba-dc-1.0 AND dco-1.1 AND cc-by-sa-4.0
 is_license_notice: yes
 notes: this is a license of license, hence we treat it as a mere clue
 ignorable_copyrights:

src/licensedcode/data/rules/samba-dco-1.0_and_dco-1.1_and_cc-by-sa-4.0_1.RULE renamed to src/licensedcode/data/rules/samba-dc-1.0_and_dco-1.1_and_cc-by-sa-4.0_1.RULE

@@ -2339,8 +2339,8 @@ def _set_continuous(self):
         ):
             self.is_continuous = True
 
-    def build_key_phrase_spans(self):
-        """rules_data_dir
+    def build_required_phrase_spans(self):
+        """
         Return a list of Spans marking key phrases token positions of that must
         be present for this rule to be matched.
         """