[Pkg-mozext-commits] [SCM] torbutton Debian packaging branch, master, updated. debian/1.4.6.3-1

[Jérémy Bobbio]

The following commit has been merged in the master branch:
commit 9f1b4f71fbb68f77315d74b62a7c757455a3587b
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Tue Oct 16 19:43:11 2012 +0200

    Refresh debian/patches/restore-status-panel-on-ff4.patch

diff --git a/debian/patches/restore-status-panel-on-ff4.patch b/debian/patches/restore-status-panel-on-ff4.patch
index 4235b8e..b53bc46 100644
--- a/debian/patches/restore-status-panel-on-ff4.patch
+++ b/debian/patches/restore-status-panel-on-ff4.patch
@@ -12,10 +12,10 @@ Author: Jérémy Bobbio <lunar at debian.org>
 Forwarded: https://trac.torproject.org/projects/tor/ticket/3685
 
 diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
-index 8c905d1..9c48ccd 100644
+index e629102..374f403 100644
 --- a/src/chrome/content/torbutton.js
 +++ b/src/chrome/content/torbutton.js
-@@ -345,10 +345,18 @@ function torbutton_set_panel_view() {
+@@ -364,10 +364,18 @@ function torbutton_set_panel_view() {
      if (!o_statuspanel || !o_prefbranch) return;
  
      // Firefox 4 has no toolbar panel
@@ -35,8 +35,8 @@ index 8c905d1..9c48ccd 100644
 +    }
  }
  
- function torbutton_set_panel_style() {
-@@ -433,16 +441,6 @@ function torbutton_init_toolbutton()
+ // Bug 1506 P1
+@@ -485,16 +493,6 @@ function torbutton_init_toolbutton()
  {
      try {
        torbutton_log(3, "Initializing the Torbutton button.");

-- 
torbutton Debian packaging