diff -u torbutton-1.2.0~rc5/debian/changelog torbutton-1.2.0~rc5/debian/changelog --- torbutton-1.2.0~rc5/debian/changelog +++ torbutton-1.2.0~rc5/debian/changelog @@ -1,3 +1,28 @@ +torbutton (1.2.0~rc5-1ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable. (LP: #247867) + 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' + + -- David Futcher Sat, 12 Jul 2008 13:11:38 +0100 + torbutton (1.2.0~rc5-1) unstable; urgency=low * New upstream release: @@ -16,6 +41,32 @@ -- Jérémy Bobbio Fri, 11 Jul 2008 17:39:12 +0000 +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) @@ -25,6 +76,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 diff -u torbutton-1.2.0~rc5/debian/control torbutton-1.2.0~rc5/debian/control --- torbutton-1.2.0~rc5/debian/control +++ torbutton-1.2.0~rc5/debian/control @@ -1,18 +1,19 @@ Source: torbutton Section: web Priority: optional -Maintainer: Jérémy Bobbio +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Jérémy Bobbio Build-Depends: debhelper (>= 5.0.0) Standards-Version: 3.7.3 Homepage: https://torbutton.torproject.org/dev/ XS-Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/torbutton/trunk XS-Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/torbutton/trunk -Package: iceweasel-torbutton +Package: torbutton-extension Architecture: all -Depends: iceweasel (>= 2.0.0.3-1) +Depends: iceweasel (>= 2.0.0.3-1) | firefox (>= 2.0.0.3-1) | thunderbird (>= 1.5.0.10.dfsg1-3) Recommends: tor, privoxy -Description: iceweasel extension enabling 1-click toggle of Tor usage +Description: iceweasel/firefox/thunderbird extension enabling 1-click toggle of Tor usage Torbutton is a 1-click way for Iceweasel users to enable or disable the browser's use of Tor (an anynomous communication system). . @@ -23,5 +24 @@ - . - 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 - settings, the change is automatically reflected in the statusbar. + only in patch2: unchanged: --- torbutton-1.2.0~rc5.orig/debian/torbutton-extension.dirs +++ torbutton-1.2.0~rc5/debian/torbutton-extension.dirs @@ -0,0 +1,4 @@ +usr/lib/iceweasel/extensions +usr/lib/firefox/extensions +usr/lib/thunderbird/extensions +usr/share/firefox-extensions/torbutton only in patch2: unchanged: --- torbutton-1.2.0~rc5.orig/debian/torbutton-extension.links +++ torbutton-1.2.0~rc5/debian/torbutton-extension.links @@ -0,0 +1,3 @@ +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/thunderbird/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca} only in patch2: unchanged: --- torbutton-1.2.0~rc5.orig/debian/torbutton-extension.install +++ torbutton-1.2.0~rc5/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