[Pkg-mozext-commits] [sage-extension] 03/05: Handle patch with gbp pq

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository sage-extension.

commit 6a29aeeee0214b21a67bb21dfab59ba4c73f159c
Author: David Prévot <david at tilapin.org>
Date:   Thu Apr 30 22:19:11 2015 -0400

    Handle patch with gbp pq
    
    Git-Dch: Ignore
---
 .../0001-Disable-encoded-content-by-default.patch   | 21 +++++++++++++++++++++
 debian/patches/disable_encoded_content.patch        | 15 ---------------
 debian/patches/series                               |  2 +-
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/debian/patches/0001-Disable-encoded-content-by-default.patch b/debian/patches/0001-Disable-encoded-content-by-default.patch
new file mode 100644
index 0000000..3ec33f8
--- /dev/null
+++ b/debian/patches/0001-Disable-encoded-content-by-default.patch
@@ -0,0 +1,21 @@
+From: Alan Woodland <awoodland at debian.org>
+Date: Sun, 31 Aug 2008 18:20:41 -0330
+Subject: Disable encoded content by default
+
+---
+ defaults/preferences/sage.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/defaults/preferences/sage.js b/defaults/preferences/sage.js
+index bd009ed..e8e4447 100644
+--- a/defaults/preferences/sage.js
++++ b/defaults/preferences/sage.js
+@@ -39,7 +39,7 @@
+ pref("extensions.sage.version", "");
+ pref("extensions.sage.userCss.enable", false);
+ pref("extensions.sage.userCss.path", "");
+-pref("extensions.sage.allowEncodedContent", true);
++pref("extensions.sage.allowEncodedContent", false);
+ pref("extensions.sage.renderFeeds", true);
+ pref("extensions.sage.twelveHourClock", true);
+ pref("extensions.sage.feedItemOrder", "chrono");
diff --git a/debian/patches/disable_encoded_content.patch b/debian/patches/disable_encoded_content.patch
deleted file mode 100644
index 5fb9fd7..0000000
--- a/debian/patches/disable_encoded_content.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Disable encoded content by default
-Author: Alan Woodland <awoodland at debian.org>
-Index: sage-extension-1.4.12/defaults/preferences/sage.js
-===================================================================
---- sage-extension-1.4.12.orig/defaults/preferences/sage.js	2011-08-16 18:57:35.676972350 +0200
-+++ sage-extension-1.4.12/defaults/preferences/sage.js	2011-08-16 18:57:42.872972147 +0200
-@@ -39,7 +39,7 @@
- pref("extensions.sage.version", "");
- pref("extensions.sage.userCss.enable", false);
- pref("extensions.sage.userCss.path", "");
--pref("extensions.sage.allowEncodedContent", true);
-+pref("extensions.sage.allowEncodedContent", false);
- pref("extensions.sage.renderFeeds", true);
- pref("extensions.sage.twelveHourClock", true);
- pref("extensions.sage.feedItemOrder", "chrono");
diff --git a/debian/patches/series b/debian/patches/series
index e42349d..df3de3e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-disable_encoded_content.patch
+0001-Disable-encoded-content-by-default.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/sage-extension.git