Merge lp://staging/~jamesh/software-center/scan-scopes into lp://staging/software-center
Proposed by
James Henstridge
| Status: | Merged |
|---|---|
| Approved by: | dobey |
| Approved revision: | 3304 |
| Merged at revision: | 3305 |
| Proposed branch: | lp://staging/~jamesh/software-center/scan-scopes |
| Merge into: | lp://staging/software-center |
| Diff against target: |
120 lines (+53/-6) 4 files modified
data/software-center.menu.in (+4/-1) softwarecenter/db/update.py (+20/-2) tests/data/desktop/music-banshee.scope (+17/-0) tests/test_database.py (+12/-3) |
| To merge this branch: | bzr merge lp://staging/~jamesh/software-center/scan-scopes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| dobey | Approve | ||
|
Review via email:
|
|||
Commit message
Include unity-scope-* packages in the list of dash search plugins.
Description of the change
We want Unity scopes to appear in the software center. The archive indexer has been updated to extract scope files from packages in the archive. We would also like information from these files included in the Xapian index Software Center creates from this data.
This branch adds such support.
Since we aren't including the new Unity stack in 13.04 it doesn't need to hit that deadline, but it'd be nice to know whether the approach seems sound.
To post a comment you must log in.
Revision history for this message
| Dimitri John Ledkov (xnox) wrote | # |
Revision history for this message
| Michael Vogt (mvo) wrote | # |
Revision history for this message
| dobey (dobey) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
On 10 April 2013 09:23, James Henstridge <email address hidden> wrote:
> @@ -1019,13 +1031,16 @@
> if not datadir:
> datadir = softwarecenter.
> context = GLib.main_
> - for desktopf in glob(datadir + "/*.desktop"):
> + for desktopf in glob(datadir + "/*.desktop") + glob(datadir + "/*.scope"):
Right, so scope files are in the same place as the .desktop files. I
will make sure app-install-data has them in the matching above place.
I didn't know at the time if we will use
/usr/share/
Regards,
Dmitrijs.