--- torbutton-1.0.4.orig/src/install.rdf
+++ torbutton-1.0.4/src/install.rdf
@@ -27,9 +27,9 @@
+ em:maxVersion="2.0.*" />
+ em:maxVersion="2.0.*" />
--- torbutton-1.0.4.orig/src/chrome/content/torbutton.js
+++ torbutton-1.0.4/src/chrome/content/torbutton.js
@@ -1,4 +1,4 @@
-var m_debug = true;
+var m_debug = false;
var m_toolbutton = false;
var m_statuspanel = false;
var m_wasinited = false;
--- torbutton-1.0.4.orig/debian/changelog
+++ torbutton-1.0.4/debian/changelog
@@ -0,0 +1,84 @@
+torbutton (1.0.4-3ubuntu2) intrepid; urgency=low
+
+ * fix LP: #272772: packages that Depend/Recommend/Suggest firefox
+ (meta-package) must alternatively Depend/Recommend/Suggest abrowser
+ - update debian/control
+
+ -- Fabien Tassin Sun, 21 Sep 2008 23:59:50 +0200
+
+torbutton (1.0.4-3ubuntu1) intrepid; urgency=low
+
+ * Merge from Debian unstable. (LP: #226287)
+ Remaining Ubuntu changes:
+ - Modified Ubuntu maintainer field
+ - Add a possible dependency to firefox or iceweasel
+ + Modification of the Depend Field of the debian/control file
+ + Modification of debian/iceweasel-torbutton.dirs,
+ debian/iceweasel-torbutton.install and debian/iceweasel-torbutton.links
+ to take into account firefox extensions directory and renaming them
+ to the new binary package schema (torbutton-extension.*)
+ + Linkage of the iceweasel extension directory to the firefox one, instead
+ of duplicating the extension
+ + Change of the description to reflect the firefox compatibility
+ - Add a possible dependency to thunderbird
+ + Modification of the Depend Field of the debian/control file
+ + Modification of the debian/torbutton-extension.* files to take into
+ account thunderbird extensions directory.
+ + Linkage of the thunderbird extension directory to the firefox one, instead
+ of duplicating the extension.
+ + Change of the description to reflect the thunderbird compatibility
+ - Binary package name stays 'torbutton-extension'
+ - Merge the two extensions (iceweasel and icedove) to a unique one
+
+ -- David Futcher Sun, 18 May 2008 11:14:26 +0100
+
+torbutton (1.0.4-3) unstable; urgency=low
+
+ * Allow Torbutton to be installed on icedove 2.0. (Closes: #472876)
+ * Disable debugging in torbutton.js. (Closes: #444554)
+ * Promote Homepage pseudo-field as a real source package control field.
+ * Bump Standards-Version to 3.7.3, no changes required.
+
+ -- Jérémy Bobbio Thu, 27 Mar 2008 16:45:50 +0100
+
+torbutton (1.0.4-2ubuntu1) hardy; urgency=low
+
+ * Merge the two extensions (iceweasel and icedove) to a unique one
+ * Change the binary package name to torbutton-extension
+ * Add a possible dependency to firefox or iceweasel (LP: #137513)
+ - Modification of the Depend Field of the debian/control file
+ - Modification of debian/iceweasel-torbutton.dirs,
+ debian/iceweasel-torbutton.install and debian/iceweasel-torbutton.links
+ to take into account firefox extensions directory and renaming them
+ to the new binary package schema (torbutton-extension.*)
+ - Linkage of the iceweasel extension directory to the firefox one, instead
+ of duplicating the extension
+ - Change of the description to reflect the firefox compatibility
+ * Add a possible dependency to thunderbird or icedove
+ - Modification of the Depend Field of the debian/control file
+ - Modification of the debian/torbutton-extension.* files to take into
+ account thunderbird extensions directory.
+ - Linkage of the icedove extension directory to the firefox one, instead
+ of duplicating the extension.
+ - Linkage of the thunderbird extension directory to the firefox one, instead
+ of duplicating the extension.
+ - Change of the description to reflect the icedove compatibility
+ - Change of the description to reflect the thunderbird compatibility
+ * Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Christophe Sauthier Wed, 10 Oct 2007 23:56:10 +0200
+
+torbutton (1.0.4-2) unstable; urgency=low
+
+ * Add a short description of Tor in package descriptions (as suggested by
+ Charles Plessy and Ron Johnson).
+ * Make the extension correctly installable on Iceweasel 2.0.
+ * Add Recommends for tor and privoxy.
+
+ -- Jérémy Bobbio Fri, 11 May 2007 16:24:16 +0200
+
+torbutton (1.0.4-1) unstable; urgency=low
+
+ * Initial release. (Closes: #421107)
+
+ -- Jérémy Bobbio Thu, 26 Apr 2007 16:28:58 +0200
--- torbutton-1.0.4.orig/debian/compat
+++ torbutton-1.0.4/debian/compat
@@ -0,0 +1 @@
+5
--- torbutton-1.0.4.orig/debian/control
+++ torbutton-1.0.4/debian/control
@@ -0,0 +1,21 @@
+Source: torbutton
+Section: web
+Priority: optional
+Maintainer: Ubuntu MOTU Developers
+XSBC-Original-Maintainer: Jérémy Bobbio
+Build-Depends: debhelper (>= 5.0.0)
+Standards-Version: 3.7.3
+Homepage: http://freehaven.net/~squires/torbutton/
+
+Package: torbutton-extension
+Architecture: all
+Depends: iceweasel (>= 2.0.0.3-1) | firefox (>= 2.0.0.3-1) | abrowser | icedove (>= 1.5.0.10.dfsg1-3) | thunderbird (>= 1.5.0.10.dfsg1-3)
+Recommends: tor, privoxy
+Description: iceweasel/firefox/icedove/thunderbird 1-click Tor extension
+ Torbutton is a 1-click way for iceweasel/firefox/icedove/thunderbird users to
+ enable or disable the use of Tor (an anynomous communication system).
+ .
+ It adds a panel to the statusbar that says "Tor Enabled"
+ (in green) or "Tor Disabled" (in red). The user may click on the panel to
+ toggle the status. If the user (or some other extension) changes the proxy
+ settings, the change is automatically reflected in the statusbar.
--- torbutton-1.0.4.orig/debian/copyright
+++ torbutton-1.0.4/debian/copyright
@@ -0,0 +1,61 @@
+This package was debianized by Jérémy Bobbio on
+Thu, 26 Apr 2007 14:55:15 +0200.
+
+It was downloaded from http://freehaven.net/~squires/torbutton/
+
+--------------------------------------------------------------------------------
+
+Copyright (c) 2006 Scott Squires, Oleg Ivanov
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+--------------------------------------------------------------------------------
+
+Date: Fri, 3 Mar 2006 03:16:21 +0200
+From: Oleg Ivanov
+To: Scott Squires
+Subject: Re: ProxyButton licensing question
+
+Hello Scott,
+
+I'm glad to support your project so you can use the Proxybutton in any way you
+need under any open source license as it's stated in mozdev's copyright policy.
+I'll just ask you to put in the Tor or it's source code any credits with
+references to me and the original Proxybutton. Feel free to ask if you have
+any questions regarding the extension - I'll be glad to help you.
+
+On Thursday 02 March 2006 05:01, you wrote:
+> Hello,
+>
+> I am a volunteer for the Tor project, which is a network proxy with strong
+> anonymnity. We would like to make it easier for users to install and
+> configure the software, and would like a firefox button to enable/disable
+> Tor. Your extension is very close to what we need, our version would just
+> set the proxy for the user instead of the user needing to enter the
+> information. So I was wondering what license your software is released under
+> and whether we can use it as a base for this extension.
+>
+> Thanks!
+> --Scott
+
+--
+Oleg Ivanov
+mailto: saruman@unigsm.com
+ICQ #69991809
+
--- torbutton-1.0.4.orig/debian/icedove-torbutton.dirs
+++ torbutton-1.0.4/debian/icedove-torbutton.dirs
@@ -0,0 +1,2 @@
+usr/share/icedove-extensions/torbutton
+usr/lib/icedove/extensions
--- torbutton-1.0.4.orig/debian/icedove-torbutton.install
+++ torbutton-1.0.4/debian/icedove-torbutton.install
@@ -0,0 +1,4 @@
+src/chrome usr/share/icedove-extensions/torbutton
+src/chrome.manifest usr/share/icedove-extensions/torbutton
+src/install.rdf usr/share/icedove-extensions/torbutton
+src/defaults usr/share/icedove-extensions/torbutton
--- torbutton-1.0.4.orig/debian/icedove-torbutton.links
+++ torbutton-1.0.4/debian/icedove-torbutton.links
@@ -0,0 +1 @@
+usr/share/icedove-extensions/torbutton usr/lib/icedove/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}
--- torbutton-1.0.4.orig/debian/iceweasel-torbutton.dirs
+++ torbutton-1.0.4/debian/iceweasel-torbutton.dirs
@@ -0,0 +1,2 @@
+usr/share/iceweasel-extensions/torbutton
+usr/lib/iceweasel/extensions
--- torbutton-1.0.4.orig/debian/iceweasel-torbutton.install
+++ torbutton-1.0.4/debian/iceweasel-torbutton.install
@@ -0,0 +1,4 @@
+src/chrome usr/share/iceweasel-extensions/torbutton
+src/chrome.manifest usr/share/iceweasel-extensions/torbutton
+src/install.rdf usr/share/iceweasel-extensions/torbutton
+src/defaults usr/share/iceweasel-extensions/torbutton
--- torbutton-1.0.4.orig/debian/iceweasel-torbutton.links
+++ torbutton-1.0.4/debian/iceweasel-torbutton.links
@@ -0,0 +1 @@
+usr/share/iceweasel-extensions/torbutton usr/lib/iceweasel/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}
--- torbutton-1.0.4.orig/debian/rules
+++ torbutton-1.0.4/debian/rules
@@ -0,0 +1,50 @@
+#!/usr/bin/make -f
+
+VERSION := $(shell dpkg-parsechangelog | \
+ sed -n -e 's/Version: \([^-]*\)-.*/\1/p')
+DARCS_REPOSITORY := "http://zargon.hobbesnet.org/~squires/repos/torbutton/"
+
+clean:
+ dh_testdir
+ dh_testroot
+ dh_clean
+ rm -f build-stamp
+
+build: build-stamp
+build-stamp:
+ dh_testdir
+ touch build-stamp
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_installdirs
+ dh_install
+ dh_link
+
+binary-indep: install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs src/CHANGELOG
+ dh_installdocs
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary-arch: install
+
+binary: binary-arch binary-indep
+
+get-orig-source:
+ echo $(VERSION)
+ darcs get --to-patch="TAG $(VERSION)" $(DARCS_REPOSITORY) \
+ torbutton-$(VERSION)
+ rm -r torbutton-$(VERSION)/_darcs
+ tar c torbutton-$(VERSION) | \
+ gzip -9 > ../torbutton_$(VERSION).orig.tar.gz
+ rm -r torbutton-$(VERSION)
+
+.PHONY: binary binary-arch binary-indep build clean install get-orig-source
--- torbutton-1.0.4.orig/debian/torbutton-extension.dirs
+++ torbutton-1.0.4/debian/torbutton-extension.dirs
@@ -0,0 +1,5 @@
+usr/lib/iceweasel/extensions
+usr/lib/icedove/extensions
+usr/lib/firefox/extensions
+usr/lib/thunderbird/extensions
+usr/share/firefox-extensions/torbutton
--- torbutton-1.0.4.orig/debian/torbutton-extension.install
+++ torbutton-1.0.4/debian/torbutton-extension.install
@@ -0,0 +1,4 @@
+src/chrome usr/share/firefox-extensions/torbutton
+src/chrome.manifest usr/share/firefox-extensions/torbutton
+src/install.rdf usr/share/firefox-extensions/torbutton
+src/defaults usr/share/firefox-extensions/torbutton
--- torbutton-1.0.4.orig/debian/torbutton-extension.links
+++ torbutton-1.0.4/debian/torbutton-extension.links
@@ -0,0 +1,4 @@
+usr/share/firefox-extensions/torbutton usr/lib/iceweasel/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}
+usr/share/firefox-extensions/torbutton usr/lib/firefox/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}
+usr/share/firefox-extensions/torbutton usr/lib/icedove/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}
+usr/share/firefox-extensions/torbutton usr/lib/thunderbird/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}