Merge lp:~laney/friends/sync-archive-gir into lp:friends

[Iain Lane]

Adapt to changes in libsoup's gi bindings

I uploaded this as the autopkgtest was failing and blocking stuff (so you can manually merge this branch, no need to train it)

https://git.gnome.org/browse/libsoup/commit/?id=0f22a7505ae2e41e2a9e17854d9bd362f5a72945 changed the gi annotations to enable the length to be inferred and require the data to be in bytes.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:255
http://jenkins.qa.ubuntu.com/job/friends-ci/58/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/friends-utopic-amd64-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/friends-ci/58/rebuild

review: Approve (continuous-integration)

[Robert Bruce Park (robru)]

Thanks laney!

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-17 17:38:56 +0000
+++ debian/changelog	2014-05-22 11:58:32 +0000
@@ -1,3 +1,14 @@
+friends (0.2.0+14.04.20140217.1-0ubuntu2) utopic; urgency=medium
+
+  * friends/utils/http.py: Fix some incompatibilities introduced because
+    libsoup 2.46.0 made its gi bindings smarter in an incompatible way.
+    + The length parameter is now calculated from the list, don't pass it
+      explicitly.
+    + The list needs to be bytes, not a string.
+  * Increase deps to ensure we have the new version.
+
+ -- Iain Lane <[e-mail]>  Thu, 22 May 2014 11:18:04 +0100
+
 friends (0.2.0+14.04.20140217.1-0ubuntu1) trusty; urgency=low
 
   [ Scott Sweeny ]
 
=== modified file 'debian/control'
--- debian/control	2013-11-07 14:54:31 +0000
+++ debian/control	2014-05-22 11:58:32 +0000
@@ -16,7 +16,7 @@
                gir1.2-networkmanager-1.0,
                gir1.2-notify-0.7,
                gir1.2-signon-1.0,
-               gir1.2-soup-2.4,
+               gir1.2-soup-2.4 (>= 2.46.0),
                gir1.2-unity-5.0,
                libaccounts-glib-dev (>= 1.10),
                libsignon-glib1,
@@ -62,7 +62,7 @@
          gir1.2-networkmanager-1.0,
          gir1.2-notify-0.7,
          gir1.2-signon-1.0,
-         gir1.2-soup-2.4,
+         gir1.2-soup-2.4 (>= 2.46.0),
          gir1.2-accounts-1.0,
          python3-pkg-resources,
          python3-dbus,
 
=== modified file 'friends/utils/http.py'
--- friends/utils/http.py	2013-02-19 17:00:41 +0000
+++ friends/utils/http.py	2014-05-22 11:58:32 +0000
@@ -181,7 +181,7 @@
         if data is not None:
             message.set_request(
                 'application/x-www-form-urlencoded; charset=utf-8',
-                Soup.MemoryUse.COPY, data, len(data))
+                Soup.MemoryUse.COPY, data.encode())
 
         # Possibly do some rate limiting.
         self._rate_limiter.wait(message)