Hi,
Julien Cristau wrote:
> > diff -Nru conkeror-1.0~~pre-1+git141025/debian/changelog conkeror-1.0~~pre-1+git141025/debian/changelog
> > --- conkeror-1.0~~pre-1+git141025/debian/changelog 2014-10-25 18:37:02.000000000 +0200
> > +++ conkeror-1.0~~pre-1+git141025/debian/changelog 2015-09-08 22:02:37.000000000 +0200
> > @@ -1,3 +1,11 @@
> > +conkeror (1.0~~pre-1+git141025-1+deb8u1) stable-proposed-updates; urgency=medium
>
> Please use "jessie" as the distribution, and feel free to upload.
Done.
> > + * Cherry-pick 6906955e from upstream master branch to fix matching of
> > + module load error messages to work with Firefox 36 and later
> > + (including the ESR release 38.x in Debian Jessie).
I've also allowed myself to add the missing bug report number here and
in the DEP3 patch header. No further differences compared to the
originally posted debdiff. Full, new debdiff as uploaded follows:
diff -Nru conkeror-1.0~~pre-1+git141025/debian/changelog conkeror-1.0~~pre-1+git141025/debian/changelog
--- conkeror-1.0~~pre-1+git141025/debian/changelog 2014-10-25 18:37:02.000000000 +0200
+++ conkeror-1.0~~pre-1+git141025/debian/changelog 2016-02-23 21:01:37.000000000 +0100
@@ -1,3 +1,11 @@
+conkeror (1.0~~pre-1+git141025-1+deb8u1) jessie; urgency=medium
+
+ * Cherry-pick 6906955e from upstream master branch to fix matching of
+ module load error messages to work with Firefox 36 and later
+ (including the ESR release 38.x in Debian Jessie). (Closes: #795597)
+
+ -- Axel Beckert <abe@debian.org> Tue, 08 Sep 2015 22:00:42 +0200
+
conkeror (1.0~~pre-1+git141025-1) unstable; urgency=low
* New upstream snapshot
diff -Nru conkeror-1.0~~pre-1+git141025/debian/patches/cherry-pick-6906955e-fix-load-error-messages-with-ff36.diff conkeror-1.0~~pre-1+git141025/debian/patches/cherry-pick-6906955e-fix-load-error-messages-with-ff36.diff
--- conkeror-1.0~~pre-1+git141025/debian/patches/cherry-pick-6906955e-fix-load-error-messages-with-ff36.diff 1970-01-01 01:00:00.000000000 +0100
+++ conkeror-1.0~~pre-1+git141025/debian/patches/cherry-pick-6906955e-fix-load-error-messages-with-ff36.diff 2016-02-23 21:01:16.000000000 +0100
@@ -0,0 +1,27 @@
+Origin: commit 6906955ef78caeb357b729e1f608dfe1f0171dcc
+Author: Jeremy Maitin-Shepard <jeremy@jeremyms.com>
+Date: Thu Feb 26 19:10:05 2015 -0800
+Description: application.js: fix matching of module load error messages to work with Firefox 36
+ Firefox 36 includes the path in some error messages, causing them to
+ no longer precisely match the strings that had been specified. Using
+ String.prototype.startsWith fixes the problem.
+Bug-Debian: https://bugs.debian.org/795597
+
+diff --git a/components/application.js b/components/application.js
+index 962ca73..bd9f30c 100644
+--- a/components/application.js
++++ b/components/application.js
+@@ -161,10 +161,9 @@ application.prototype = {
+ return;
+ }
+ } catch (e if (typeof e == 'string' &&
+- {"ContentLength not available (not a local URL?)":true,
+- "Error creating channel (invalid URL scheme?)":true,
+- "Error opening input stream (invalid filename?)":true}
+- [e])) {
++ (e.startsWith("ContentLength not available (not a local URL?)") ||
++ e.startsWith("Error creating channel (invalid URL scheme?)") ||
++ e.startsWith("Error opening input stream (invalid filename?)")))) {
+ // null op. (suppress error, try next path)
+ }
+ if (autoext)
diff -Nru conkeror-1.0~~pre-1+git141025/debian/patches/series conkeror-1.0~~pre-1+git141025/debian/patches/series
--- conkeror-1.0~~pre-1+git141025/debian/patches/series 2014-06-14 11:58:40.000000000 +0200
+++ conkeror-1.0~~pre-1+git141025/debian/patches/series 2016-02-23 18:51:14.000000000 +0100
@@ -1,2 +1,3 @@
sensible-editor-xdg-open.diff
deb-webjumps.diff
+cherry-pick-6906955e-fix-load-error-messages-with-ff36.diff
Regards, Axel
--
,''`. | Axel Beckert <abe@debian.org>, http://people.debian.org/~abe/
: :' : | Debian Developer, ftp.ch.debian.org Admin
`. `' | 4096R: 2517 B724 C5F6 CA99 5329 6E61 2FF9 CD59 6126 16B5
`- | 1024D: F067 EA27 26B9 C3FC 1486 202E C09E 1D89 9593 0EDE
Attachment:
signature.asc
Description: Digital signature