[Pkg-mozext-commits] [SCM] Debian package reloadevery branch, master, updated. upstream/13.0.0-40-gfda45fc
Mike Gabriel
mike.gabriel at das-netzwerkteam.de
Mon May 6 07:17:54 UTC 2013
The following commit has been merged in the master branch:
commit 9ef52c369c43e100ac540c61d846fb9c4dc9f8ed
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon May 6 09:12:45 2013 +0200
* /debian/patches:
+ Drop patch: 002_reload-new-tabs.patch, included in new upstream version.
+ Drop patch: 004_prefs-from-default-branch.patch, included in new upstream
version.
diff --git a/debian/changelog b/debian/changelog
index 9eacd8b..d9530cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
reloadevery (17.0.0-1) UNRELEASED; urgency=low
* New upstream release.
+ * /debian/patches:
+ + Drop patch: 002_reload-new-tabs.patch, included in new upstream version.
+ + Drop patch: 004_prefs-from-default-branch.patch, included in new upstream
+ version.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Mon, 06 May 2013 09:06:30 +0200
diff --git a/debian/patches/001_works-with-latest-iceweasel.patch b/debian/patches/001_works-with-latest-iceweasel.patch
index 9a55bd2..b8263d5 100644
--- a/debian/patches/001_works-with-latest-iceweasel.patch
+++ b/debian/patches/001_works-with-latest-iceweasel.patch
@@ -7,7 +7,7 @@ Forwarded: not-needed
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
<em:minVersion>3.6</em:minVersion>
-- <em:maxVersion>13.*</em:maxVersion>
+- <em:maxVersion>17.*</em:maxVersion>
+ <em:maxVersion>*</em:maxVersion>
</Description>
</em:targetApplication>
diff --git a/debian/patches/002_reload-new-tabs.patch b/debian/patches/002_reload-new-tabs.patch
deleted file mode 100644
index a5cbc69..0000000
--- a/debian/patches/002_reload-new-tabs.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Description: Add preference reload_new_tabs.
- The reload_new_tabs allows to pre-configure the ReloadEvery behaviour
- of new tabs when they get opened.
- .
- This option has to be handled with care and it should normally
- stay set to false (which is the default).
- .
- However, for info displays that show web pages that do not of an internal
- refresh rate set, this can be very handy.
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-Forwarded: Jaap Haitsma <jaap at haitsma.org>
---- a/chrome/reloadevery/content/reloadeveryOverlay.js
-+++ b/chrome/reloadevery/content/reloadeveryOverlay.js
-@@ -44,6 +44,7 @@
- VERSION: "13.0.0",
-
- DEFAULT_RELOAD_TIME: 10,
-+ DEFAULT_RELOAD_NEW_TABS: false,
- DEFAULT_CUSTOM_RELOAD_TIME: 90,
- DEFAULT_RANDOMIZE: false,
- prefs: null,
-@@ -66,6 +67,14 @@
- consoleService.logStringMessage(this.APP_NAME + ": " + str);
- },
-
-+ tabAdded: function(event) {
-+ new_tab = gBrowser.getBrowserForTab(event.target);
-+ if (new_tab.reloadEveryEnabled == null) {
-+ this.debug("tabAdded() new tab");
-+ this.setupTab(new_tab);
-+ }
-+ },
-+
- init: function (){
-
- this.prefs = Components.classes["@mozilla.org/preferences-service;1"].
-@@ -84,6 +93,13 @@
- this.prefs.setIntPref("reload_time", this.DEFAULT_RELOAD_TIME);
- }
-
-+ if (!this.prefs.prefHasUserValue("reload_new_tabs")) {
-+ this.debug("init(): no preferences found in prefs.js taking default for reload_new_tabs");
-+ this.prefs.setBoolPref("reload_new_tabs", this.DEFAULT_RELOAD_NEW_TABS);
-+ }
-+ if (this.prefs.getBoolPref("reload_new_tabs")) {
-+ this.setupTab(this.getCurTab());
-+ }
- if (!this.prefs.prefHasUserValue("custom_reload_time")) {
- this.debug("init(): no preferences found in prefs.js taking default for custom_reload_time");
- // Assign default value
-@@ -111,6 +127,7 @@
- document.getElementById("contentAreaContextMenu").addEventListener("popupshowing", function () {org.mozdev.reloadevery.contextPopup()}, false);
- document.getElementById("tabContextMenu").addEventListener("popupshowing", function () {org.mozdev.reloadevery.tabPopup()}, false);
- gURLBar.addEventListener("keypress", function () {org.mozdev.reloadevery.onKeyPressInURLBar()}, false);
-+ gBrowser.tabContainer.addEventListener("TabOpen", function () {org.mozdev.reloadevery.tabAdded()}, false);
- }
- catch(e){
- this.debug("gURLBar.addEventListener failed");
-@@ -138,7 +155,12 @@
- this.tabID++;
- this.debug("setupTab(tab)" + tab.id);
-
-+ if (this.prefs.getBoolPref("reload_new_tabs")) {
-+ this.enable(tab);
-+ }
-+
- tab.reloadEveryProgressListener = this.progressListener(tab);
-+
- },
-
- // hide the Reload Every item when apropriate (use same logic as for Back, Stop etc.)
diff --git a/debian/patches/003_disable-reloadevery-thanks-page-after-install.patch b/debian/patches/003_disable-reloadevery-thanks-page-after-install.patch
index a0a7668..3da9678 100644
--- a/debian/patches/003_disable-reloadevery-thanks-page-after-install.patch
+++ b/debian/patches/003_disable-reloadevery-thanks-page-after-install.patch
@@ -7,7 +7,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Forwarded: not-needed
--- a/chrome/reloadevery/content/reloadeveryOverlay.js
+++ b/chrome/reloadevery/content/reloadeveryOverlay.js
-@@ -113,12 +113,10 @@
+@@ -122,12 +122,10 @@
if (!this.prefs.prefHasUserValue("version")) {
this.debug("init(): no version found");
diff --git a/debian/patches/004_prefs-from-default-branch.patch b/debian/patches/004_prefs-from-default-branch.patch
deleted file mode 100644
index 750466c..0000000
--- a/debian/patches/004_prefs-from-default-branch.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Description: Retrieve preferences from default branch before using hard-coded defaults
- Allow system-wide pre-definition of the reloadevery preferences branch.
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-Forwarded: Jaap Haitsma <jaap at haitsma.org>
---- a/chrome/reloadevery/content/reloadeveryOverlay.js
-+++ b/chrome/reloadevery/content/reloadeveryOverlay.js
-@@ -80,33 +80,42 @@
- this.prefs = Components.classes["@mozilla.org/preferences-service;1"].
- getService(Components.interfaces.nsIPrefService).getBranch("reloadevery.");
-
-- if (!this.prefs.prefHasUserValue("debug")) {
-- this.debug("init(): no preferences found in prefs.js taking default for debug");
-- this.prefs.setBoolPref("debug", false);
-- } else {
-+ try {
- this.DEBUG = this.prefs.getBoolPref("debug");
-+ } catch (e if e.name = "NS_ERROR_UNEXPECTED") {
-+ this.DEBUG = false;
-+ this.debug("init(): no preferences found in prefs.js taking default for debug");
-+ this.prefs.setBoolPref("debug", this.DEBUG);
- }
-- this.debug("init()");
-+ this.debug("init()");
-
-- if (!this.prefs.prefHasUserValue("reload_time")) {
-+ try {
-+ this.prefs.getIntPref("reload_time");
-+ } catch (e if e.name = "NS_ERROR_UNEXPECTED") {
- this.debug("init(): no preferences found in prefs.js taking default for reload_time");
- this.prefs.setIntPref("reload_time", this.DEFAULT_RELOAD_TIME);
- }
-
-- if (!this.prefs.prefHasUserValue("reload_new_tabs")) {
-+ try {
-+ this.prefs.getBoolPref("reload_new_tabs");
-+ } catch (e if e.name = "NS_ERROR_UNEXPECTED") {
- this.debug("init(): no preferences found in prefs.js taking default for reload_new_tabs");
- this.prefs.setBoolPref("reload_new_tabs", this.DEFAULT_RELOAD_NEW_TABS);
- }
- if (this.prefs.getBoolPref("reload_new_tabs")) {
- this.setupTab(this.getCurTab());
- }
-- if (!this.prefs.prefHasUserValue("custom_reload_time")) {
-+ try {
-+ this.prefs.getIntPref("custom_reload_time");
-+ } catch (e if e.name = "NS_ERROR_UNEXPECTED") {
- this.debug("init(): no preferences found in prefs.js taking default for custom_reload_time");
- // Assign default value
- this.prefs.setIntPref("custom_reload_time", this.DEFAULT_CUSTOM_RELOAD_TIME);
- }
-
-- if (!this.prefs.prefHasUserValue("randomize")) {
-+ try {
-+ this.prefs.getBoolPref("randomize");
-+ } catch (e if e.name = "NS_ERROR_UNEXPECTED") {
- this.debug("init(): no preferences found in prefs.js taking default for reload time randomization");
- this.prefs.setBoolPref("randomize", this.DEFAULT_RANDOMIZE);
- }
-@@ -120,12 +129,11 @@
- this.prefs.setCharPref("version", this.VERSION);
- }
-
--
- try{
- document.getElementById("contentAreaContextMenu").addEventListener("popupshowing", function () {org.mozdev.reloadevery.contextPopup()}, false);
- document.getElementById("tabContextMenu").addEventListener("popupshowing", function () {org.mozdev.reloadevery.tabPopup()}, false);
- gURLBar.addEventListener("keypress", function () {org.mozdev.reloadevery.onKeyPressInURLBar()}, false);
-- gBrowser.tabContainer.addEventListener("TabOpen", function () {org.mozdev.reloadevery.tabAdded()}, false);
-+ gBrowser.tabContainer.addEventListener("TabOpen", function (event) {org.mozdev.reloadevery.tabAdded(event)}, false);
- }
- catch(e){
- this.debug("gURLBar.addEventListener failed");
diff --git a/debian/patches/series b/debian/patches/series
index 401f805..7c8ed71 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
001_works-with-latest-iceweasel.patch
-002_reload-new-tabs.patch
003_disable-reloadevery-thanks-page-after-install.patch
-004_prefs-from-default-branch.patch
--
Debian package reloadevery
More information about the Pkg-mozext-commits
mailing list