Ubuntu Scopes

Merge lp:~didrocks/ubuntu-scopes/unity-scope-yelp-add-replacement into lp:~submarine/ubuntu-scopes/yelp

  1. unity-scope-yelp-add-replacement
  2. Merge into yelp
Proposed by Didier Roche-Tolomelli
Status: Merged
Merged at revision: 18
Proposed branch: lp:~didrocks/ubuntu-scopes/unity-scope-yelp-add-replacement
Merge into: lp:~submarine/ubuntu-scopes/yelp
Diff against target: 24 lines (+4/-0)
2 files modified
debian/changelog (+1/-0)
debian/control (+3/-0)
To merge this branch: bzr merge lp:~didrocks/ubuntu-scopes/unity-scope-yelp-add-replacement
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Sebastien Bacher (community) Approve
Review via email: mp+153767@code.launchpad.net

Commit message

C/R/P on the help lens which was in charge of the yelp search.

Description of the change

C/R/P on the help lens which was in charge of the yelp search.

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

looks fine, thanks ;-)

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

FAILED: Continuous integration, rev:18
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~didrocks/ubuntu-scopes/unity-scope-yelp-add-replacement/+merge/153767/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/submarine-ubuntu-scopes-yelp-ci/1/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/submarine-ubuntu-scopes-yelp-raring-amd64-ci/1/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/submarine-ubuntu-scopes-yelp-ci/1/rebuild

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

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~didrocks/ubuntu-scopes/unity-scope-yelp-add-replacement/+merge/153767/+edit-commit-message

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/submarine-ubuntu-scopes-yelp-autolanding/1/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/submarine-ubuntu-scopes-yelp-raring-amd64-autolanding/1/console

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-03-13 15:54:06 +0000
3+++ debian/changelog 2013-03-18 11:43:33 +0000
4@@ -7,5 +7,6 @@
5
6 [ Didier Roche ]
7 * Automatic snapshot from revision 1 (boostrap)
8+ * C/R/P on unity-lens-help as the remaining local part is here.
9
10 -- Mark Tully <markjtully@gmail.com> Fri, 15 Feb 2013 01:32:28 +0000
11
12=== modified file 'debian/control'
13--- debian/control 2013-03-15 09:14:22 +0000
14+++ debian/control 2013-03-18 11:43:33 +0000
15@@ -27,6 +27,9 @@
16 gir1.2-dee-1.0,
17 unity-scopes-runner,
18 gir1.2-glib-2.0
19+Conflicts: unity-lens-help,
20+Replaces: unity-lens-help,
21+Provides: unity-lens-help,
22 Description: Yelp scope for Unity
23 This package contains the "yelp" scope which allows Unity
24 to search for yelp content.

Subscribers

People subscribed via source and target branches