[or-cvs] [https-everywhere/master 2/3] Un-break install.rdf

[pde at torproject.org]

Author: Peter Eckersley <pde at eff.org>
Date: Mon, 1 Nov 2010 16:13:12 -0700
Subject: Un-break install.rdf
Commit: 74021cdacd776d28d2d4941a805f7261d720c3c4

---
 src/chrome/content/rules/Cisco.xml |    2 +-
 src/chrome/content/rules/Enom.xml  |    2 +-
 src/install.rdf                    |   58 ++++++++++++++++++++----------------
 3 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/src/chrome/content/rules/Cisco.xml b/src/chrome/content/rules/Cisco.xml
index 48ca510..9055ce1 100644
--- a/src/chrome/content/rules/Cisco.xml
+++ b/src/chrome/content/rules/Cisco.xml
@@ -1,3 +1,3 @@
-<ruleset name="cisco.com">
+<ruleset name="Cisco">
   <rule from="^http://(www\.)?cisco\.com/" to="https://www.cisco.com/"/>
 </ruleset>
diff --git a/src/chrome/content/rules/Enom.xml b/src/chrome/content/rules/Enom.xml
index c025b3b..1d7abf1 100644
--- a/src/chrome/content/rules/Enom.xml
+++ b/src/chrome/content/rules/Enom.xml
@@ -1,3 +1,3 @@
-<ruleset name="Enom.com">
+<ruleset name="Enom">
   <rule from="^http://(www\.)?enom\.com/" to="https://www.enom.com/"/>
 </ruleset>
diff --git a/src/install.rdf b/src/install.rdf
index 03cb167..2fcd295 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -1,27 +1,33 @@
 <?xml version="1.0"?>
-<RDF:RDF xmlns:em="http://www.mozilla.org/2004/em-rdf#"
-         xmlns:NC="http://home.netscape.com/NC-rdf#"
-         xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <RDF:Description RDF:about="rdf:#$RVNn+"
-                   em:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
-                   em:minVersion="3.0"
-                   em:maxVersion="4.0" />
-  <RDF:Description RDF:about="urn:mozilla:install-manifest"
-                   em:name="HTTPS-Everywhere"
-                   em:creator="Mike Perry &amp; Peter Eckersley"
-                   em:id="https-everywhere at eff.org"
-                   em:version="0.2.3.development.2"
-                   em:homepageURL="https://www.eff.org/https-everywhere"
-                   em:optionsURL="chrome://https-everywhere/content/preferences.xul"
-                   em:iconURL="chrome://https-everywhere/skin/https-everywhere.png"
-                   em:updateURL="https://www.eff.org/files/https-everywhere-update.rdf"
-                   em:unpack="true"
-                   em:updateKey="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDSry2bbc4waMQHAqFZ7dR53eJUXR8EMAW/TxMqT2Tnx1Zd16nh7RCv2/lVWpSD706SmZC39mUpJPkc53XEZtdRelWIh0+oBK5kjhDx+C+N6IzWPScbL+NdIymNpA4yIHMYkfX5XJgJ67l6JkFzqoWPorcw8dhxUeRASMwEM6B1EQIDAQAB">
-    <em:targetApplication RDF:resource="rdf:#$RVNn+"/>
-    <em:targetApplication RDF:resource="rdf:#$WVNn+"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="rdf:#$WVNn+"
-                   em:id="{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}"
-                   em:minVersion="1.0"
-                   em:maxVersion="2.0.*" />
-</RDF:RDF>
+<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:name>HTTPS-Everywhere</em:name>
+        <em:creator>Mike Perry &amp; Peter Eckersley</em:creator>
+        <em:id>https-everywhere at eff.org</em:id>
+        <em:version>0.2.3.development.2</em:version>
+        <em:homepageURL>https://www.eff.org/https-everywhere</em:homepageURL>
+        <em:optionsURL>chrome://https-everywhere/content/preferences.xul</em:optionsURL>
+        <em:iconURL>chrome://https-everywhere/skin/https-everywhere.png</em:iconURL>
+        <em:updateURL>https://www.eff.org/files/https-everywhere-update.rdf</em:updateURL>
+		<em:unpack>true</em:unpack> <!-- Required for Firefox 4 -->
+        <em:updateKey="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDSry2bbc4waMQHAqFZ7dR53eJUXR8EMAW/TxMqT2Tnx1Zd16nh7RCv2/lVWpSD706SmZC39mUpJPkc53XEZtdRelWIh0+oBK5kjhDx+C+N6IzWPScbL+NdIymNpA4yIHMYkfX5XJgJ67l6JkFzqoWPorcw8dhxUeRASMwEM6B1EQIDAQAB">
+        <!-- firefox -->
+        <em:targetApplication>
+            <Description>
+                <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
+                <em:minVersion>3.0</em:minVersion>
+                <em:maxVersion>4.0</em:maxVersion>
+            </Description>
+        </em:targetApplication>
+        <!-- Seamonkey -->
+        <em:targetApplication>
+            <Description>
+                <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
+                <em:minVersion>1.0</em:minVersion>
+                <em:maxVersion>2.0.*</em:maxVersion>
+            </Description>
+        </em:targetApplication>
+    </Description>
+</RDF>
-- 
1.7.1