Merge lp:~dobey/unity-scope-click/merge-trunk into lp:unity-scope-click/devel

[dobey]

Update from trunk for new ubuntu-download-manager.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:316
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/172/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/147
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/146
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/146/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/146

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/172/rebuild

review: Approve (continuous-integration)

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[lp:~dobey/unity-scope-click/merge-trunk]

316. By Manuel de la Peña on 2014-07-08

Update from trunk for new ubuntu-download-manager.

Approved by Diego Sarmentero, PS Jenkins bot.

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-18 17:49:55 +0000
+++ debian/changelog	2014-07-08 17:25:52 +0000
@@ -1,3 +1,33 @@
+unity-scope-click (0.1+14.10.20140707.2-0ubuntu1) utopic; urgency=medium
+
+  [ Manuel de la Pena ]
+  * No change rebuild for new ubuntu-download-manager. 
+
+ -- Ubuntu daily release <[e-mail]>  Mon, 07 Jul 2014 15:15:08 +0000
+
+unity-scope-click (0.1+14.10.20140704-0ubuntu1) utopic; urgency=medium
+
+  [ Alejandro J. Cura (alecu) ]
+  * New upstream release.
+    - Add support for overriding the architecture in search.
+    - Parse and show recommendations from the server in search results.
+    - Make the app store card look like the final designs.
+    - Updated translations from launchpad.
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 04 Jul 2014 08:51:51 +0000
+
+unity-scope-click (0.1+14.10.20140625-0ubuntu1) utopic; urgency=medium
+
+  [ Alejandro J. Cura (alecu) ]
+  * New upstream release.
+    - Add support for departments and highlights.
+    - Add support for using a new custom widget from Unity8 to handle payment
+      process of purchasable apps.
+    - Send dbus signals to the launcher, for downloads started and completed.
+    - Add dependency on ubuntu-app-launch-tools used in install-helper script.
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 25 Jun 2014 13:25:34 +0000
+
 unity-scope-click (0.1+14.10.20140618.1-0ubuntu1) utopic; urgency=low
 
   [ Pawel Stolowski ]

=== modified file 'libclickscope/tests/mock_ubuntu_download_manager.h'
--- libclickscope/tests/mock_ubuntu_download_manager.h	2014-05-26 14:27:31 +0000
+++ libclickscope/tests/mock_ubuntu_download_manager.h	2014-07-08 17:25:52 +0000
@@ -65,6 +65,8 @@
 
     MOCK_CONST_METHOD0(isError, bool());
     MOCK_CONST_METHOD0(error, Error*());
+    MOCK_METHOD0(headers, QMap<QString, QString>());
+    MOCK_METHOD1(setHeaders, void(QMap<QString, QString>));
 };
 
 class MockError : public Ubuntu::DownloadManager::Error