Unity Videos Lens

Merge lp:~mhr3/unity-lens-video/update-description into lp:~unity-team/unity-lens-video/libunity7-compatible

  1. update-description
  2. Merge into libunity7-compatible
Proposed by Michal Hruby
Status: Merged
Approved by: Paweł Stołowski
Approved revision: 127
Merged at revision: 127
Proposed branch: lp:~mhr3/unity-lens-video/update-description
Merge into: lp:~unity-team/unity-lens-video/libunity7-compatible
Diff against target: 41 lines (+5/-5)
3 files modified
data/local.scope.in.in (+2/-2)
data/remote.scope.in.in (+2/-3)
src/Makefile.am (+1/-0)
To merge this branch: bzr merge lp:~mhr3/unity-lens-video/update-description
Reviewer Review Type Date Requested Status
Paweł Stołowski (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+161481@code.launchpad.net

Commit message

Update scope descriptions.

Description of the change

Update scope descriptions.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:127
http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-video-libunity7-compatible-ci/11/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-video-libunity7-compatible-raring-amd64-ci/11/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-lens-video-libunity7-compatible-ci/11/rebuild

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

PASSED: Continuous integration, rev:127
http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-video-libunity7-compatible-ci/12/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-video-libunity7-compatible-raring-amd64-ci/13

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-lens-video-libunity7-compatible-ci/12/rebuild

review: Approve (continuous-integration)
Revision history for this message
Paweł Stołowski (stolowski) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/local.scope.in.in'
2--- data/local.scope.in.in 2013-04-22 18:28:21 +0000
3+++ data/local.scope.in.in 2013-04-29 19:09:27 +0000
4@@ -3,8 +3,8 @@
5 DBusPath=/net/launchpad/scope/localvideos
6 _Name=Videos
7 Type=video
8-Icon=@prefix@/share/unity/6/lens-nav-video.svg
9-_Description=Search local videos
10+Icon=@prefix@/share/unity/icons/lens-nav-video.svg
11+_Description=This is an Ubuntu search plugin that enables local videos to be searched and displayed in the Dash underneath the Video header. If you do not wish to search this content source, you can disable this search plugin.
12 Shortcut=v
13
14 [Desktop Entry]
15
16=== modified file 'data/remote.scope.in.in'
17--- data/remote.scope.in.in 2013-04-22 18:28:21 +0000
18+++ data/remote.scope.in.in 2013-04-29 19:09:27 +0000
19@@ -3,9 +3,8 @@
20 DBusPath=/net/launchpad/scope/remotevideos
21 _Name=Remote Videos
22 Type=video
23-Icon=@prefix@/share/unity/6/lens-nav-video.svg
24-_Description=Search remote videos
25-Shortcut=v
26+Icon=@prefix@/share/unity/icons/lens-nav-video.svg
27+_Description=This is an Ubuntu search plugin that enables information from various video providers to be searched and displayed in the Dash underneath the Video header. If you do not wish to search these content sources, you can disable this search plugin.
28 GlobalSearches=false
29
30 [Desktop Entry]
31
32=== modified file 'src/Makefile.am'
33--- src/Makefile.am 2013-03-12 17:34:40 +0000
34+++ src/Makefile.am 2013-04-29 19:09:27 +0000
35@@ -5,6 +5,7 @@
36
37 DATADIR = $(datadir)
38
39+AM_CFLAGS = -w
40 AM_CPPFLAGS = $(COVERAGE_CFLAGS)
41 AM_LDFLAGS = $(COVERAGE_LDFLAGS)
42

Subscribers

People subscribed via source and target branches

to all changes: