Fixes for Iceweasel 6; drop 3.5 support

diff --git a/debian/patches/iceweasel_6_support b/debian/patches/iceweasel_6_support
new file mode 100644 (file)
index 0000000..bfc081a
--- /dev/null
+++ b/debian/patches/iceweasel_6_support
@@ -0,0 +1,50 @@
+Origin: upstream
+Subject: Support Iceweasel up to version 6
+Forwarded: not-needed
+
+Minor tweaks to make Pentadactyl work with newer versions of Iceweasel.
+This patch is equivalent to the difference between 1.0b6 and 1.0b6.1
+(which is not in the upstream hg repository).
+
+This patch originated upstream.
+Index: devel/common/content/events.js
+===================================================================
+--- devel.orig/common/content/events.js        2011-07-23 17:09:11.000000000 +0200
++++ devel/common/content/events.js     2011-07-23 17:14:10.000000000 +0200
+@@ -1611,7 +1611,7 @@
+                         filter.keys = events.fromString(vals[0]).map(events.closure.toString);
+ 
+                         filter.commandKeys = vals.slice(1).map(events.closure.canonicalKeys);
+-                        filter.inputKeys = filter.commandKeys.filter(/^<[ACM]-/);
++                        filter.inputKeys = filter.commandKeys.filter(function (s) /^<[ACM]-/.test(s));
+                     });
+                     this.flush();
+                     return values;
+Index: devel/common/modules/options.jsm
+===================================================================
+--- devel.orig/common/modules/options.jsm      2011-07-23 17:09:17.000000000 +0200
++++ devel/common/modules/options.jsm   2011-07-23 17:10:38.000000000 +0200
+@@ -466,7 +466,7 @@
+ 
+         regexplist: function regexplist(k, default_) {
+             for (let re in values(this.value))
+-                if (re(k))
++                if ((re.test || re).call(re, k))
+                     return re.result;
+             return arguments.length > 1 ? default_ : null;
+         },
+Index: devel/pentadactyl/install.rdf
+===================================================================
+--- devel.orig/pentadactyl/install.rdf 2011-07-23 17:09:28.000000000 +0200
++++ devel/pentadactyl/install.rdf      2011-07-23 17:09:47.000000000 +0200
+@@ -31,8 +31,8 @@
+         <em:targetApplication>
+             <Description
+                 em:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
+-                em:minVersion="3.5"
+-                em:maxVersion="4.0.*"/>
++                em:minVersion="3.6"
++                em:maxVersion="6.*"/>
+         </em:targetApplication>
+     </Description>
+ </RDF>

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..b6b4f3e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+iceweasel_6_support