Ubuntu Scopes

Merge lp:~submarine/ubuntu-scopes/manpages-change-master into lp:~submarine/ubuntu-scopes/manpages

  1. manpages-change-master
  2. Merge into manpages
Proposed by David Callé
Status: Merged
Approved by: James Henstridge
Approved revision: 21
Merged at revision: 21
Proposed branch: lp:~submarine/ubuntu-scopes/manpages-change-master
Merge into: lp:~submarine/ubuntu-scopes/manpages
Diff against target: 35 lines (+3/-3)
3 files modified
data/manpages.scope.in (+1/-1)
setup.cfg (+1/-1)
src/unity_manpages_daemon.py (+1/-1)
To merge this branch: bzr merge lp:~submarine/ubuntu-scopes/manpages-change-master
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
James Henstridge Approve
Review via email: mp+154405@code.launchpad.net

Commit message

Change master scope from help to code.

Description of the change

Change master scope from help to code.

To post a comment you must log in.
Revision history for this message
David Callé (davidc3) wrote :

Waiting on https://code.launchpad.net/~submarine/unity-scope-home/more-masters/+merge/154397

Revision history for this message
David Callé (davidc3) wrote :

Seems like Launchpad has resurrected a deleted branch by using the same name... Fixing.

Revision history for this message
David Callé (davidc3) wrote :

^ is now merged. This branch can be reviewed.

Revision history for this message
James Henstridge (jamesh) wrote :

Looks good.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/manpages.scope.in'
2--- data/manpages.scope.in 2013-03-15 17:29:30 +0000
3+++ data/manpages.scope.in 2013-03-20 15:33:20 +0000
4@@ -7,7 +7,7 @@
5 OptionalMetadata=
6 Loader=/usr/share/unity-scopes/manpages/unity_manpages_daemon.py
7 RemoteContent=false
8-Type=development
9+Type=code
10 _Name=Manpages
11 _Description=Find Manpages
12 _SearchHint=Search for Manpages
13
14=== modified file 'setup.cfg'
15--- setup.cfg 2013-03-13 19:43:29 +0000
16+++ setup.cfg 2013-03-20 15:33:20 +0000
17@@ -3,4 +3,4 @@
18
19 [build_i18n]
20 domain=unity-scope-manpages
21-desktop_files=[('share/unity/scopes/help', ('data/manpages.scope.in',))]
22+desktop_files=[('share/unity/scopes/code', ('data/manpages.scope.in',))]
23
24=== modified file 'src/unity_manpages_daemon.py'
25--- src/unity_manpages_daemon.py 2013-03-14 12:28:48 +0000
26+++ src/unity_manpages_daemon.py 2013-03-20 15:33:20 +0000
27@@ -40,7 +40,7 @@
28 DEFAULT_RESULT_MIMETYPE = 'x-scheme-handler/man'
29 DEFAULT_RESULT_TYPE = Unity.ResultType.DEFAULT
30
31-c1 = {'id': 'technical',
32+c1 = {'id': 'documentation',
33 'name': _('Technical Documents'),
34 'icon': SVG_DIR + 'group-installed.svg',
35 'renderer': Unity.CategoryRenderer.VERTICAL_TILE}

Subscribers

People subscribed via source and target branches

to all changes: