[Pkg-mozext-commits] [requestpolicy] 275/280: Adapt jQuery replacement to new distribution

David Prévot taffit at moszumanska.debian.org
Sat May 2 20:30:39 UTC 2015 

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

taffit pushed a commit to branch master
in repository requestpolicy.

commit 20d3c252b1266221b95f9109d401487a3ff0053c
Author: David Prévot <taffit at debian.org>
Date:   Sat May 2 15:02:46 2015 -0400

    Adapt jQuery replacement to new distribution
---
 debian/links                                       |   2 +-
 ...-to-shared-jQuery-instead-of-embedded-one.patch | 105 ---------------------
 debian/patches/series                              |   1 -
 3 files changed, 1 insertion(+), 107 deletions(-)

diff --git a/debian/links b/debian/links
index 5821e8e..e46da67 100644
--- a/debian/links
+++ b/debian/links
@@ -1 +1 @@
-usr/share/javascript/jquery/jquery.min.js usr/share/xul-ext/requestpolicy/modules/jquery.min.js
+usr/share/javascript/jquery/jquery.min.js	usr/share/xul-ext/requestpolicy/content/settings/jquery.min.js
diff --git a/debian/patches/0001-Refer-to-shared-jQuery-instead-of-embedded-one.patch b/debian/patches/0001-Refer-to-shared-jQuery-instead-of-embedded-one.patch
deleted file mode 100644
index 1c6e1ee..0000000
--- a/debian/patches/0001-Refer-to-shared-jQuery-instead-of-embedded-one.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit at debian.org>
-Date: Fri, 19 Sep 2014 10:42:34 -0400
-Subject: Refer to shared jQuery instead of embedded one
-
----
- chrome/requestpolicy.jar!/content/settings/advancedprefs.html | 2 +-
- chrome/requestpolicy.jar!/content/settings/basicprefs.html    | 2 +-
- chrome/requestpolicy.jar!/content/settings/defaultpolicy.html | 2 +-
- chrome/requestpolicy.jar!/content/settings/oldrules.html      | 2 +-
- chrome/requestpolicy.jar!/content/settings/setup.html         | 2 +-
- chrome/requestpolicy.jar!/content/settings/subscriptions.html | 2 +-
- chrome/requestpolicy.jar!/content/settings/yourpolicy.html    | 2 +-
- 7 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/chrome/requestpolicy.jar!/content/settings/advancedprefs.html b/chrome/requestpolicy.jar!/content/settings/advancedprefs.html
-index 58d785d..8502f27 100644
---- a/chrome/requestpolicy.jar!/content/settings/advancedprefs.html
-+++ b/chrome/requestpolicy.jar!/content/settings/advancedprefs.html
-@@ -2,7 +2,7 @@
- <html>
- <head>
-   <title>RequestPolicy - Advanced Preferences</title>
--  <script src="jquery.min.js"></script>
-+  <script src="resource://requestpolicy/jquery.min.js"></script>
-   <script src="common.js"></script>
-   <script src="advancedprefs.js"></script>
-   <link href="settings.css" rel="stylesheet" type="text/css"/>
-diff --git a/chrome/requestpolicy.jar!/content/settings/basicprefs.html b/chrome/requestpolicy.jar!/content/settings/basicprefs.html
-index a68c940..b614fc3 100644
---- a/chrome/requestpolicy.jar!/content/settings/basicprefs.html
-+++ b/chrome/requestpolicy.jar!/content/settings/basicprefs.html
-@@ -2,7 +2,7 @@
- <html>
- <head>
-   <title>RequestPolicy - Preferences</title>
--  <script src="jquery.min.js"></script>
-+  <script src="resource://requestpolicy/jquery.min.js"></script>
-   <script src="common.js"></script>
-   <script src="basicprefs.js"></script>
-   <link href="settings.css" rel="stylesheet" type="text/css"/>
-diff --git a/chrome/requestpolicy.jar!/content/settings/defaultpolicy.html b/chrome/requestpolicy.jar!/content/settings/defaultpolicy.html
-index 265675a..19785dc 100644
---- a/chrome/requestpolicy.jar!/content/settings/defaultpolicy.html
-+++ b/chrome/requestpolicy.jar!/content/settings/defaultpolicy.html
-@@ -2,7 +2,7 @@
- <html>
- <head>
-   <title>RequestPolicy - Default Policy</title>
--  <script src="jquery.min.js"></script>
-+  <script src="resource://requestpolicy/jquery.min.js"></script>
-   <script src="common.js"></script>
-   <script src="defaultpolicy.js"></script>
-   <link href="settings.css" rel="stylesheet" type="text/css"/>
-diff --git a/chrome/requestpolicy.jar!/content/settings/oldrules.html b/chrome/requestpolicy.jar!/content/settings/oldrules.html
-index 0ca6940..dd24086 100644
---- a/chrome/requestpolicy.jar!/content/settings/oldrules.html
-+++ b/chrome/requestpolicy.jar!/content/settings/oldrules.html
-@@ -2,7 +2,7 @@
- <html>
- <head>
-   <title>RequestPolicy - Old Rules</title>
--  <script src="jquery.min.js"></script>
-+  <script src="resource://requestpolicy/jquery.min.js"></script>
-   <script src="common.js"></script>
-   <script src="oldrules.js"></script>
-   <link href="settings.css" rel="stylesheet" type="text/css"/>
-diff --git a/chrome/requestpolicy.jar!/content/settings/setup.html b/chrome/requestpolicy.jar!/content/settings/setup.html
-index 39caeab..fa84ee1 100644
---- a/chrome/requestpolicy.jar!/content/settings/setup.html
-+++ b/chrome/requestpolicy.jar!/content/settings/setup.html
-@@ -2,7 +2,7 @@
- <html>
- <head>
-   <title>RequestPolicy - Setup</title>
--  <script src="jquery.min.js"></script>
-+  <script src="resource://requestpolicy/jquery.min.js"></script>
-   <script src="common.js"></script>
-   <script src="setup.js"></script>
-   <!--<link href="setup.css" rel="stylesheet" type="text/css"/>-->
-diff --git a/chrome/requestpolicy.jar!/content/settings/subscriptions.html b/chrome/requestpolicy.jar!/content/settings/subscriptions.html
-index 944019c..80dae65 100644
---- a/chrome/requestpolicy.jar!/content/settings/subscriptions.html
-+++ b/chrome/requestpolicy.jar!/content/settings/subscriptions.html
-@@ -2,7 +2,7 @@
- <html>
- <head>
-   <title>RequestPolicy - Subscriptions</title>
--  <script src="jquery.min.js"></script>
-+  <script src="resource://requestpolicy/jquery.min.js"></script>
-   <script src="common.js"></script>
-   <script src="subscriptions.js"></script>
-   <link href="settings.css" rel="stylesheet" type="text/css"/>
-diff --git a/chrome/requestpolicy.jar!/content/settings/yourpolicy.html b/chrome/requestpolicy.jar!/content/settings/yourpolicy.html
-index 8d9ba6d..c311819 100644
---- a/chrome/requestpolicy.jar!/content/settings/yourpolicy.html
-+++ b/chrome/requestpolicy.jar!/content/settings/yourpolicy.html
-@@ -2,7 +2,7 @@
- <html>
- <head>
-   <title>RequestPolicy - Your Policy</title>
--  <script src="jquery.min.js"></script>
-+  <script src="resource://requestpolicy/jquery.min.js"></script>
-   <script src="common.js"></script>
-   <script src="yourpolicy.js"></script>
-   <link href="settings.css" rel="stylesheet" type="text/css"/>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 1742a70..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Refer-to-shared-jQuery-instead-of-embedded-one.patch

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

More information about the Pkg-mozext-commits mailing list