From e8375f91cdfedc51029bb28d76bb1d9ca1f76f8f Mon Sep 17 00:00:00 2001
From: Andrei Petcu <andreicristianpetcu@users.noreply.github.com>
Date: Fri, 10 Mar 2017 14:01:57 +0200
Subject: [PATCH] #2433 Changed the XML namespaces to please jpm sign (#2434)

*  #2433 changed the legacy install.rdf to match MDN
https://developer.mozilla.org/en-US/Add-ons/Install_Manifests

*  #2433 changed webext install.rdf to match MDN docs
 https://developer.mozilla.org/en-US/Add-ons/Install_Manifests

*  #2433 changed property added by mistake

*  #2433 changed localization XML namespaces to match install.rdf

*  #2433 small fixes
---
 platform/firefox/install.rdf | 106 +++++++++++++++++------------------
 platform/webext/install.rdf  |  51 ++++++++---------
 tools/make-firefox-meta.py   |  14 ++---
 tools/make-webext-meta.py    |  14 ++---
 4 files changed, 93 insertions(+), 92 deletions(-)

diff --git a/platform/firefox/install.rdf b/platform/firefox/install.rdf
index 8cb7a2edd..21bf2861a 100644
--- a/platform/firefox/install.rdf
+++ b/platform/firefox/install.rdf
@@ -1,64 +1,64 @@
-<?xml version="1.0" encoding="utf-8"?>
-<r:RDF xmlns:r="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.mozilla.org/2004/em-rdf#">
-    <r:Description about="urn:mozilla:install-manifest">
-        <id>uBlock0@raymondhill.net</id>
-        <version>{version}</version>
-        <name>{name}</name>
-        <description>{description}</description>
-        <homepageURL>{homepage}</homepageURL>
-        <creator>{author}</creator>
-        <developer>Deathamns</developer>
-        <developer>Alex Vallat</developer>
-        <developer>Manuel Reimer</developer>
-        <type>2</type>
-        <bootstrap>true</bootstrap>
-        <multiprocessCompatible>true</multiprocessCompatible>
-        <optionsType>2</optionsType>
+<?xml version="1.0" encoding="UTF-8"?>
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+    <Description about="urn:mozilla:install-manifest">
+        <em:id>uBlock0@raymondhill.net</em:id>
+        <em:version>{version}</em:version>
+        <em:name>{name}</em:name>
+        <em:description>{description}</em:description>
+        <em:homepageURL>{homepage}</em:homepageURL>
+        <em:creator>{author}</em:creator>
+        <em:developer>Deathamns</em:developer>
+        <em:developer>Alex Vallat</em:developer>
+        <em:developer>Manuel Reimer</em:developer>
+        <em:type>2</em:type>
+        <em:bootstrap>true</em:bootstrap>
+        <em:multiprocessCompatible>true</em:multiprocessCompatible>
+        <em:optionsType>2</em:optionsType>
 {localized}
 
         <!-- Firefox -->
-        <targetApplication>
-            <r:Description>
-                <id>{{ec8030f7-c20a-464f-9b0e-13a3a9e97384}}</id>
-                <minVersion>24.0</minVersion>
-                <maxVersion>*</maxVersion>
-            </r:Description>
-        </targetApplication>
+        <em:targetApplication>
+            <Description>
+                <em:id>{{ec8030f7-c20a-464f-9b0e-13a3a9e97384}}</em:id>
+                <em:minVersion>24.0</em:minVersion>
+                <em:maxVersion>*</em:maxVersion>
+            </Description>
+        </em:targetApplication>
 
         <!-- Fennec -->
-        <targetApplication>
-            <r:Description>
-                <id>{{aa3c5121-dab2-40e2-81ca-7ea25febc110}}</id>
-                <minVersion>24.0</minVersion>
-                <maxVersion>*</maxVersion>
-            </r:Description>
-        </targetApplication>
+        <em:targetApplication>
+            <Description>
+                <em:id>{{aa3c5121-dab2-40e2-81ca-7ea25febc110}}</em:id>
+                <em:minVersion>24.0</em:minVersion>
+                <em:maxVersion>*</em:maxVersion>
+            </Description>
+        </em:targetApplication>
 
         <!-- SeaMonkey -->
