Merge lp:~mandel/unity-scope-click/udm-rebuild into lp:unity-scope-click

[Manuel de la Peña]

Update the udm dependency.

[Alejandro J. Cura (alecu)]

+1

review: Approve

[dobey (dobey)]

I think you need to not increase the version requirement on the -dev, but instead just add a new changelog entry that is "* No change rebuild for new ubuntu-download-manager." using dch -i for example.

review: Needs Fixing

[dobey (dobey)]

review: Approve

[Manuel de la Peña (mandel)]

This need another review because we needed to change the mock object.

review: Needs Fixing

[Alejandro J. Cura (alecu)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:243
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/484/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-amd64-ci/24/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-armhf-ci/24/console

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

review: Needs Fixing (continuous-integration)

[dobey (dobey)]

review: Approve

[Manuel de la Peña (mandel)]

Approving, the fact that jenkins fails is because the deps is no updated just yet.

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-04 08:51:52 +0000
+++ debian/changelog	2014-07-07 16:59:05 +0000
@@ -1,3 +1,9 @@
+unity-scope-click (0.1+14.10.20140704-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Update the mock objects of the test to use the new ubuntu-download-manager. 
+
+ -- Manuel de la Pena <[e-mail]>  Thu, 03 Jul 2014 16:33:54 +0200
+
 unity-scope-click (0.1+14.10.20140704-0ubuntu1) utopic; urgency=medium
 
   [ Alejandro J. Cura (alecu) ]

=== modified file 'debian/control'
--- debian/control	2014-06-23 15:00:28 +0000
+++ debian/control	2014-07-07 16:59:05 +0000
@@ -9,8 +9,8 @@
                libboost-locale-dev,
                libglib2.0-dev (>= 2.32),
                libjsoncpp-dev,
-               libubuntu-download-manager-client-dev (>= 0.3+14.10.20140430-0ubuntu1),
-               libubuntu-download-manager-common-dev (>= 0.3+14.10.20140430-0ubuntu1),
+               libubuntu-download-manager-client-dev (>= 0.6),
+               libubuntu-download-manager-common-dev (>= 0.6),
                libubuntuoneauth-2.0-dev,
                libunity-api-dev (>= 7.80.7),
                libunity-scopes-dev (>= 0.5.0),

=== 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-07 16:59:05 +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