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

Proposed by dobey
Status: Merged
Approved by: Ted Gould
Approved revision: 399
Merged at revision: 399
Proposed branch: lp:~dobey/unity-scope-click/purchase-script
Merge into: lp:unity-scope-click/devel
Diff against target: 76 lines (+48/-2)
3 files modified
bin/CMakeLists.txt (+1/-1)
bin/enable-purchases (+44/-0)
debian/control (+3/-1)
To merge this branch: bzr merge lp:~dobey/unity-scope-click/purchase-script
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Ted Gould (community) Approve
Diego Sarmentero (community) Approve
Review via email: mp+230828@code.launchpad.net

Commit message

Add a script to enable purchases in the scope.

To post a comment you must log in.
Revision history for this message
Diego Sarmentero (diegosarmentero) wrote :

+1

review: Approve
399. By dobey

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

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Ted Gould (ted) wrote :

+1

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1install(PROGRAMS install-helper DESTINATION lib/unity-scope-click/)1install(PROGRAMS install-helper enable-purchases DESTINATION lib/unity-scope-click/)
22
=== 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 @@
1#!/bin/sh
2#
3# Copyright (C) 2014 Canonical Ltd.
4#
5# This program is free software: you can redistribute it and/or modify it
6# under the terms of the GNU General Public License version 3, as published
7# by the Free Software Foundation.
8#
9# This program is distributed in the hope that it will be useful, but
10# WITHOUT ANY WARRANTY; without even the implied warranties of
11# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
12# PURPOSE. See the GNU General Public License for more details.
13#
14# You should have received a copy of the GNU General Public License along
15# with this program. If not, see <http://www.gnu.org/licenses/>.
16#
17# In addition, as a special exception, the copyright holders give
18# permission to link the code of portions of this program with the
19# OpenSSL library under certain conditions as described in each
20# individual source file, and distribute linked combinations
21# including the two.
22# You must obey the GNU General Public License in all respects
23# for all of the code used other than OpenSSL. If you modify
24# file(s) with this exception, you may extend this exception to your
25# version of the file(s), but you are not obligated to do so. If you
26# do not wish to do so, delete this exception statement from your
27# version. If you delete this exception statement from all source
28# files in the program, then also delete it here.
29#
30set -e
31
32CLICK_STORE_ENABLE_PURCHASES=1
33
34/sbin/initctl set-env --global CLICK_STORE_ENABLE_PURCHASES=$CLICK_STORE_ENABLE_PURCHASES
35
36gdbus call --session \
37 --dest org.freedesktop.DBus \
38 --object-path / \
39 --method org.freedesktop.DBus.UpdateActivationEnvironment \
40 "[{'CLICK_STORE_ENABLE_PURCHASES', '$CLICK_STORE_ENABLE_PURCHASES'}]"
41
42/sbin/restart scope-registry
43
44echo "Purchases enabled and scope-registry restarted."
045
=== 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 @@
30Package: unity-scope-click30Package: unity-scope-click
31Architecture: armhf i386 amd6431Architecture: armhf i386 amd64
32Depends: account-plugin-ubuntuone,32Depends: account-plugin-ubuntuone,
33 libglib2.0-bin,
34 libsqlite3-0 (>= 3.8.5),
33 packagekit-tools,35 packagekit-tools,
34 pay-service,36 pay-service,
35 ubuntu-app-launch-tools,37 ubuntu-app-launch-tools,
36 ubuntu-download-manager,38 ubuntu-download-manager,
37 ubuntu-sdk-libs,39 ubuntu-sdk-libs,
38 libsqlite3-0 (>= 3.8.5),
39 unity-scope-click-departmentsdb (= ${binary:Version}),40 unity-scope-click-departmentsdb (= ${binary:Version}),
41 upstart-bin,
40 ${misc:Depends},42 ${misc:Depends},
41 ${shlibs:Depends},43 ${shlibs:Depends},
42Breaks: unity (<< 7.0),44Breaks: unity (<< 7.0),

Subscribers

People subscribed via source and target branches

to all changes: