Merge lp:~cmiller/ubuntu/quantal/deluge/fix-parameter-move-storage into lp:ubuntu/quantal/deluge

[Chad Miller]

=== modified file 'debian/changelog'
--- debian/changelog	2012-05-22 15:16:48 +0000
+++ debian/changelog	2012-08-25 01:14:18 +0000
@@ -1,3 +1,12 @@
+deluge (1.3.5-1ubuntu2) quantal; urgency=low
+  
+  * Add patch to fix function parameter on call to libtorrent to move storage.
+    It doesn't want Unicode.
+  * Set minimum version dependency higher to catch new function signature.
+  * Fix grammar in control.
+
+ -- Andrew Starr-Bochicchio <[e-mail]>  Fri, 24 Aug 2012 21:04:04 -0400
+
 deluge (1.3.5-1ubuntu1) quantal; urgency=low
 
   * Merge from Debian Experimental (LP: #990629). Remaining Ubuntu changes:

=== modified file 'debian/control'
--- debian/control	2012-05-22 15:16:48 +0000
+++ debian/control	2012-08-25 01:14:18 +0000
@@ -28,7 +28,7 @@
 Replaces: deluge-torrent-common (<< 1.0.7.dfsg-1), deluge-torrent (<< 1.0.7.dfsg-1), deluge-core (<< 1.2.0~rc1-1)
 Description: bittorrent client written in Python/PyGTK (common files)
  Deluge is a full-featured, multi-platform, multi-interface BitTorrent client
- using libtorrent-rasterbar in it's backend and featuring multiple
+ using libtorrent-rasterbar in its back end and featuring multiple
  user-interfaces: GTK+, web and console.
  .
  It has been designed using the client-server model with a daemon process that
@@ -43,12 +43,12 @@
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends},
          deluge-common (= ${source:Version}),
-         python-libtorrent (>= 0.14.9),
+         python-libtorrent (>= 0.16.0),
          adduser,
          lsb-base (>= 3.2-14)
 Description: bittorrent client written in Python/PyGTK (daemon)
  Deluge is a full-featured, multi-platform, multi-interface BitTorrent client
- using libtorrent-rasterbar in it's backend and featuring multiple
+ using libtorrent-rasterbar in its back end and featuring multiple
  user-interfaces: GTK+, web and console.
  .
  It has been designed using the client-server model with a daemon process that
@@ -66,7 +66,7 @@
          deluge-common (= ${source:Version})
 Description: bittorrent client written in Python/PyGTK (console ui)
  Deluge is a full-featured, multi-platform, multi-interface BitTorrent client
- using libtorrent-rasterbar in it's backend and featuring multiple
+ using libtorrent-rasterbar in its back end and featuring multiple
  user-interfaces: GTK+, web and console.
  .
  It has been designed using the client-server model with a daemon process that
@@ -85,7 +85,7 @@
 Replaces: deluge-webui (<< 1.2.0~rc1-1)
 Description: bittorrent client written in Python/PyGTK (web ui)
  Deluge is a full-featured, multi-platform, multi-interface BitTorrent client
- using libtorrent-rasterbar in it's backend and featuring multiple
+ using libtorrent-rasterbar in its back end and featuring multiple
  user-interfaces: GTK+, web and console.
  .
  It has been designed using the client-server model with a daemon process that
@@ -112,7 +112,7 @@
             python-appindicator
 Description: bittorrent client written in Python/PyGTK (GTK+ ui)
  Deluge is a full-featured, multi-platform, multi-interface BitTorrent client
- using libtorrent-rasterbar in it's backend and featuring multiple
+ using libtorrent-rasterbar in its back end and featuring multiple
  user-interfaces: GTK+, web and console.
  .
  It has been designed using the client-server model with a daemon process that
@@ -127,13 +127,13 @@
 Package: deluge
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends},
-         python-libtorrent (>= 0.14.9),
+         python-libtorrent (>= 0.16.0),
          deluge-gtk (= ${source:Version})
 Breaks: deluge-common (<< 1.2.0~rc1-1)
 Replaces: deluge-common (<< 1.2.0~rc1-1)
 Description: bittorrent client written in Python/PyGTK
  Deluge is a full-featured, multi-platform, multi-interface BitTorrent client
- using libtorrent-rasterbar in it's backend and featuring multiple
+ using libtorrent-rasterbar in its back end and featuring multiple
  user-interfaces: GTK+, web and console.
  .
  It has been designed using the client-server model with a daemon process that

=== added file 'debian/patches/move-fails.patch'
--- debian/patches/move-fails.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/move-fails.patch	2012-08-25 01:14:18 +0000
@@ -0,0 +1,21 @@
+Description: The torrent library changed its function signature.
+Forwarded: no
+Origin: other
+Author: Chad Miller <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/deluge/+bug/1041415
+
+--- deluge/core/torrent.py	2012-04-10 11:27:37 +0000
++++ deluge/core/torrent.py	2012-08-25 00:57:04 +0000
+@@ -851,8 +851,10 @@
+                 log.error("Could not move storage for torrent %s since %s does not exist and could not create the directory.", self.torrent_id, dest_u)
+                 return False
+         try:
+-            self.handle.move_storage(dest_u)
++            self.handle.move_storage(dest.encode("utf-8"))
++            # Unicode doesn't match libtorrent.  This smells buggy elsewhere.
+         except:
++            log.exception("Can not move storage to %s", dest)
+             return False
+ 
+         return True
+