reverted: --- torbutton-1.2.1/debian/iceweasel-torbutton.dirs +++ torbutton-1.2.1.orig/debian/iceweasel-torbutton.dirs @@ -1,2 +0,0 @@ -usr/share/iceweasel-extensions/torbutton -usr/lib/iceweasel/extensions reverted: --- torbutton-1.2.1/debian/iceweasel-torbutton.links +++ torbutton-1.2.1.orig/debian/iceweasel-torbutton.links @@ -1 +0,0 @@ -usr/share/iceweasel-extensions/torbutton usr/lib/iceweasel/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca} diff -u torbutton-1.2.1/debian/changelog torbutton-1.2.1/debian/changelog --- torbutton-1.2.1/debian/changelog +++ torbutton-1.2.1/debian/changelog @@ -1,3 +1,17 @@ +torbutton (1.2.1-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #382433), remaining changes: + - debian/control: + + Binary package name becomes 'torbutton-extension' + + Depend on firefox or abrowser, not iceweasel + + Change references in Description to firefox, not iceweasel + - debian/iceweasel-torbutton.dirs, debian/iceweasel-torbutton.install, + debian/iceweasel-torbutton.links: + + Install into firefox extensions directories + + Rename to the new binary package schema (torbutton-extension.*) + + -- Michael Terry Mon, 01 Jun 2009 10:42:21 -0400 + torbutton (1.2.1-1) unstable; urgency=low * New upstream version: @@ -16,6 +30,26 @@ -- Jérémy Bobbio Sat, 16 May 2009 21:32:48 +0200 +torbutton (1.2.0-1ubuntu1) intrepid; urgency=low + + [ David Futcher and Sveinung Kvilhaugsvik ] + * Merge from Debian unstable. (LP: #247867) + Remaining Ubuntu changes: + - Modified Ubuntu maintainer field + - 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.*) + - Change of the description to reflect the firefox compatibility + - Binary package name stays 'torbutton-extension' + - Link into where Firefox, not Iceweasel, looks + * Depend on Firefox 3 or 2 instead of Iceweasel + * Removed Thunderbird stuff from Ubuntu since Thunderbird is no longer + supported + * Remove iceweasel-torbutton.*, since Ubuntu doesn't ship Iceweasel + + -- Sveinung Kvilhaugsvik Mon, 11 Aug 2008 01:36:16 +0200 + torbutton (1.2.0-1) unstable; urgency=low * New upstream version. @@ -43,6 +77,40 @@ -- Jérémy Bobbio Fri, 11 Jul 2008 17:39:12 +0000 +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) @@ -52,6 +120,33 @@ -- 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 @@ -68,0 +164 @@ + reverted: --- torbutton-1.2.1/debian/iceweasel-torbutton.install +++ torbutton-1.2.1.orig/debian/iceweasel-torbutton.install @@ -1,5 +0,0 @@ -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 -src/components usr/share/iceweasel-extensions/torbutton diff -u torbutton-1.2.1/debian/control torbutton-1.2.1/debian/control --- torbutton-1.2.1/debian/control +++ torbutton-1.2.1/debian/control @@ -1,7 +1,8 @@ Source: torbutton Section: web Priority: optional -Maintainer: Jérémy Bobbio +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Jérémy Bobbio Uploaders: Debian Mozilla Extension Maintainers Build-Depends: debhelper (>= 5.0.0) Standards-Version: 3.8.1 @@ -9,12 +10,12 @@ Vcs-Git: git://git.debian.org/pkg-mozext/torbutton.git Vcs-Browser: http://git.debian.org/?p=pkg-mozext/torbutton.git -Package: iceweasel-torbutton +Package: torbutton-extension Architecture: all -Depends: iceweasel (>= 2.0.0.3-1) +Depends: firefox | firefox-3.0 | firefox-2 | abrowser Recommends: tor, privoxy -Description: iceweasel extension enabling 1-click toggle of Tor usage - Torbutton is a 1-click way for Iceweasel users to enable or disable the +Description: firefox extension enabling 1-click toggle of Tor usage + Torbutton is a 1-click way for Firefox users to enable or disable the browser's use of Tor (an anynomous communication system). . Torbutton tries to isolate as much as possible Tor sessions from your non-Tor only in patch2: unchanged: --- torbutton-1.2.1.orig/debian/torbutton-extension.dirs +++ torbutton-1.2.1/debian/torbutton-extension.dirs @@ -0,0 +1,3 @@ +usr/lib/firefox/extensions +usr/lib/firefox-addons/extensions +usr/share/firefox-extensions/torbutton only in patch2: unchanged: --- torbutton-1.2.1.orig/debian/torbutton-extension.links +++ torbutton-1.2.1/debian/torbutton-extension.links @@ -0,0 +1,2 @@ +usr/share/firefox-extensions/torbutton usr/lib/firefox/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca} +usr/share/firefox-extensions/torbutton usr/lib/firefox-addons/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca} only in patch2: unchanged: --- torbutton-1.2.1.orig/debian/torbutton-extension.install +++ torbutton-1.2.1/debian/torbutton-extension.install @@ -0,0 +1,5 @@ +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 +src/components usr/share/firefox-extensions/torbutton