Merge lp:~khurshid-alam/libunity/remove-deprecated-scopes into lp:libunity

Proposed by Khurshid Alam on 2019-01-30
Status: Merged
Merged at revision: 332
Proposed branch: lp:~khurshid-alam/libunity/remove-deprecated-scopes
Merge into: lp:libunity
Diff against target: 40 lines (+4/-9)
2 files modified
data/client-scopes.json (+3/-9)
debian/control (+1/-0)
To merge this branch: bzr merge lp:~khurshid-alam/libunity/remove-deprecated-scopes
Reviewer Review Type Date Requested Status
Marco Trevisan (TreviƱo) 2019-01-30 Pending
Review via email: mp+362435@code.launchpad.net

Commit message

* Remove deprecated scopes. Fixes LP: #1808671
* Use gnote scope instead of tomboy. See LP: #1810729
* Fix build: Add dh-python to build depends

To post a comment you must log in.
333. By Khurshid Alam on 2019-01-30

Fix build: Add dh-python to build depends

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/client-scopes.json'
2--- data/client-scopes.json 2017-06-05 17:28:16 +0000
3+++ data/client-scopes.json 2019-01-30 07:28:47 +0000
4@@ -1,21 +1,15 @@
5 {
6 "unity-lens-applications": ["applications-applications.scope", "commands.scope", "applications-scopes.scope"],
7 "unity-lens-files": ["files-local.scope"],
8- "unity-lens-music": ["music-banshee.scope", "music-rhythmbox.scope"],
9- "unity-lens-photos": ["photos-shotwell.scope", "photos-facebook.scope", "photos-flickr.scope", "photos-picasa.scope"],
10+ "unity-lens-music": ["music-rhythmbox.scope"],
11+ "unity-lens-photos": ["photos-shotwell.scope"],
12 "unity-lens-video": ["video-local.scope"],
13 "unity-scope-video-remote": ["video-remote.scope"],
14 "unity-scope-calculator": ["info-calculator.scope"],
15 "unity-scope-chromiumbookmarks": ["web-chromiumbookmarks.scope"],
16- "unity-scope-colourlovers": ["graphics-colourlovers.scope"],
17- "unity-scope-devhelp": ["code-devhelp.scope"],
18 "unity-scope-firefoxbookmarks": ["web-firefoxbookmarks.scope"],
19 "unity-scope-home": ["home.scope", "applications.scope", "books.scope", "boxes.scope", "calendar.scope", "code.scope", "files.scope", "graphics.scope", "help.scope", "info.scope", "more_suggestions.scope", "music.scope", "news.scope", "notes.scope", "photos.scope", "recipes.scope", "reference.scope", "searchin.scope", "video.scope", "weather.scope", "web.scope"],
20- "unity-scope-manpages": ["code-manpages.scope"],
21- "unity-scope-openclipart": ["graphics-openclipart.scope"],
22- "unity-scope-texdoc": ["help-texdoc.scope"],
23- "unity-scope-tomboy": ["notes-tomboy.scope"],
24+ "unity-scope-gnote": ["notes-gnote.scope"],
25 "unity-scope-virtualbox": ["boxes-virtualbox.scope"],
26 "unity-scope-yelp": ["help-yelp.scope"],
27- "unity-scope-zotero": ["reference-zotero.scope"]
28 }
29
30=== modified file 'debian/control'
31--- debian/control 2014-02-04 21:38:14 +0000
32+++ debian/control 2019-01-30 07:28:47 +0000
33@@ -3,6 +3,7 @@
34 Priority: optional
35 Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
36 Build-Depends: debhelper (>= 9~),
37+ dh-python,
38 dh-autoreconf,
39 gnome-common,
40 quilt,

Subscribers

People subscribed via source and target branches