-        <targetApplication>
-            <r:Description>
-                <id>{{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}}</id>
-                <minVersion>2.21</minVersion>
-                <maxVersion>*</maxVersion>
-            </r:Description>
-        </targetApplication>
+        <em:targetApplication>
+            <Description>
+                <em:id>{{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}}</em:id>
+                <em:minVersion>2.21</em:minVersion>
+                <em:maxVersion>*</em:maxVersion>
+            </Description>
+        </em:targetApplication>
 
         <!-- Pale Moon -->
-        <targetApplication>
-            <r:Description>
-                <id>{{8de7fcbb-c55c-4fbe-bfc5-fc555c87dbc4}}</id>
-                <minVersion>25.0</minVersion>
-                <maxVersion>27.*</maxVersion>
-            </r:Description>
-        </targetApplication>
+        <em:targetApplication>
+            <Description>
+                <em:id>{{8de7fcbb-c55c-4fbe-bfc5-fc555c87dbc4}}</em:id>
+                <em:minVersion>25.0</em:minVersion>
+                <em:maxVersion>27.*</em:maxVersion>
+            </Description>
+        </em:targetApplication>
 
         <!-- Thunderbird -->
-        <targetApplication>
-            <r:Description>
-                <id>{{3550f703-e582-4d05-9a08-453d09bdfdc6}}</id>
-                <minVersion>31.0</minVersion>
-                <maxVersion>45.*</maxVersion>
-            </r:Description>
-        </targetApplication>
-    </r:Description>
-</r:RDF>
+        <em:targetApplication>
+            <Description>
+                <em:id>{{3550f703-e582-4d05-9a08-453d09bdfdc6}}</em:id>
+                <em:minVersion>31.0</em:minVersion>
+                <em:maxVersion>45.*</em:maxVersion>
+            </Description>
+        </em:targetApplication>
+    </Description>
+</RDF>
diff --git a/platform/webext/install.rdf b/platform/webext/install.rdf
index 35a548e72..5039da2c7 100644
--- a/platform/webext/install.rdf
+++ b/platform/webext/install.rdf
@@ -1,28 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
-<r:RDF xmlns:r="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.mozilla.org/2004/em-rdf#">
-    <r:Description about="urn:mozilla:install-manifest">
-        <id>uBlock0@raymondhill.net</id>
-        <version>{version}</version>
-        <name>{name}</name>
-        <description>{description}</description>
-        <homepageURL>https://github.com/gorhill/uBlock</homepageURL>
-        <creator>{author}</creator>
-        <developer>Deathamns</developer>
-        <developer>Alex Vallat</developer>
-        <developer>Manuel Reimer</developer>
-        <type>2</type>
-        <bootstrap>true</bootstrap>
-        <multiprocessCompatible>true</multiprocessCompatible>
-        <hasEmbeddedWebExtension>true</hasEmbeddedWebExtension>
+<?xml version="1.0" encoding="UTF-8"?>
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+    <Description about="urn:mozilla:install-manifest">
+        <em:id>uBlock0@raymondhill.net</em:id>
+        <em:version>{version}</em:version>
+        <em:name>{name}</em:name>
+        <em:description>{description}</em:description>
+        <em:homepageURL>https://github.com/gorhill/uBlock</em:homepageURL>
+        <em:creator>{author}</em:creator>
+        <em:developer>Deathamns</em:developer>
+        <em:developer>Alex Vallat</em:developer>
+        <em:developer>Manuel Reimer</em:developer>
+        <em:type>2</em:type>
+        <em:bootstrap>true</em:bootstrap>
+        <em:multiprocessCompatible>true</em:multiprocessCompatible>
+        <em:hasEmbeddedWebExtension>true</em:hasEmbeddedWebExtension> 
 {localized}
 
         <!-- Firefox -->
