Please merge torbutton 1.0.4-3 (universe) from Debian unstable

Merge, keeping the whole Ubuntu delta and adding all Debian (1.0.4-3) changes.

torbutton (1.0.4-3ubuntu1) intrepid; urgency=low

  * Merge from Debian unstable. All Ubuntu changes remain.

 -- David Futcher <email address hidden> Sat, 03 May 2008 22:39:39 +0100

Updated changelog, lists all changes kept.

torbutton (1.0.4-3ubuntu1) intrepid; urgency=low

  * Merge from Debian unstable. (LP: #226287)
    Remaining Ubuntu changes:
    - Modified Ubuntu maintainer field
    - Firefox/Thunderbird/Icedove dependencies
    - Firefox/Thunderbird/Icedove references in descriptions
    - Binary package name stays 'torbutton-extension'

 -- David Futcher <email address hidden> Sat, 03 May 2008 22:39:39 +0100

Your diff does not apply against the latest Debian source package from Debian unstable. Either get the latest package from a debian unstable mirror, or use the grab-merge.sh script found at merges.ubuntu.com to download everything needed for the merge, and prepare your diff that way.

The diff looks good however. Please re-subscribe ubuntu-universe-sponsors once you have attached a new debdiff.

Thanks for your work.

Sorry hadnt read the merging wiki page properly. Here is a patch against the latest debian version.

Here is the patch against the old ubuntu version.

In debian/changelog, please carry forward previous ubuntu modifications, so the latest ubuntu-specific changelog entry describes all deltas

Updated the changelog, ubuntu -> ubuntu debdiff.

debian -> ubuntu debdiff.

Uploaded. Thanks for your work!

This bug was fixed in the package torbutton - 1.0.4-3ubuntu1

---------------
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

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.

 -- David Futcher <email address hidden> Sun, 18 May 2008 11:14:26 +0100