libunity

Merge lp:~stolowski/libunity/disable-some-scopes into lp:libunity

  1. disable-some-scopes
  2. Merge into trunk
Proposed by Paweł Stołowski
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: 228
Merged at revision: 225
Proposed branch: lp:~stolowski/libunity/disable-some-scopes
Merge into: lp:libunity
Diff against target: 39 lines (+6/-7)
3 files modified
configure.ac (+1/-1)
data/client-scopes.json (+0/-1)
debian/changelog (+5/-5)
To merge this branch: bzr merge lp:~stolowski/libunity/disable-some-scopes
Reviewer Review Type Date Requested Status
Łukasz Zemczak Approve
Didier Roche-Tolomelli Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+167490@code.launchpad.net

Commit message

Removed evolution scope.

Description of the change

Removed evolution scope.

To post a comment you must log in.
lp:~stolowski/libunity/disable-some-scopes updated
227. By Paweł Stołowski

Removed evolution scope.

228. By Paweł Stołowski

Bumped version.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:227
http://jenkins.qa.ubuntu.com/job/libunity-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libunity-ci/17/rebuild

review: Approve (continuous-integration)
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Thanks!

review: Approve
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Looking good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2013-06-03 13:09:14 +0000
3+++ configure.ac 2013-06-05 10:09:26 +0000
4@@ -1,5 +1,5 @@
5 # When releasing also remember to update the soname as instructed below
6-AC_INIT(libunity, 7.0.1)
7+AC_INIT(libunity, 7.0.2)
8
9 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
10 AM_CONFIG_HEADER(config.h)
11
12=== modified file 'data/client-scopes.json'
13--- data/client-scopes.json 2013-06-03 12:17:56 +0000
14+++ data/client-scopes.json 2013-06-05 10:09:26 +0000
15@@ -14,7 +14,6 @@
16 "unity-scope-colourlovers": ["graphics-colourlovers.scope"],
17 "unity-scope-devhelp": ["code-devhelp.scope"],
18 "unity-scope-deviantart": ["graphics-deviantart.scope"],
19- "unity-scope-evolution": ["calendar-evolution.scope"],
20 "unity-scope-firefoxbookmarks": ["web-firefoxbookmarks.scope"],
21 "unity-scope-gallica": ["books-gallica.scope"],
22 "unity-scope-github": ["code-github.scope"],
23
24=== modified file 'debian/changelog'
25--- debian/changelog 2013-06-03 13:09:14 +0000
26+++ debian/changelog 2013-06-05 10:09:26 +0000
27@@ -1,8 +1,8 @@
28-libunity (7.0.1-0ubuntu1) UNRELEASED; urgency=low
29-
30- * Removed sshsearch and launchpad scopes from client-scopes.json.
31-
32- -- Pawel Stolowski <pawel.stolowski@ubuntu.com> Mon, 03 Jun 2013 14:25:34 +0200
33+libunity (7.0.2-0ubuntu1) UNRELEASED; urgency=low
34+
35+ * Removed sshsearch, launchpad and evolution scopes from client-scopes.json.
36+
37+ -- Pawel Stolowski <pawel.stolowski@ubuntu.com> Wed, 05 Jun 2013 11:36:50 +0200
38
39 libunity (7.0.0daily13.05.31ubuntu.unity.next-0ubuntu1) raring; urgency=low
40

Subscribers

People subscribed via source and target branches