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

[Alejandro J. Cura]

Merge tip of trunk

[Ted Gould (ted)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

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

386. By PS Jenkins bot on 2014-08-05

Merge tip of trunk.

Approved by PS Jenkins bot, Ted Gould.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-07-14 08:49:39 +0000
+++ CMakeLists.txt	2014-08-05 20:14:44 +0000
@@ -22,7 +22,7 @@
 include(UseGSettings)
 find_package (PkgConfig REQUIRED)
 
-pkg_check_modules(UNITY_SCOPES REQUIRED libunity-scopes>=0.5.0 libunity-api>=0.1.3)
+pkg_check_modules(UNITY_SCOPES REQUIRED libunity-scopes>=0.6.0 libunity-api>=0.1.3)
 add_definitions(${UNITY_SCOPES_CFLAGS} ${UNITY_SCOPES_CFLAGS_OTHER})
 
 pkg_check_modules(UBUNTUONE REQUIRED ubuntuoneauth-2.0)

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-01 14:14:34 +0000
+++ debian/changelog	2014-08-05 20:14:44 +0000
@@ -1,3 +1,10 @@
+unity-scope-click (0.1+14.10.20140801.2-0ubuntu1) utopic; urgency=low
+
+  [ Pete Woods ]
+  * Compatibility with unity-scopes-api 0.6.0
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 01 Aug 2014 22:12:26 +0000
+
 unity-scope-click (0.1+14.10.20140801.1-0ubuntu1) utopic; urgency=medium
 
   [ Alejandro J. Cura (alecu) ]

=== modified file 'debian/control'
--- debian/control	2014-07-23 11:07:46 +0000
+++ debian/control	2014-08-05 20:14:44 +0000
@@ -17,7 +17,7 @@
                libubuntu-download-manager-common-dev (>= 0.3+14.10.20140430-0ubuntu1),
                libubuntuoneauth-2.0-dev,
                libunity-api-dev (>= 7.80.7),
-               libunity-scopes-dev (>= 0.5.0),
+               libunity-scopes-dev (>= 0.6.0),
                libgsettings-qt-dev,
                pkg-config,
                python3-all:native,

=== modified file 'scope/clickapps/apps-scope.cpp'
--- scope/clickapps/apps-scope.cpp	2014-07-25 05:40:04 +0000
+++ scope/clickapps/apps-scope.cpp	2014-08-05 20:14:44 +0000
@@ -65,7 +65,7 @@
 {
 }
 
-void click::Scope::start(std::string const&, scopes::RegistryProxy const&)
+void click::Scope::start(std::string const&)
 {
     setlocale(LC_ALL, "");
     bindtextdomain(GETTEXT_PACKAGE, GETTEXT_LOCALEDIR);

=== modified file 'scope/clickapps/apps-scope.h'
--- scope/clickapps/apps-scope.h	2014-07-02 15:36:28 +0000
+++ scope/clickapps/apps-scope.h	2014-08-05 20:14:44 +0000
@@ -52,7 +52,7 @@
     Scope();
     ~Scope();
 
-    virtual void start(std::string const&, scopes::RegistryProxy const&) override;
+    virtual void start(std::string const&) override;
 
     virtual void run() override;
     virtual void stop() override;

=== modified file 'scope/clickstore/store-scope.cpp'
--- scope/clickstore/store-scope.cpp	2014-07-25 16:52:39 +0000
+++ scope/clickstore/store-scope.cpp	2014-08-05 20:14:44 +0000
@@ -68,7 +68,7 @@
 {
 }
 
-void click::Scope::start(std::string const&, scopes::RegistryProxy const&)
+void click::Scope::start(std::string const&)
 {
     setlocale(LC_ALL, "");
     // FIXME: This is wrong, but needed for json-cpp workaround.

=== modified file 'scope/clickstore/store-scope.h'
--- scope/clickstore/store-scope.h	2014-07-22 10:20:38 +0000
+++ scope/clickstore/store-scope.h	2014-08-05 20:14:44 +0000
@@ -56,7 +56,7 @@
     Scope();
     ~Scope();
 
-    virtual void start(std::string const&, scopes::RegistryProxy const&) override;
+    virtual void start(std::string const&) override;
 
     virtual void run() override;
     virtual void stop() override;