Please sync deluge-torrent 0.5.6.2-1 from debian unstable

[Mike Sylvester]

Please sync deluge-torrent 0.5.6.2-1 from Debian unstable.
Debian changelog since last Ubuntu version:
deluge-torrent (0.5.6.2-1) unstable; urgency=low

  * New upstream release (Closes: #447810, #447648).
  * Drop 000-Fix_browser.py_path patch, fixed upstream.
  * Update 001-Fix_CFLAGS_handling and 003-Fix_tray_icon patches.
  * Update debian/copyright.
  * Manpage do not have a bad "SH NAME" (break whatis) entry anymore.
  * Use new dpkg "Homepage" field.

 -- Adam Cécile (Le_Vert) <email address hidden> Wed, 31 Oct 2007 21:41:42 +0100

deluge-torrent (0.5.5-2) unstable; urgency=low

  * Add missing runtime dependency on python-dbus.
  * Fix 003-Fix_tray_icon patch, sorry for the mistake (Closes: #442031).

 -- Adam Cécile (Le_Vert) <email address hidden> Thu, 13 Sep 2007 09:08:11 +0200

deluge-torrent (0.5.5-1) unstable; urgency=low

  * New upstream release (Closes: #441425).
  * Re-add 001-Fix_CFLAGS_handling patch to fix CFLAGS handling.
  * Call setup.py with --no-compile to avoid python compilation (done by pysupport).
  * Add 002-Do_check_for_update_as_default patch (Closes: #441423).
  * Add 003-Fix_tray_icon patch to use current theme icon as trayicon, thanks to Mathias Brodala (Closes: #438441).
  * debian/rules: drop stuff that removes shebangs in modules, fixed upstream.

 -- Adam Cécile (Le_Vert) <email address hidden> Sun, 09 Sep 2007 21:33:43 +0200

Ubuntu changes that shall be dropped:
 * 001-Disable_update_notification.dpatch - turn off autoupdate notifications; now done by Debian package in 002-Do_check_for_update_as_default
 * 002-Fix_Allocation_Type.dpatch - make compact allocation/full allocation mutually exclusive; fixed upstream.

[Andrew Conkling (andrewski)]

Ubuntu Gutsy deb here:
http://deluge-torrent.org/downloads

[Cesare Tirabassi (norsetto)]

This will be merged for hardy.
Once the merge is done, if you require this for gutsy you should request a backport:

https://help.ubuntu.com/community/UbuntuBackports

[Chris Halse Rogers (raof)]

I'm merging deluge-torrent 0.5.6.2-1 from Debian unstable. Preliminary changelog:
deluge-torrent (0.5.6.2-1) unstable; urgency=low

  * New upstream release (Closes: #447810, #447648).
  * Drop 000-Fix_browser.py_path patch, fixed upstream.
  * Update 001-Fix_CFLAGS_handling and 003-Fix_tray_icon patches.
  * Update debian/copyright.
  * Manpage do not have a bad "SH NAME" (break whatis) entry anymore.
  * Use new dpkg "Homepage" field.

 -- Adam Cécile (Le_Vert) <email address hidden> Wed, 31 Oct 2007 21:41:42 +0100

deluge-torrent (0.5.5-2) unstable; urgency=low

  * Add missing runtime dependency on python-dbus.
  * Fix 003-Fix_tray_icon patch, sorry for the mistake (Closes: #442031).

 -- Adam Cécile (Le_Vert) <email address hidden> Thu, 13 Sep 2007 09:08:11 +0200

deluge-torrent (0.5.5-1) unstable; urgency=low

  * New upstream release (Closes: #441425).
  * Re-add 001-Fix_CFLAGS_handling patch to fix CFLAGS handling.
  * Call setup.py with --no-compile to avoid python compilation (done by pysupport).
  * Add 002-Do_check_for_update_as_default patch (Closes: #441423).
  * Add 003-Fix_tray_icon patch to use current theme icon as trayicon, thanks to Mathias Brodala (Closes: #438441).
  * debian/rules: drop stuff that removes shebangs in modules, fixed upstream.

 -- Adam Cécile (Le_Vert) <email address hidden> Sun, 09 Sep 2007 21:33:43 +0200

[Martin Pitt (pitti)]

This looks confusing. So should this be synced to Debian ("Ubuntu changes that shall be dropped:" is complete), or does it need a merge (which means that the sync request was invalid to begin with and the description of remaining Ubuntu changes was wrong)?

[Kow (kow)]

It needs to be merged. We differ from debian in that we remove the update dialog in preferences, and debian added a patch to automatically have deluge-torrent check for updates. We do not want the later because we/apt provide updates. :) I have a candidate ready but if Chris is working on it I will wait...

[Kow (kow)]

This is the current ubuntu -> candidate debdiff

[Chris Halse Rogers (raof)]

Sorry Martin: yes, this should be syncd. The "ubuntu changes which shall be dropped" list is all the current Ubuntu changes, and they may all be safely dropped (one is fixed upstream, the other is fixed in a different way by Debian).

I'll find you on IRC to see how I could be more clear in future.

[Sebastien Bacher (seb128)]

[Updating] deluge-torrent (0.5.4.1-1ubuntu3 [Ubuntu] < 0.5.6.2-1 [Debian])
 * Trying to add deluge-torrent...
  - <deluge-torrent_0.5.6.2-1.dsc: downloading from http://ftp.uk.debian.org/debian/>
  - <deluge-torrent_0.5.6.2.orig.tar.gz: downloading from http://ftp.uk.debian.org/debian/>
  - <deluge-torrent_0.5.6.2-1.diff.gz: downloading from http://ftp.uk.debian.org/debian/>
I: deluge-torrent [universe] -> deluge-torrent_0.5.4.1-1ubuntu3 [universe].