Merge lp:~dobey/unity-scope-click/purchase-script into lp:unity-scope-click/devel

[dobey]

Add a script to enable purchases in the scope.

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[lp:~dobey/unity-scope-click/purchase-script]

399. By dobey on 2014-08-14

Add libglib2.0-bin and upstart-bin to dependencies, for the script.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Ted Gould (ted)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'bin/CMakeLists.txt'
--- bin/CMakeLists.txt	2014-06-20 20:00:53 +0000
+++ bin/CMakeLists.txt	2014-08-14 17:07:56 +0000
@@ -1,1 +1,1 @@
-install(PROGRAMS install-helper DESTINATION lib/unity-scope-click/)
+install(PROGRAMS install-helper enable-purchases DESTINATION lib/unity-scope-click/)

=== added file 'bin/enable-purchases'
--- bin/enable-purchases	1970-01-01 00:00:00 +0000
+++ bin/enable-purchases	2014-08-14 17:07:56 +0000
@@ -0,0 +1,44 @@
+#!/bin/sh
+#
+# Copyright (C) 2014 Canonical Ltd.
+# 
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+# 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.  If you modify
+# file(s) with this exception, you may extend this exception to your
+# version of the file(s), but you are not obligated to do so.  If you
+# do not wish to do so, delete this exception statement from your
+# version.  If you delete this exception statement from all source
+# files in the program, then also delete it here.
+#
+set -e
+
+CLICK_STORE_ENABLE_PURCHASES=1
+
+/sbin/initctl set-env --global CLICK_STORE_ENABLE_PURCHASES=$CLICK_STORE_ENABLE_PURCHASES
+
+gdbus call --session \
+  --dest org.freedesktop.DBus \
+  --object-path / \
+  --method org.freedesktop.DBus.UpdateActivationEnvironment \
+  "[{'CLICK_STORE_ENABLE_PURCHASES', '$CLICK_STORE_ENABLE_PURCHASES'}]"
+
+/sbin/restart scope-registry
+
+echo "Purchases enabled and scope-registry restarted."

=== modified file 'debian/control'
--- debian/control	2014-08-01 15:04:19 +0000
+++ debian/control	2014-08-14 17:07:56 +0000
@@ -30,13 +30,15 @@
 Package: unity-scope-click
 Architecture: armhf i386 amd64
 Depends: account-plugin-ubuntuone,
+         libglib2.0-bin,
+         libsqlite3-0 (>= 3.8.5),
          packagekit-tools,
          pay-service,
          ubuntu-app-launch-tools,
          ubuntu-download-manager,
          ubuntu-sdk-libs,
-         libsqlite3-0 (>= 3.8.5),
          unity-scope-click-departmentsdb (= ${binary:Version}),
+         upstart-bin,
          ${misc:Depends},
          ${shlibs:Depends},
 Breaks: unity (<< 7.0),