[Bug 226287] Re: Please merge torbutton 1.0.4-3 (universe) from Debian unstable

2008-05-20 Thread Morten Kjeldgaard
Uploaded. Thanks for your work! ** Changed in: torbutton (Ubuntu) Assignee: David Futcher (bobbo) => (unassigned) Status: Confirmed => Fix Committed -- Please merge torbutton 1.0.4-3 (universe) from Debian unstable https://bugs.launchpad.net/bugs/226287 You received this bug notifica

[Bug 226287] Re: Please merge torbutton 1.0.4-3 (universe) from Debian unstable

2008-05-20 Thread Launchpad Bug Tracker
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

[Bug 226287] Re: Please merge torbutton 1.0.4-3 (universe) from Debian unstable

2008-05-20 Thread David Futcher
debian -> ubuntu debdiff. ** Attachment added: "torbutton_1.0.4-3ubuntu1-debian.debdiff" http://launchpadlibrarian.net/14620614/torbutton_1.0.4-3ubuntu1-debian.debdiff ** Changed in: torbutton (Ubuntu) Status: Incomplete => Confirmed -- Please merge torbutton 1.0.4-3 (universe) from

[Bug 226287] Re: Please merge torbutton 1.0.4-3 (universe) from Debian unstable

2008-05-20 Thread David Futcher
Updated the changelog, ubuntu -> ubuntu debdiff. ** Attachment added: "torbutton_1.0.4-3ubuntu1-ubuntu.debdiff" http://launchpadlibrarian.net/14620595/torbutton_1.0.4-3ubuntu1-ubuntu.debdiff -- Please merge torbutton 1.0.4-3 (universe) from Debian unstable https://bugs.launchpad.net/bugs/226

[Bug 226287] Re: Please merge torbutton 1.0.4-3 (universe) from Debian unstable

2008-05-19 Thread Morten Kjeldgaard
In debian/changelog, please carry forward previous ubuntu modifications, so the latest ubuntu-specific changelog entry describes all deltas ** Changed in: torbutton (Ubuntu) Status: Confirmed => Incomplete -- Please merge torbutton 1.0.4-3 (universe) from Debian unstable https://bugs.laun

[Bug 226287] Re: Please merge torbutton 1.0.4-3 (universe) from Debian unstable

2008-05-18 Thread David Futcher
Here is the patch against the old ubuntu version. ** Attachment added: "torbutton_1.0.4-3ubuntu1-ubuntu.debdiff" http://launchpadlibrarian.net/14585189/torbutton_1.0.4-3ubuntu1-ubuntu.debdiff ** Changed in: torbutton (Ubuntu) Status: Incomplete => Confirmed -- Please merge torbutton

[Bug 226287] Re: Please merge torbutton 1.0.4-3 (universe) from Debian unstable

2008-05-18 Thread David Futcher
Sorry hadnt read the merging wiki page properly. Here is a patch against the latest debian version. ** Attachment added: "torbutton_1.0.4-3ubuntu1-debian.debdiff" http://launchpadlibrarian.net/14585184/torbutton_1.0.4-3ubuntu1-debian.debdiff -- Please merge torbutton 1.0.4-3 (universe) from

[Bug 226287] Re: Please merge torbutton 1.0.4-3 (universe) from Debian unstable

2008-05-12 Thread Luke Yelavich
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 look

[Bug 226287] Re: Please merge torbutton 1.0.4-3 (universe) from Debian unstable

2008-05-04 Thread David Futcher
** Changed in: torbutton (Ubuntu) Sourcepackagename: None => torbutton -- Please merge torbutton 1.0.4-3 (universe) from Debian unstable https://bugs.launchpad.net/bugs/226287 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bu

[Bug 226287] Re: Please merge torbutton 1.0.4-3 (universe) from Debian unstable

2008-05-03 Thread David Futcher
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 reference

[Bug 226287] Re: Please merge torbutton 1.0.4-3 (universe) from Debian unstable

2008-05-03 Thread David Futcher
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 PROTECTED]> Sat, 03 May 2008 22:39:39 +0100 ** Attachment added: "torbutton_1.0.4