[Pkg-mozext-commits] [tabmixplus] 03/05: Refresh patch (now handled 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 tabmixplus.

commit 3efd94dc16f58f4d20f3bffef0dc953ba68dd0d3
Author: David Prévot <taffit at debian.org>
Date:   Mon Oct 7 10:58:07 2013 -0400

    Refresh patch (now handled with gbp pq)
---
 ...0001-No-phone-home-on-install-and-upgrade.patch |   35 ++++++++++++++++++++
 debian/patches/No_phone_home.patch                 |   27 ---------------
 debian/patches/series                              |    2 +-
 3 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/debian/patches/0001-No-phone-home-on-install-and-upgrade.patch b/debian/patches/0001-No-phone-home-on-install-and-upgrade.patch
new file mode 100644
index 0000000..66807f3
--- /dev/null
+++ b/debian/patches/0001-No-phone-home-on-install-and-upgrade.patch
@@ -0,0 +1,35 @@
+From: =?UTF-8?q?David=20Pr=C3=A9vot?= <taffit at debian.org>
+Date: Mon, 7 Oct 2013 10:46:53 -0400
+Subject: No phone home on install and upgrade
+
+Upon installation and upgrades), tabmixplus opens a special page on
+authors' site. The URL contains a number similar to a version.
+
+This is annoying and resembles to user tracking.
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=657466
+Forwarded: not-needed
+---
+ chrome/content/tab/tab.js | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/chrome/content/tab/tab.js b/chrome/content/tab/tab.js
+index 1ae8238..866b48a 100644
+--- a/chrome/content/tab/tab.js
++++ b/chrome/content/tab/tab.js
+@@ -1887,16 +1887,6 @@ try {
+         showNewVersionTab = subs(re.exec(currentVersion)) != subs(re.exec(oldVersion));
+       }
+       if (showNewVersionTab) {
+-        // open Tabmix page in a new tab
+-        window.setTimeout(function() {
+-          let defaultChanged = "";
+-          let showComment = oldVersion ? Services.vc.compare(oldVersion, "0.4.0.2pre.120330a") <= 0 : false;
+-          if (showComment && (_loadOnNewTab || _replaceLastTabWith))
+-            defaultChanged = "&newtabpage";
+-          let b = Tabmix.getTopWin().gBrowser;
+-          b.selectedTab = b.addTab("http://tmp.garyr.net/version_update2.htm?version=" + currentVersion + defaultChanged);
+-          b.selectedTab.loadOnStartup = true;
+-        },1000);
+         // noting more to do at the moment
+       }
+     }
diff --git a/debian/patches/No_phone_home.patch b/debian/patches/No_phone_home.patch
deleted file mode 100644
index 737fd58..0000000
--- a/debian/patches/No_phone_home.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: No phone home on install and upgrade
- Upon installation and upgrades), tabmixplus opens a special page on
- authors' site. The URL contains a number similar to a version.
- 
- This is annoying and resembles to user tracking.
-Author: David Prévot <taffit at debian.org>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=657466
-Forwarded: not-needed
-Last-Update: 2013-09-18
---- a/chrome/content/tab/tab.js
-+++ b/chrome/content/tab/tab.js
-@@ -1880,6 +1880,7 @@
-         Tabmix.prefs.setCharPref("version", currentVersion);
-       let showNewVersionTab = currentVersion != oldVersion &&
-         (!isNaN(currentVersion.substr(-1)) || subs(currentVersion) != subs(oldVersion))
-+/*
-       if (showNewVersionTab) {
-         // open Tabmix page in a new tab
-         window.setTimeout(function() {
-@@ -1893,6 +1894,7 @@
-         },1000);
-         // noting more to do at the moment
-       }
-+*/
-     }
-     AddonManager.getAddonByID("{dc572301-7619-498c-a57d-39143191b318}", function(aAddon) {
-       try {
diff --git a/debian/patches/series b/debian/patches/series
index 7aafa66..daded86 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-No_phone_home.patch
+0001-No-phone-home-on-install-and-upgrade.patch

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