-        <targetApplication>
-            <r:Description>
-                <id>{{ec8030f7-c20a-464f-9b0e-13a3a9e97384}}</id>
-                <minVersion>52.0a1</minVersion>
-                <maxVersion>*</maxVersion>
-            </r:Description>
-        </targetApplication>
-    </r:Description>
-</r:RDF>
+        <em:targetApplication>
+            <Description>
+                <em:id>{{ec8030f7-c20a-464f-9b0e-13a3a9e97384}}</em:id>
+                <em:minVersion>52.0a1</em:minVersion>
+                <em:maxVersion>*</em:maxVersion>
+            </Description>
+        </em:targetApplication>
+
+    </Description>
+</RDF>
diff --git a/tools/make-firefox-meta.py b/tools/make-firefox-meta.py
index 773f6a95d..875885fdb 100644
--- a/tools/make-firefox-meta.py
+++ b/tools/make-firefox-meta.py
@@ -89,14 +89,14 @@ for alpha2 in descriptions:
     if alpha2 == 'en':
         continue
     manifest['localized'].append(
-        '\n' + t*2 + '<localized><r:Description>\n' +
-        t3 + '<locale>' + alpha2 + '</locale>\n' +
-        t3 + '<name>' + manifest['name'] + '</name>\n' +
-        t3 + '<description>' + descriptions[alpha2] + '</description>\n' +
-        t3 + '<creator>' + manifest['author'] + '</creator>\n' +
+        '\n' + t*2 + '<em:localized><Description>\n' +
+        t3 + '<em:locale>' + alpha2 + '</em:locale>\n' +
+        t3 + '<em:name>' + manifest['name'] + '</em:name>\n' +
+        t3 + '<em:description>' + descriptions[alpha2] + '</em:description>\n' +
+        t3 + '<em:creator>' + manifest['author'] + '</em:creator>\n' +
         # t3 + '<translator>' + ??? + '</translator>\n' +
-        t3 + '<homepageURL>' + manifest['homepage'] + '</homepageURL>\n' +
-        t*2 + '</r:Description></localized>'
+        t3 + '<em:homepageURL>' + manifest['homepage'] + '</em:homepageURL>\n' +
+        t*2 + '</Description></em:localized>'
     )
 manifest['localized'] = '\n'.join(manifest['localized'])
 
diff --git a/tools/make-webext-meta.py b/tools/make-webext-meta.py
index dd21761cd..5e299206f 100644
--- a/tools/make-webext-meta.py
+++ b/tools/make-webext-meta.py
@@ -63,14 +63,14 @@ for alpha2 in descriptions:
     if alpha2 == 'en':
         continue
     webext_manifest['localized'].append(
-        '\n' + t*2 + '<localized><r:Description>\n' +
-        t3 + '<locale>' + alpha2 + '</locale>\n' +
-        t3 + '<name>' + webext_manifest['name'] + '</name>\n' +
-        t3 + '<description>' + descriptions[alpha2] + '</description>\n' +
-        t3 + '<creator>' + webext_manifest['author'] + '</creator>\n' +
+        '\n' + t*2 + '<em:localized><Description>\n' +
+        t3 + '<em:locale>' + alpha2 + '</em:locale>\n' +
+        t3 + '<em:name>' + webext_manifest['name'] + '</em:name>\n' +
+        t3 + '<em:description>' + descriptions[alpha2] + '</em:description>\n' +
+        t3 + '<em:creator>' + webext_manifest['author'] + '</em:creator>\n' +
         # t3 + '<translator>' + ??? + '</translator>\n' +
-        t3 + '<homepageURL>' + webext_manifest['homepage'] + '</homepageURL>\n' +
-        t*2 + '</r:Description></localized>'
+        t3 + '<em:homepageURL>' + webext_manifest['homepage'] + '</em:homepageURL>\n' +
+        t*2 + '</Description></em:localized>'
     )
 webext_manifest['localized'] = '\n'.join(webext_manifest['localized'])